From 38508e814dfd8232fb6012164f31addbde42bfe7 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 11 Jul 2024 08:50:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20WMS=20?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 65b5da1a2..b64c43744 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -28,7 +28,7 @@ - From 955b229d849da7ac079055751bd25490391c80c6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 11 Jul 2024 08:52:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=90=E9=83=BD=20QMS=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=9C=80=E8=A6=81=E5=8F=AA=E8=83=BD=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E4=B8=AD=E9=97=B4=E6=95=B0=E6=8D=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E9=9D=A2=E6=AF=8F=E5=88=97=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E4=B8=8B=E9=9D=A2=E7=BF=BB=E9=A1=B5=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8D=E9=9A=8F=E6=BB=9A?= =?UTF-8?q?=E8=BD=AE=E6=BB=91=E5=8A=A8=E8=80=8C=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/aql/index.vue | 2 +- src/views/qms/counter/index.vue | 2 +- src/views/qms/dynamicRule/index.vue | 2 +- src/views/qms/inspectionJob/index.vue | 2 +- src/views/qms/inspectionMethod/index.vue | 2 +- src/views/qms/inspectionRecord/index.vue | 2 +- src/views/qms/inspectionRequest/index.vue | 2 +- src/views/qms/inspectionScheme/index.vue | 2 +- src/views/qms/inspectionStage/index.vue | 2 +- src/views/qms/inspectionTemplate/index.vue | 2 +- src/views/qms/qualityNotice/index.vue | 2 +- src/views/qms/sampleCode/index.vue | 2 +- src/views/qms/samplingProcess/index.vue | 2 +- src/views/qms/samplingScheme/index.vue | 2 +- src/views/qms/selectedSet/index.vue | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue index 44911263b..c72299829 100644 --- a/src/views/qms/aql/index.vue +++ b/src/views/qms/aql/index.vue @@ -16,7 +16,7 @@ - -
-
-
-
-
diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index be4b972ee..e63611e3d 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -12,7 +12,7 @@ -
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue index c1726aa0f..1442fa9e0 100644 --- a/src/views/qms/inspectionScheme/index.vue +++ b/src/views/qms/inspectionScheme/index.vue @@ -16,7 +16,7 @@ -
-
-
-
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue index 119f8551a..5025694e6 100644 --- a/src/views/qms/sampleCode/index.vue +++ b/src/views/qms/sampleCode/index.vue @@ -16,7 +16,7 @@ -
-
-
-
Date: Thu, 11 Jul 2024 09:24:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?WMS:=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/stockupMainJob/stockupMainJob.data.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index e3e6e26ed..c99428b6e 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -630,7 +630,10 @@ export const StockupDetailJob = useCrudSchemas(reactive([ { label: '操作', field: 'action', - isForm: false, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, hiddenInMain: true, table: { width: 150, From a4ae440dfc1d6bbaffeb6429fc90a22ded1c0684 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 11 Jul 2024 09:47:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRequestMain/index.vue | 4 +++- .../productreceipt/productreceiptRequestMain/index.vue | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 391bc45ec..79694b38a 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -136,10 +136,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 入库存包装规格 row[formField] = val[0][searchField] row['balancePackUnit'] = val[0]['packUnit'] + }else{ + row[formField] = val[0][searchField] } } else { const setV = {} - + setV[formField] = val[0][searchField] //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index c3a97d551..46c2e7a7b 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -235,6 +235,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow[formField] = item[searchField] tableData.value.push(newRow) }) + }else{ + row[formField] = val[0][searchField] } } else {