Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/orderManagement/planYieIdOrder.vue

@@ -534,7 +534,7 @@ export default {
           {
             label: '返工单号',
             prop: 'reworkCode',
-            search: true,
+            search: false,
             sortable: true,
             width: 120,
             span: 12,

src/views/productionTesting/components/trialStandard.vue

@@ -257,6 +257,7 @@ export default {
         },
         insertEvent() {
             const record = { _select: false };
+            this.fileList = []
             this.tidList.push(record)
         },
         searchChange(params, done){
@@ -321,6 +322,7 @@ export default {
         handleEdit(row,index) {
             getDetail({id:row.id}).then(res =>{
                 console.log('res--------------',res)
+                this.fileList = []
                 if(res.data.data.attach && JSON.stringify(res.data.data.attach) != '{}'){
                     this.fileList = [
                         {

src/views/qualityManagement/tankSolutionSystem/info.vue

@@ -95,7 +95,7 @@ import dispatcherDialog from './components/dispatcherDialog.vue'
 import addEditInfoDialog from './components/addEditInfoDialog.vue'
 import basicImport from '@/components/basic-import/main.vue'
 // import calculateNeedValuesByFormula fro/m '@/utils/calculateNeedValuesByFormula'
-import {getList,getDetail,deleteInfo,getManager,getPerson,getTeam,setBatch} from '@/api/tankSolutionSystem/info'
+import {getList,getDetail,deleteInfo,getManager,getPerson,getTeam,setBatch,getWorkCenter} from '@/api/tankSolutionSystem/info'
 export default {
     components: { dispatcherDialog, addEditInfoDialog,basicImport },
     data() {
@@ -169,7 +169,7 @@ export default {
                         type: 'select',
                         sortable: true,
                         width: 150,
-                        filter: true,
+                        filterable: true,
                         span: 8,
                         search: true,
                         rules: [
@@ -179,8 +179,7 @@ export default {
                                 trigger: 'blur',
                             },
                         ],
-                        // dicUrl: '/blade-desk/bsWorkCenter/getList',
+                        dicData: [],
-                        dicUrl:'/blade-desk/BA/WorkCenter/listForSelect',
                         props: {
                             label: 'wcName',
                             value: 'id',
@@ -188,7 +187,7 @@ export default {
                     },
                     {
                         label: '作业槽',
-                        prop: 'workTankName',
+                        prop: 'workTankId',
                         search: true,
                         type: 'select',
                         sortable: true,
@@ -693,6 +692,7 @@ export default {
             managerList:[],
             teamList:[],
             personList:[],
+            workCenterList:[],
 
             // data1:[
             //     {addPoint:1,testValue:15,volume:10,name:"CUCN",actualValue:20,needValue:30},
@@ -704,6 +704,7 @@ export default {
         this.getManagerList()
         this.getTeamList()
         this.getPersonList()
+        this.getWorkCenterList()
     },
     methods: {
         // 主管工艺下拉
@@ -724,6 +725,17 @@ export default {
                 this.teamList = res.data.data
             })
         },
+        // 作业中心下拉
+        getWorkCenterList(){
+            getWorkCenter().then(res =>{
+                this.workCenterList = res.data.data
+                // 动态设置dicData
+                const column = this.option.column.find(col => col.prop === 'wcName')
+                if(column) {
+                    column.dicData = res.data.data
+                }
+            })
+        },
         addInfo(){
             this.infoType = 'add'
             this.rowId = null
@@ -842,7 +854,7 @@ export default {
                 current:this.page.currentPage,
                 size:this.page.pageSize,
                 workCenterId:this.search.wcName ? this.search.wcName : '',
-                workTankId:this.search.workTankName ? this.search.workTankName : '',
+                workTankId:this.search.workTankId ? this.search.workTankId : '',
                 testElement:this.search.testElement ? this.search.testElement : ''
             }).then(res =>{
                 this.data = res.data.data.records

src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue

@@ -588,6 +588,7 @@ export default {
             }
 
             this.batchList = this.selectionList
+            console.log('this.batchList',this.batchList)
             this.batchDialog = true
         },
         // 查看详情
@@ -611,6 +612,7 @@ export default {
         },
         // 多选
         selectionChange(list) {
+            console.log('list--------------',list)
             this.selectionList = list;
         },
         selectionClear() {
@@ -743,9 +745,9 @@ export default {
                 workCenterId: params?.workCenterId || this.search.workCenterId,
                 id: params?.id || this.taskId, // 添加 id 参数
             }).then(res =>{
-                res.data.data.records.map(item =>{
+                // res.data.data.records.map(item =>{
-                    item.liquidTank = null
+                //     item.liquidTank = null
-                })
+                // })
                 this.data = res.data.data.records
 
                 this.data.map(item =>{