From 9d0f52c167b4374e19c09f4ee9286806e2ad051d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 9 Jul 2024 11:11:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E5=9C=A8=E4=B8=8D=E5=90=88=E6=A0=BC=E6=97=B6(?= =?UTF-8?q?=E5=AE=9A=E6=80=A7=E7=9A=84=E9=80=89=E6=8B=A9=E4=BA=86=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E3=80=82=E5=AE=9A=E9=87=8F=E7=9A=84=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E8=8C=83=E5=9B=B4)?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=9C=89=E4=B8=AA=E6=98=8E=E6=98=BE?= =?UTF-8?q?=E7=9A=84=E5=B9=B6=E4=B8=94=E5=B8=A6=E6=9C=89=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=9A=84=E6=A0=87=E8=AE=B0=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 2028 ++++++++++++++--------- 1 file changed, 1208 insertions(+), 820 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 7bdea4cda..6cf33a50e 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -1,30 +1,93 @@ - +
- + @@ -247,817 +495,957 @@
From ce880b8d3789fef363e8ec0e77af09cf53628348 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 9 Jul 2024 11:25:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8C=E7=9A=84=E8=AF=B7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?->=E8=AF=B7=E9=80=89=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepairRequestMain/productrepairRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 309e89bc0..bdcb195cd 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -566,7 +566,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive },{ key: 'productionLineCode', value: 'productionLineCode', - message: '请填写生产线代码!', + message: '请选择返修生产线代码!', isMainValue: true }] }, @@ -586,7 +586,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive },{ key: 'productionLineCode', value: 'productionLineCode', - message: '请填写生产线代码!', + message: '请选择返修生产线代码!', isMainValue: true }] } From daeed16deef6588c17c69bef1ec5a640da965c81 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Tue, 9 Jul 2024 11:27:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897=EF=BC=8CHL-?= =?UTF-8?q?3908?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countPlanMain/countPlanMain.data.ts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index defc2b3f5..4247edc61 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -106,20 +106,20 @@ export const CountPlanMain = useCrudSchemas(reactive([ value: 'BY_INEVNEOTY' } }, - { - label: '限值', - field: 'limitedValue', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps:{ - disabled:false - } - } - }, + // { + // label: '限值', + // field: 'limitedValue', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps:{ + // disabled:false + // } + // } + // }, { label: '物料忽略名单', field: 'ignoreListOfItem', From 7f0caef857bc781f071e979b77131e0ab8743134 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 9 Jul 2024 11:28:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=89=A7=E8=A1=8C=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1(?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6cf33a50e..592b812f5 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -664,7 +664,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id) data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id) list.forEach((item, index) => { - // editableTabsValue.value = index + 1 + editableTabsValue.value = 1 item.name = index + 1 item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO item.isPass = '' //判断是否显示对号错误图标