Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/plan/manufacturingorder/auto-operationtask.vue

@@ -527,7 +527,6 @@
  },
  watch: {
    currshowlist() {
      console.log('orderId', this.orderId)
      this.innerVisible = this.currshowlist
      if (this.selectionArray && this.selectionArray.length > 0) {
        this.operationTaskType = this.selectionArray[0].workshopTypeCode
@@ -541,7 +540,6 @@
            const resData = response.data
            if (resData.code === 0) {
              const autoTaskList = resData.data
              console.log(this.selectionArray)
              autoTaskList.forEach((item) => {
                this.operationData.push({
                  operationName: item.operationName,