From cdd12644bc9338f8de9b0ca4cca733a01a3284d1 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 12 May 2026 10:14:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/logisticsManagement/siteBasic.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue index 37c1990b..0bdb471b 100644 --- a/src/views/logisticsManagement/siteBasic.vue +++ b/src/views/logisticsManagement/siteBasic.vue @@ -23,10 +23,11 @@ From 97f8ad0e39ce11bb3a546d17c595725b1a438145 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 12 May 2026 10:49:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E8=A3=85=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E5=B7=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workwearPlan/index.vue | 51 +++++++++++++------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/src/views/warehouseManagement/workwearPlan/index.vue b/src/views/warehouseManagement/workwearPlan/index.vue index f4cee7b9..1f8e2926 100644 --- a/src/views/warehouseManagement/workwearPlan/index.vue +++ b/src/views/warehouseManagement/workwearPlan/index.vue @@ -64,21 +64,21 @@ > --> + v-model="scope.row.moCode" + placeholder="请搜索选择" + api-url="/blade-wms/stGoods/list" + echo-api="/blade-wms/stGoods/list" + echoParamsKey="goodsCode" + echo-method="get" + api-method="get" + list-key="records" + total-key="total" + label-key="goodsCode" + value-key="goodsCode" + search-key="goodsCode" + :debounce-time="100" + @change="(val, item) => changeMoData(val, item, scope.row, scope.$index)" + /> @@ -418,7 +418,7 @@ export default { { label: '保管员', - prop: 'keeper', + prop: 'keeperName', search: false, sortable: true, overHidden: true, @@ -469,6 +469,25 @@ export default { overHidden: true, width: 200, searchOrder: 20, + type: 'select', + dicData: [ + { + label: '新建', + value: 1, + }, + { + label: '已申请', + value: 2, + }, + { + label: '已完成', + value: 3, + }, + { + label: 'erp已删除', + value: 4, + }, + ], rules: [ { required: true, From 772f933d033ace4c694ce3a2bf4765603d3711e6 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Tue, 12 May 2026 11:33:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inboundOutboundManagement/components/addEditDialog.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue index cbd54b04..73b70237 100644 --- a/src/views/inboundOutboundManagement/components/addEditDialog.vue +++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue @@ -284,7 +284,7 @@ export default { { warehousingReason: 4, value: '领用入库' }, // { warehousingReason: 5, value: '料头入库' }, { warehousingReason: 6, value: '物料入库' }, - { warehousingReason: 7, value: '生产入库' }, + { warehousingReason: 7, value: '玻璃饼入库' }, ], keeperList: [], wareList: [], @@ -409,6 +409,11 @@ export default { goodsCode:this.tableData[index].goodsCode, }).then(res => { console.log('res--------', res); + this.tableData[index].printMark = res.data.data.printMark; + this.tableData[index].powderWeight = res.data.data.powderWeight; + this.tableData[index].materialNo = res.data.data.materialNo; + this.tableData[index].thickness = res.data.data.thickness; + // this.tableData[index].glassPieList = res.data.data; }); }, submit() { From 05b62a35cf939ccabc2817ee5cf847a1b5b428ab Mon Sep 17 00:00:00 2001 From: jinna Date: Tue, 12 May 2026 11:52:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addEditInfoDialog.vue | 1 + .../tankSolutionSystem/info.vue | 8 +++-- .../tankSolutionTaskDispose.vue | 8 +++-- .../tankSolutionSystem/workTankLine.vue | 34 ++++++++++++------- 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue index 9b8af9b8..cf0ad752 100644 --- a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue +++ b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue @@ -394,6 +394,7 @@ export default { drugMaterialId:res.data.data.drugMaterialId + '', workCenterId:res.data.data.workCenterId + '', testUserId:res.data.data.testUserId + '', + processUserId:res.data.data.processUserId + '', } if(this.form.jobType == 1){ this.form = { diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue index 977aed16..5d79fc22 100644 --- a/src/views/qualityManagement/tankSolutionSystem/info.vue +++ b/src/views/qualityManagement/tankSolutionSystem/info.vue @@ -111,7 +111,9 @@ export default { '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', , '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31' ], - query:{}, + query:{ + descs:'UPDATE_TIME' + }, isShowImport:false, excelBox: false, loading: false, @@ -795,7 +797,9 @@ export default { this.$refs.crud.toggleSelection(); }, searchReset() { - this.query = {}; + this.query = { + descs:"UPDATE_TIME" + }; this.onLoad(this.page); }, searchChange(params, done) { diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue index 78083d17..a93a7bb3 100644 --- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue +++ b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue @@ -122,7 +122,9 @@ export default { formRules: { userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }], }, - query: {}, + query: { + descs:"CREATE_TIME" + }, loading: true, issueForm: {}, option: { @@ -660,7 +662,9 @@ export default { this.issueDialog = true }, searchReset() { - this.query = {}; + this.query = { + descs:"CREATE_TIME" + }; this.onLoad(this.page); }, searchChange(params, done) { diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue b/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue index 352b56dd..39fede92 100644 --- a/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue +++ b/src/views/qualityManagement/tankSolutionSystem/workTankLine.vue @@ -17,7 +17,7 @@ - + @@ -108,6 +108,10 @@ export default { form: {}, query: {}, lineForm: {}, + lineRules:{ + wcId:[{ required: true, message: '请选择作业中心', trigger: 'blur' }], + timeRange:[{ required: true, message: '请选择时间范围', trigger: 'blur' }], + }, nameForm: {}, detailBox: false, detailForm: {}, @@ -262,17 +266,21 @@ export default { this.lineBox = true }, createLine(){ - createLineList({ - workCenterId:this.lineForm.wcId, - createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] , - createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] , - }).then(res =>{ - console.log('res--------------',res) - this.isShowBox = true - this.lineData = res.data.data.waveData - this.$nextTick(() =>{ - this.createChart() - }) + this.$refs.lineForm.validate(valid => { + if (valid) { + createLineList({ + workCenterId:this.lineForm.wcId, + createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] , + createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] , + }).then(res =>{ + console.log('res--------------',res) + this.isShowBox = true + this.lineData = res.data.data.waveData + this.$nextTick(() =>{ + this.createChart() + }) + }) + } }) }, @@ -443,7 +451,7 @@ export default { const option = { title: { - text: item.workTankName + item.testElement, + text: item.workTankName ? item.workTankName + item.testElement : item.testElement, left: "center", }, legend: {