002390 1 жил өмнө
parent
commit
64afc4011a

+ 33 - 33
src/views/purchase/purchase-order/column.js

@@ -150,17 +150,17 @@ export const TableColumns = [
       isSummary:true,
     },
   },
-  // {
-  //   item: { 
-  //     key: "isUrgency", 
-  //     title: "紧急程度",
-  //     width:100,
-  //   },
-  //   attr: { 
-  //     is: "el-dict-tag", 
-  //     dictName: "urgency_degree"
-  //   },
-  // },
+  {
+    item: { 
+      key: "isUrgency", 
+      title: "紧急程度",
+      width:100,
+    },
+    attr: { 
+      is: "el-dict-tag", 
+      dictName: "urgency_degree"
+    },
+  },
   // {
   //   key: "isMarketing",
   //   title: "已协同生成销售订单",
@@ -1320,28 +1320,28 @@ export const SearchColumns = [
       dictName: "order_delivery_status",
     },
   },
-  // {
-  //   item: { 
-  //     key: "isUrgency", 
-  //     title: "紧急标识",
-  //   },
-  //   attr: { 
-  //     clearable: true,
-  //     is: "el-select", 
-  //     dictName: "sys_yes_no" 
-  //   },
-  // },
-  // {
-  //   item: { 
-  //     key: "isReplenishment", 
-  //     title: "补单标识",
-  //   },
-  //   attr: { 
-  //     clearable: true,
-  //     is: "el-select", 
-  //     dictName: "sys_yes_no" 
-  //   },
-  // },
+  {
+    item: { 
+      key: "isUrgency", 
+      title: "紧急标识",
+    },
+    attr: { 
+      clearable: true,
+      is: "el-select", 
+      dictName: "sys_yes_no" 
+    },
+  },
+  {
+    item: { 
+      key: "isReplenishment", 
+      title: "补单标识",
+    },
+    attr: { 
+      clearable: true,
+      is: "el-select", 
+      dictName: "sys_yes_no" 
+    },
+  },
   
   // {
   //   item:{

+ 2 - 2
src/views/purchase/purchase-order/index.vue

@@ -720,14 +720,14 @@ export default {
           >批量导出</el-button>
           
         </el-button-group>
-        <!-- <el-button-group>
+        <el-button-group>
           <zp-button
             :size="size"
             :select-data="checkedList"
             @success="handleQueryList"
           >
           </zp-button>
-        </el-button-group> -->
+        </el-button-group>
 
       </el-col>
     </el-row>

+ 22 - 22
src/views/purchase/task/columns.js

@@ -253,28 +253,28 @@ export default function useColumns() {
         valueKey: "name",
       },
     },
-    // {
-    //   item: { 
-    //     key: "isUrgency", 
-    //     title: "紧急标识",
-    //   },
-    //   attr: { 
-    //     clearable: true,
-    //     is: "el-select", 
-    //     dictName: "sys_yes_no" 
-    //   },
-    // },
-    // {
-    //   item: { 
-    //     key: "isReplenishment", 
-    //     title: "补单标识",
-    //   },
-    //   attr: { 
-    //     clearable: true,
-    //     is: "el-select", 
-    //     dictName: "sys_yes_no" 
-    //   },
-    // },
+    {
+      item: { 
+        key: "isUrgency", 
+        title: "紧急标识",
+      },
+      attr: { 
+        clearable: true,
+        is: "el-select", 
+        dictName: "sys_yes_no" 
+      },
+    },
+    {
+      item: { 
+        key: "isReplenishment", 
+        title: "补单标识",
+      },
+      attr: { 
+        clearable: true,
+        is: "el-select", 
+        dictName: "sys_yes_no" 
+      },
+    },
     {
       item: {
         key: "documentsCodes",

+ 2 - 2
src/views/purchase/task/index.vue

@@ -155,12 +155,12 @@ export default {
           @success="useQuery(params, page)"
         >
         </zp-button>
-        <!-- <lc-button
+        <lc-button
           :size="size"
           :select-data="selectData"
           @success="useQuery(params, page)"
         >
-        </lc-button> -->
+        </lc-button>
       </el-button-group>
       <!-- <el-button-group>
         <dc-button