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

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

@@ -469,10 +469,13 @@ export default {
       const response = await getworkshopList()
       this.workshopList = response.rows
     },
-    handleChangeWorkshopId() {
+    async handleChangeWorkshopId() {
       this.workstationList = []
       this.queryWorkunitParams.workstationId = null
-      this.hanldeGetworkstationList()
+      await this.hanldeGetworkstationList()
+      this.taskWorkunitList = []
+      this.currentTask = null
+      this.getList()
     },
     async hanldeGetworkstationList() {
       if (!this.queryWorkunitParams.workshopId) {
@@ -506,6 +509,7 @@ export default {
     /** 查询要维护刀模版列表 */
     async getList() {
       this.queryParams.workCenterId = this.queryWorkunitParams.workstationId
+      this.queryParams.workshopId = this.queryWorkunitParams.workshopId
       this.loading = true;
       const params = {...this.queryParams}
       if (params.scheduleEndDate&&params.scheduleEndDate.length > 0) {

src/views/mes/pro/workorder/commandList.vue

@@ -126,7 +126,13 @@ export default {
       getProWorkOrderProcessList({
         workorderId: this.$attrs.workorderId
       }).then((response) => {
-        this.tableForm.tableData = response.rows
+        this.tableForm.tableData = response.rows.map(item => {
+          return {
+            ...item,
+            scheduleStartTime: this.$attrs.currentData.requestDate + ' 00:00:00',
+            scheduleEndTime: this.$attrs.currentData.requestDate + ' 00:00:00'
+          }
+        })
         this.loading = false;
       });
     },

src/views/mes/pro/workorder/indexApply.vue

@@ -270,7 +270,7 @@
       width="1200px"
       append-to-body
     >
-      <CommandList v-if="commandVisible" ref="CommandListRef" @close="commandVisible = false" :workorderId="currentData.workorderId"></CommandList>
+      <CommandList v-if="commandVisible" ref="CommandListRef" :currentData="currentData" @close="commandVisible = false" :workorderId="currentData.workorderId"></CommandList>
       <div slot="footer" class="dialog-footer">
         <el-button @click="commandVisible = false">取 消</el-button>
         <el-button type="primary" @click="$refs.CommandListRef.submit(), getList()">确 定</el-button>