From 6e9878b1d62d196513da36d1c58f94fa9bcfaec3 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 26 Mar 2026 10:35:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/productionTesting/components/trialStandard.vue | 2 ++ src/views/qualityManagement/tankSolutionSystem/info.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/productionTesting/components/trialStandard.vue b/src/views/productionTesting/components/trialStandard.vue index 018c60a..eba49ae 100644 --- a/src/views/productionTesting/components/trialStandard.vue +++ b/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 = [ { diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue index e7b717f..f6f57ff 100644 --- a/src/views/qualityManagement/tankSolutionSystem/info.vue +++ b/src/views/qualityManagement/tankSolutionSystem/info.vue @@ -188,7 +188,7 @@ export default { }, { label: '作业槽', - prop: 'workTankName', + prop: 'workTankId', search: true, type: 'select', sortable: true, @@ -842,7 +842,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 From ef092275e5a6307622bb17a5e647cb180b6261f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com> Date: Thu, 26 Mar 2026 11:05:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tankSolutionSystem/info.vue | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue index e7b717f..9e4f9a5 100644 --- a/src/views/qualityManagement/tankSolutionSystem/info.vue +++ b/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', - dicUrl:'/blade-desk/BA/WorkCenter/listForSelect', + dicData: [], props: { label: 'wcName', value: 'id', @@ -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 From 0acc54b25799e2b55a2b8646320ccb3a88c2beec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com> Date: Thu, 26 Mar 2026 11:13:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E8=BF=94=E5=B7=A5=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/orderManagement/planYieIdOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue index a110ca1..d834fb2 100644 --- a/src/views/orderManagement/planYieIdOrder.vue +++ b/src/views/orderManagement/planYieIdOrder.vue @@ -534,7 +534,7 @@ export default { { label: '返工单号', prop: 'reworkCode', - search: true, + search: false, sortable: true, width: 120, span: 12, From bd795a8ee27a1d929730780b5e7caf2ad3c8ac36 Mon Sep 17 00:00:00 2001 From: jinna Date: Thu, 26 Mar 2026 11:23:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tankSolutionSystem/tankSolutionTaskDispose.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue index 6d7e7e9..fa900ed 100644 --- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue +++ b/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 =>{ - item.liquidTank = null - }) + // res.data.data.records.map(item =>{ + // item.liquidTank = null + // }) this.data = res.data.data.records this.data.map(item =>{