55

src/views/productionPlan/components/mergeDialog.vue

@@ -3,11 +3,13 @@
     width="60vw"
     :visible.sync="visible"
     :close-on-click-modal="false"
+    row-key="code"
     custom-class="ele-dialog-form"
-    :title="'合并计划'"
+    :title="'合批'"
   >
     <div class="form-wrapper">
-      <headerTitle title="需要合并计划"> </headerTitle>
+
+      <headerTitle title="合批" > </headerTitle>
       <ele-pro-table
         ref="table"
         :needPage="false"
@@ -44,7 +46,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="要求生产日期" prop="reqMoldTime">
+            <el-form-item label="要求完成日期" prop="reqMoldTime">
               <el-date-picker
                 v-model="formData.reqMoldTime"
                 type="date"
@@ -86,7 +88,7 @@
 
         rules: {
           reqMoldTime: [
-            { required: true, message: '请要求生产日期', trigger: 'change' }
+            { required: true, message: '请要求完成日期', trigger: 'change' }
           ],
           batchNo: [
             { required: true, message: '请输入批次号', trigger: 'blur' }
@@ -125,7 +127,7 @@
 
           {
             prop: 'reqMoldTime',
-            label: '要求生产日期',
+            label: '要求完成日期',
             align: 'center',
             minWidth: 200
           },
@@ -147,7 +149,8 @@
       },
 
       remove(index) {
-        if(this.mergeList.length <= 2) return this.$message.warning('至少保留二个计划')
+        if (this.mergeList.length <= 2)
+          return this.$message.warning('至少保留二个计划');
         this.mergeList.splice(index, 1);
         this.changeNum();
       },

src/views/productionPlan/components/unpackDialog.vue

@@ -3,6 +3,7 @@
     width="60vw"
     :visible.sync="visible"
     :close-on-click-modal="false"
+    row-key="code"
     custom-class="ele-dialog-form"
     :title="'拆分计划'"
   >
@@ -36,7 +37,7 @@
           <el-descriptions-item label="要求生产数量">{{
             formData.requiredFormingNum
           }}</el-descriptions-item>
-          <el-descriptions-item label="要求生产日期">{{
+          <el-descriptions-item label="要求完成日期">{{
             formData.reqMoldTime
           }}</el-descriptions-item>
         </el-descriptions>
@@ -205,7 +206,7 @@
         columns: [
           {
             prop: 'batchNo',
-            label: '批次号',
+            label: '原批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true
@@ -227,7 +228,7 @@
           },
           {
             prop: 'reqMoldTime',
-            label: '要求生产日期',
+            label: '要求完成日期',
             align: 'center',
             slot: 'reqMoldTime',
             minWidth: 200
@@ -257,7 +258,7 @@
           },
           {
             prop: 'reqMoldTime',
-            label: '要求生产日期',
+            label: '要求完成日期',
             align: 'center',
             slot: 'reqMoldTime',
             minWidth: 200

src/views/productionPlan/index.vue

@@ -30,7 +30,7 @@
       >
         <template v-slot:toolbar>
           <el-button type="primary" size="mini" @click="handleMerge"
-            >合并计划</el-button
+            >合批</el-button
           >
         </template>
 
@@ -51,7 +51,8 @@
         </template>
 
         <template v-slot:priority="{ row }">
-          <el-input
+     
+              <el-input
             v-model="row.priority"
             type="number"
             size="mini"
@@ -71,6 +72,7 @@
               <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
             </div>
           </el-popover>
+   
         </template>
 
         <template v-slot:productWeight="{ row }">
@@ -95,7 +97,7 @@
             v-if="row.status == 2"
             @click="handleOrderPublish(1, row)"
           >
-            发布工单
+            发布
           </el-link>
           <el-link
             type="primary"
@@ -112,7 +114,7 @@
             icon="el-icon-edit"
             @click="planEdit(row)"
           >
-            修改计划
+            修改
           </el-link>
 
           <el-link
@@ -276,6 +278,8 @@
             showOverflowTooltip: true
           },
 
+
+
           {
             slot: 'batchNo',
             prop: 'batchNo',
@@ -284,6 +288,17 @@
             minWidth: 120,
             showOverflowTooltip: true
           },
+
+          
+          {
+         
+         prop: 'joinBatchNo',
+         label: '原批次号',
+         align: 'center',
+         minWidth: 120,
+         showOverflowTooltip: true
+       },
+
           {
             slot: 'code',
             prop: 'code',
@@ -293,6 +308,16 @@
             showOverflowTooltip: true,
             minWidth: 160
           },
+
+          {
+            prop: 'scheduleStatusName',
+            label: '进度状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+
+
           {
             prop: 'productCode',
             label: '产品编码',
@@ -308,6 +333,7 @@
             minWidth: 140
           },
 
+   
           {
             prop: 'brandNo',
             label: '牌号',
@@ -334,7 +360,7 @@
             prop: 'priority',
             label: '优先级',
             align: 'center',
-            minWidth: 120,
+            minWidth: 140,
             slot: 'priority',
             sortable: 'custom'
           },
@@ -398,7 +424,7 @@
           },
           {
             prop: 'reqMoldTime',
-            label: '要求生产日期',
+            label: '要求完成日期',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110
@@ -662,4 +688,8 @@
   };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+
+
+</style>