55

src/views/productionPlan/components/productionPlan-search.vue

@@ -13,7 +13,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物料编码:">
+        <el-form-item label="产品编码:">
           <el-input
             clearable
             v-model="where.productCode"

src/views/productionPlan/index.vue

@@ -21,6 +21,7 @@
         :columns="columns"
         :datasource="datasource"
         :cache-key="`${activeName}ProductionPlanTable`"
+        @sort-change="onSortChange"
       >
         <template v-slot:code="{ row }">
           <el-link type="primary" :underline="false" @click="goDetail(row)">
@@ -221,7 +222,7 @@
           },
           {
             prop: 'productCode',
-            label: '物料编号',
+            label: '产品编码',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140
@@ -233,18 +234,19 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'model',
-            label: '型号',
+            prop: 'batchNo',
+            label: '批号',
             align: 'center',
+            minWidth: 100,
             showOverflowTooltip: true
           },
           {
-            prop: 'batchNo',
-            label: '批号',
+            prop: 'model',
+            label: '型号',
             align: 'center',
-            minWidth: 100,
             showOverflowTooltip: true
           },
+   
 
           {
             prop: 'priority',
@@ -252,7 +254,7 @@
             align: 'center',
             minWidth: 120,
             slot: 'priority',
-            sortable: true
+            sortable: 'custom'
           },
 
           {
@@ -345,7 +347,7 @@
                 {
                   columnKey: 'action',
                   label: '操作',
-                  width: 350,
+                  width: 250,
                   align: 'center',
                   resizable: false,
                   fixed: 'right',
@@ -370,7 +372,8 @@
         return getList({
           pageNum: page,
           size: limit,
-          ...where
+          ...where,
+          ...this.sort
         });
       },
       // 发布工单
@@ -450,6 +453,17 @@
           });
       },
 
+      
+      onSortChange(e) {
+        let sort = {
+          orderBy: e.order,
+          sortName:  e.prop,
+        }
+        this.sort = sort
+        this.reload()
+       
+      },
+
       sortTop(row) {
         row.priority = Number(row.priority) + 1;
         this.priorityChange(row);

src/views/saleOrder/index.vue

@@ -21,6 +21,7 @@
         :selection.sync="selection"
         cache-key="systemRoleTable1"
         row-key="id"
+        @sort-change="onSortChange"  
       >
         <template v-slot:code="{ row }">
           <el-link :underline="false" @click="openDetails(row)">
@@ -197,7 +198,7 @@
             align: 'center',
             minWidth: 120,
             slot: 'priority',
-            sortable: true
+            sortable: 'custom'
           },
 
           {
@@ -327,7 +328,8 @@
         const params = {
           size: limit,
           pageNum: page,
-          ...where
+          ...where,
+          ...this.sort
         };
         const data = await getPageList(params);
         return data;
@@ -353,6 +355,16 @@
         });
       },
 
+      onSortChange(e) {
+        let sort = {
+          orderBy: e.order,
+          sortName:  e.prop,
+        }
+        this.sort = sort
+        this.reload()
+      },
+       
+
       sortTop(row) {
         row.priority = Number(row.priority) + 1;
         this.priorityChange(row);

src/views/saleOrder/salesToProduction.vue

@@ -84,7 +84,7 @@
             }}</el-form-item>
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
-            <el-form-item label="物料编码:">{{
+            <el-form-item label="产品编码:">{{
               form.productCode
             }}</el-form-item>
           </el-col>
@@ -115,6 +115,16 @@
             sortable
           >
           </el-table-column>
+
+          <el-table-column
+            label="产品名称"
+            align="center"
+            prop="productName"
+            width="120"
+            sortable
+          >
+          </el-table-column>
+      
           <el-table-column label="行号" align="center" prop="lineNumber">
           </el-table-column>
           <el-table-column label="合同数量" align="center" prop="contractNum">

src/views/workOrder/components/order-search.vue

@@ -18,7 +18,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物料编码:">
+        <el-form-item label="产品编码:">
           <el-input clearable v-model="where.productCode" placeholder="请输入" />
         </el-form-item>
       </el-col>

src/views/workOrder/index.vue

@@ -12,6 +12,7 @@
         :columns="columns"
         :datasource="datasource"
         cache-key="workOrderTable"
+        @sort-change="onSortChange"
       >
         <template v-slot:code="{ row }">
           {{ row.code }}
@@ -144,7 +145,7 @@
           },
           {
             prop: 'productCode',
-            label: '物料编号',
+            label: '产品编码',
             align: 'center'
           },
           {
@@ -157,11 +158,7 @@
             label: '牌号',
             align: 'center'
           },
-          {
-            prop: 'model',
-            label: '型号',
-            align: 'center'
-          },
+
           {
             prop: 'batchNo',
             label: '批号',
@@ -169,6 +166,12 @@
             minWidth: 100,
             showOverflowTooltip: true
           },
+          {
+            prop: 'model',
+            label: '型号',
+            align: 'center'
+          },
+ 
 
           {
             prop: 'priority',
@@ -176,7 +179,7 @@
             align: 'center',
             minWidth: 120,
             slot: 'priority',
-            sortable: true
+            sortable: 'custom'
           },
 
           {
@@ -269,7 +272,8 @@
         return getList({
           pageNum: page,
           size: limit,
-          ...where
+          ...where,
+          ...this.sort
         });
       },
       async _teamPage() {
@@ -316,6 +320,16 @@
         });
       },
 
+      onSortChange(e) {
+        let sort = {
+          orderBy: e.order,
+          sortName:  e.prop,
+        }
+        this.sort = sort
+        this.reload()
+       
+      },
+
       sortTop(row) {
         row.priority = Number(row.priority) + 1;
         this.priorityChange(row);