Merge branch 'dev' of http://git.local.topsunit.com/ximai/mes-ui into dev

src/views/mes/pro/scheduleList/index.vue

@@ -42,7 +42,7 @@
           <el-form-item :label="$t('任务号')" prop="taskCode">
             <el-input
               v-model="queryParams.taskCode"
-             
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -50,7 +50,7 @@
           <el-form-item :label="$t('工序名称')" prop="processName">
             <el-input
               v-model="queryParams.processName"
-             
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -58,7 +58,7 @@
           <!-- <el-form-item :label="$t('common.workunit_name')" prop="workunitName">
             <el-input
               v-model="queryParams.workunitName"
-             
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -76,7 +76,7 @@
           <el-form-item :label="$t('工单编码')" prop="workorderCode">
             <el-input
               v-model="queryParams.workorderCode"
-             
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -84,7 +84,7 @@
           <el-form-item :label="$t('项目号')" prop="customerProjectNo">
             <el-input
               v-model="queryParams.customerProjectNo"
-            
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -92,7 +92,7 @@
           <el-form-item :label="$t('订单号')" prop="orderCode">
             <el-input
               v-model="queryParams.orderCode"
-            
+
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -228,7 +228,7 @@
             style="width: 100%;"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd HH:mm:ss"
-           
+
             @focus="writeRow(scope.row)"
             @change="editTime(scope.row, 'start')"
           >
@@ -252,7 +252,7 @@
             style="width: 100%;"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd HH:mm:ss"
-           
+
             @focus="writeRow(scope.row)"
             @change="editTime(scope.row, 'end')"
           >
@@ -356,7 +356,7 @@
                 :min="0"
                 disabled
                 v-model="form.quantity"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -368,7 +368,7 @@
                 :min="0"
                 disabled
                 v-model="form.duration"
-               
+
               />
             </el-form-item>
           </el-col> -->
@@ -379,7 +379,7 @@
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd HH:mm:ss"
-               
+
               >
               </el-date-picker>
             </el-form-item>
@@ -391,7 +391,7 @@
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 format="yyyy-MM-dd HH:mm:ss"
-               
+
               >
               </el-date-picker>
             </el-form-item>
@@ -451,7 +451,7 @@
                 :step="1"
                 :min="0"
                 v-model="Assignform.quantity"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -749,11 +749,11 @@ export default {
             res.data.reportName,
             res.data.valueList
           ).then(()=> {
-            
+
           })
         }
       })
-      
+
     },
     // 表单重置
     reset() {
@@ -857,6 +857,7 @@ export default {
         let formData = this.$refs.orderListRef.selectedRows.map(item => {
           return {
             workorderId: item.workorderId,
+            scheduleDate: item.scheduleDate,
             scheduleQuantity: item.scheduleQuantity
           }
         });

src/views/mes/pro/scheduleList/orderList.vue

@@ -87,7 +87,7 @@
       <el-table-column
           :label="$t('排程日期')"
           align="center"
-          prop="scheduleStartDate"
+          prop="scheduleDate"
           width="200"
           :show-overflow-tooltip="true"
       >