Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/views/productionPlan/components/disassemblePlanPop.vue

@@ -116,7 +116,7 @@
               ></el-option>
             </el-select>
           </template>
-          <!-- <template v-slot:startTime="{ row }">
+          <template v-slot:startTime="{ row }">
             <el-date-picker
               class="w100"
               v-model="row.startTime"
@@ -135,7 +135,7 @@
               @change="handleEndTimeChange(row)"
               placeholder="完成时间"
             ></el-date-picker>
-          </template> -->
+          </template>
           <template v-slot:requiredFormingNum="{ row }">
             <el-input
               v-if="row.resourceType"
@@ -326,20 +326,20 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          // {
-          //   slot: 'startTime',
-          //   prop: 'startTime',
-          //   label: '计划开始时间',
-          //   align: 'center',
-          //   minWidth: 180
-          // },
-          // {
-          //   slot: 'endTime',
-          //   prop: 'endTime',
-          //   label: '计划完成时间',
-          //   align: 'center',
-          //   minWidth: 180
-          // },
+          {
+            slot: 'startTime',
+            prop: 'startTime',
+            label: '计划开始时间',
+            align: 'center',
+            minWidth: 180
+          },
+          {
+            slot: 'endTime',
+            prop: 'endTime',
+            label: '计划完成时间',
+            align: 'center',
+            minWidth: 180
+          },
           {
             prop: 'produceRoutingId',
             slot: 'produceRoutingId',
@@ -451,8 +451,8 @@
           produceRoutingName: row.name || '',
           requiredFormingNum: _num,
           productUnitWeight: m.productUnitWeight,
-          // startTime: this.formData.startTime || '',
-          // endTime: this.formData.endTime || '',
+          startTime: this.formData.startTime || '',
+          endTime: this.formData.endTime || '',
           unit: this.unit,
           resourceType: 0
         };
@@ -584,8 +584,8 @@
             requiredFormingNum: '',
             productUnitWeight: m.productUnitWeight,
             unit: this.unit,
-            // startTime: this.formData.startTime || '',
-            // endTime: this.formData.endTime || '',
+            startTime: this.formData.startTime || '',
+            endTime: this.formData.endTime || '',
             resourceType: 1
           };
         });