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

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

@@ -651,14 +651,15 @@ export default {
     async handleChangeWorkshopId() {
       // this.workstationList = []
       this.queryWorkunitParams.workstationId = null
-      // await this.hanldeGetworkstationList()
+      await this.hanldeGetworkstationList()
       this.taskWorkunitList = []
       this.currentTask = null
       this.queryParams.workunitId = ''
       this.getList()
     },
     async hanldeGetworkstationList() {
-      const response = await getworkstationList({workshopId: null})
+      let workshopId= this.queryWorkunitParams.workshopId
+      const response = await getworkstationList({workshopId: workshopId})
       this.workstationList = response.rows
     },
     handleJobAssignment() {