From 9dbeff6cb01f760d8534597564e2e9f59b114fa3 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Fri, 6 Feb 2026 14:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/processManagement/taskProcessing.js | 2 +- .../processMainte/processPlanning.vue | 25 +- .../processMainte/reworkProcessPlanning.vue | 1 + .../components/trialItem.vue | 634 ++++++++++-------- 4 files changed, 353 insertions(+), 309 deletions(-) diff --git a/src/api/processManagement/taskProcessing.js b/src/api/processManagement/taskProcessing.js index ac86a58..372339f 100644 --- a/src/api/processManagement/taskProcessing.js +++ b/src/api/processManagement/taskProcessing.js @@ -184,7 +184,7 @@ export const getModelList = (params) => { // 工艺模板下拉数据导入 export const getModelDetailList = (params) => { return request({ - url: '/blade-desk/dsProDetail/getModelDetailList', + url: '/blade-desk/dsProModel/detail', method: 'get', params: params, }); diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue index 39ab040..dccadcc 100644 --- a/src/views/processManagement/components/processMainte/processPlanning.vue +++ b/src/views/processManagement/components/processMainte/processPlanning.vue @@ -123,7 +123,9 @@ :value="item.id" /> - 导入模板 + 导入模板 @@ -162,10 +164,7 @@ *工序 - + *工艺能力 - + item.id == row.projectCode); this.form2.tableData2[index].projectName = selectName.name; + this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0; }, // 获取检验标准名字 standardChange(row, index) { @@ -702,7 +700,7 @@ export default { processChange(row, index) { let selectName = this.processSetOption.find(item => item.id == row.ppsId); this.form1.tableData1[index].processName = selectName.name; - this.form1.tableData1[index].processCode = selectName.code; + this.form1.tableData1[index].processCode = selectName.code; if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 let sum_ = 0; @@ -774,6 +772,7 @@ export default { }, // 导入模板 modelLevelChange() { + this.modelLevelLoading = true; getModelDetailList({ modelId: this.modelLevel }).then(res => { const templateData = res.data.data; const existing = [...this.form1.tableData1]; @@ -796,6 +795,7 @@ export default { }); // 赋值(方式1)或追加(方式2) this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式 + this.modelLevelLoading = false; this.$message.success('模板导入成功'); }); @@ -1352,7 +1352,6 @@ export default { if (this.activeName == '2') { this.$refs.tableForm2.validate((isValid, invalidFields) => { if (isValid) { - // 🔍 新增:校验是否包含“耐蚀性检测” const hasCorrosionTest = this.form2.tableData2.some( item => @@ -1364,11 +1363,11 @@ export default { ); // 如果父节点备注包含 'HTBY' 且未设置耐蚀性检测,则报错 - if ((this.parentData.rawData?.remarks?.includes('HTBY') && !hasCorrosionTest)) { + if (this.parentData.rawData?.remarks?.includes('HTBY') && !hasCorrosionTest) { this.$message.error('备注包含 HTBY 时,检测项目必须包含耐蚀性检测!'); return; } - this.craftLoading = true; + this.craftLoading = true; let query_ = { processEntity: this.treeNodes.rawData.processInfo, //工序 processProjectEntityList: this.form2.tableData2, //项目 diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue index 315781b..ddd3cbc 100644 --- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue +++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue @@ -681,6 +681,7 @@ export default { projectChange(row, index) { let selectName = this.projectOptions.find(item => item.id == row.projectCode); this.form2.tableData2[index].projectName = selectName.name; + this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0; }, // 获取检验标准名字 standardChange(row, index) { diff --git a/src/views/productionTesting/components/trialItem.vue b/src/views/productionTesting/components/trialItem.vue index 998efd0..70d6ef2 100644 --- a/src/views/productionTesting/components/trialItem.vue +++ b/src/views/productionTesting/components/trialItem.vue @@ -1,308 +1,352 @@ - - - - 新 增 - + + + + 新 增 + + + + 修改 + 删除 + + + + + 插入一行 + 删除选择行 + + + + + + + + - - 修改 - 删除 + + + + - - - - 插入一行 - 删除选择行 - - - - - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + - \ No newline at end of file +