- {{ t('ts.更新')}}
- {{ t('ts.追加') }}
- {{ t('ts.覆盖') }}
+ {{ t('ts.更新')}}
+ {{ t('ts.追加') }}
+ {{ t('ts.覆盖') }}
@@ -141,18 +141,36 @@ const props = defineProps({
required: false,
default: false
},
+ // 更新是否展示
+ updateIsShow: {
+ type: Boolean,
+ required: false,
+ default: true
+ },
// 追加是否禁用,默认值不禁用
appendIsDisable: {
type: Boolean,
required: false,
default: false
},
+ // 追加是否展示
+ appendIsShow: {
+ type: Boolean,
+ required: false,
+ default: true
+ },
// 覆盖是否禁用,默认值不禁用
coverIsDisable: {
type: Boolean,
required: false,
default: false
},
+ // 覆盖是否展示
+ coverIsShow: {
+ type: Boolean,
+ required: false,
+ default: true
+ },
// 是否部门保存,默认是
updatePart: {
type: Boolean,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index bb2c0a188..a4a050f5b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -80,7 +80,7 @@
/>
+ @success="importSuccess" :updateIsDisable="false" :appendIsDisable="true" :coverIsDisable="true" :mode="1" :coverIsShow="false" :appendIsShow="false"/>
From 343acdd6d92bea5b39366b4a4d2420317aa39929 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 16:40:58 +0800
Subject: [PATCH 13/60] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E3=80=81=E5=A4=87=E6=B3=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../preparetoissueplan/preparetoissueMain/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 89feccd34..8a2b05fab 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(tableData.value.find(item1=>item1['itemCode'] == val[0]['componentItemCode'])){
message.warning(`物料${val[0]['componentItemCode']}已经存在`)
return
- }
+ }
row['itemCode'] = val[0]['componentItemCode']
row['uom'] = val[0]['componentUom']
} else if(formField == 'workStation'){
@@ -419,7 +419,7 @@ const openForm =async (type: string, row?: number) => {
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"planPreparetoissueMain")
}
/** 删除按钮操作 */
From f40110d832081cb5a28a5f64c4396826c790f382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 16:43:46 +0800
Subject: [PATCH 14/60] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E4=B8=AD=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qms/inspectionJob/inspectionJobMain.data.ts | 15 +++++++++++++++
.../inspectionRecord/inspectionRecordMain.data.ts | 10 ++++++++++
.../inspectionRequestMain.data.ts | 12 +++++++++++-
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 389bd9f99..ea0fa697d 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -225,6 +225,21 @@ export const InspectionJobMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '供应商批次',
+ field: 'supplierBatch',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ },
+ table: {
+ width: 150
+ }
+ },
{
label: '检验批数量',
field: 'inspectionBatchAmount',
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 88dbba0de..4d92bf0f9 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -120,6 +120,16 @@ export const InspectionRecordMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '供应商批次',
+ field: 'supplierBatch',
+ sort: 'custom',
+ isSearch: false,
+ isForm: false,
+ table: {
+ width: 150
+ }
+ },
{
label: '检验方案编码',
field: 'inspectionSchemeCode',
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index 90ba50ea2..a81a200bc 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -306,7 +306,7 @@ export const InspectionMain = useCrudSchemas(
}
},
{
- label: '批次',
+ label: '检验批次',
field: 'batch',
sort: 'custom',
isSearch: false,
@@ -314,6 +314,16 @@ export const InspectionMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '供应商批次',
+ field: 'supplierBatch',
+ sort: 'custom',
+ isSearch: false,
+ isForm: false,
+ table: {
+ width: 150
+ }
+ },
{
label: '待检数量',
field: 'requestInspectionNum',
From d4c257833a09966da7b9add27b4759909e7869a9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 16:53:00 +0800
Subject: [PATCH 15/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productreceipt/productreceiptRequestMain/index.vue | 4 ++++
.../productreceiptAssembleRequestMain/index.vue | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 1e9dde54f..5006d4d04 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -210,6 +210,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['packQty'] = val[0]['packQty']
row[formField] = val[0][searchField]
}else if (formField == 'itemCode') {
+ if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+ message.warning(`物料${val[0]['itemCode']}已经存在`)
+ return
+ }
row['uom'] = val[0]['uom']
row['produceDate'] = dayjs().valueOf()
row[formField] = val[0][searchField]
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 491dc8daf..0ce049b13 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -211,6 +211,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['packQty'] = val[0]['packQty']
row[formField] = val[0][searchField]
}else if (formField == 'itemCode') {
+ if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+ message.warning(`物料${val[0]['itemCode']}已经存在`)
+ return
+ }
row['uom'] = val[0]['uom']
row['produceDate'] = dayjs().valueOf()
row[formField] = val[0][searchField]
From 24a9c25d603933b0744b7093f0d4ac0a75191006 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:00:26 +0800
Subject: [PATCH 16/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventoryinitial/inventoryinitRequestMain/index.vue | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index 79694b38a..c659954a2 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -115,6 +115,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// 明细查询页赋值
if(formField=='itemCode'){
//物料代码
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['code']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow[formField] = item[searchField]
From fb988c46ebfe6feeb99609e8d942a39f36c8a43f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:03:24 +0800
Subject: [PATCH 17/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../unplannedissue/unplannedissueRequestMain/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 55b13a0a2..ac6b09607 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -114,6 +114,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
// 明细查询页赋值
if(formField === 'itemCode'){
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['batch']==item['batch']&&item1['packingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['inventoryStatus']==item['inventoryStatus']))
+ if(val.length==0) return
val.forEach(item=>{
let newRow = JSON.parse(JSON.stringify(tableFormKeys))
newRow[formField] =item[searchField]
From eb1e745e23478fd2ad3d8748d373f3178f6d0102 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 17:05:09 +0800
Subject: [PATCH 18/60] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=81=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=A4=87=E6=B3=A8bug=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionreceipt/productionreceiptJobMain/index.vue | 2 +-
.../productionreceipt/productionreceiptRecordMain/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index feaba54ef..611dd428c 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -288,7 +288,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"jobProductionreceiptMain")
}
/** 导出按钮操作 */
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index 7adfda3b6..23ce2913b 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -144,7 +144,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"recordProductionreceiptMain")
}
/** 导出按钮操作 */
From 61e376c0d33e6b09de1dc7dc4094bfaabe9719e0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:07:40 +0800
Subject: [PATCH 19/60] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventorymove/inventorymoveRequestMain/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 3d7a9182e..d848a5834 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -340,7 +340,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => {
if (type == 'tableForm') {
if(formField == 'fromPackingNumber'){
-
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['fromPackingNumber'] = item['packingNumber']
From ffb9cc327f07e1f585a8f79fde61873867da9b13 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:11:08 +0800
Subject: [PATCH 20/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventorychange/inventorychangeRequestMain/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 0aa1d217f..7c0b349df 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -133,6 +133,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//到货主代码
row['toOwnerCode'] = val[0]['code']
}else if(formField == 'fromPackingNumber'){
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow[formField] = item[searchField]
From 9b72826df4059d827df95acfa8335c2745827996 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:13:10 +0800
Subject: [PATCH 21/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sparepartsrequisitionRequestMain/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index d4ad79678..69d31a86d 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -114,6 +114,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
// 明细查询页赋值
if(formField=='itemCode'){
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['batch']==item['batch']&&item1['packingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['inventoryStatus']==item['inventoryStatus']))
+ if(val.length==0) return
val.forEach(item=>{
let newRow = JSON.parse(JSON.stringify(tableFormKeys))
newRow['packingNumber'] = item['packingNumber']
From 2920c471657eeb251199f0770ef7c839e627943b Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 17:14:42 +0800
Subject: [PATCH 22/60] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=A4=87=E6=B3=A8bug=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../onlinesettlement/onlinesettlementRecordMain/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
index d5d90e77b..b4f8a8d89 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@@ -139,7 +139,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"recordOnlinesettlementMain")
}
/** 导出按钮操作 */
From 8f66dae2749466726589413f31bb9ade1b7393bb Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:15:22 +0800
Subject: [PATCH 23/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliverplan/deliverPlanMain/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 043524a2a..20fdfe023 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -157,6 +157,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
})
if (type == 'tableForm') {
if(formField == 'itemCode') {
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
val.forEach(item=>{
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
From 274cd7b971d0b6ea1e0540661a19a5c6d857f493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 17:15:25 +0800
Subject: [PATCH 24/60] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qms/inspectionJob/inspectionJobMain.data.ts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index ea0fa697d..093592ed4 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -560,6 +560,18 @@ export const InspectionJobMain = useCrudSchemas(
}
}
},
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.JOB_STATUS,
+ dictClass: 'string',
+ isForm: false,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ }
+ },
{
label: '创建时间',
field: 'createTime',
@@ -624,6 +636,7 @@ export const InspectionJobMain = useCrudSchemas(
width: 150
}
},
+
{
label: '操作',
field: 'action',
From af7027199a8de87b1c352d8fb72ad71c2b873638 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:18:25 +0800
Subject: [PATCH 25/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index ae42c44cb..91d5fb334 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -199,6 +199,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code']
} else if(formField == 'itemCode'){
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['code']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
if(val.length==0){
return
}
From e8e60b9d9f1000bf534dedec6f88578cfe6721db Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:22:49 +0800
Subject: [PATCH 26/60] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliver/deliverRequestMain/index.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index f46c3e11d..f8e1430c4 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -143,6 +143,7 @@ const updataTableColumns = (val) => {
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+ console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
nextTick(async () => {
if (type == 'tableForm') {
if(formField == 'itemCode') {
@@ -150,8 +151,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =
DeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['itemCode']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(val.length==0) return
val.forEach(item=>{
- if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
newRow['id'] = item['id']
From 88b734d97cfd9e0e8b50b43c200ba76047eefd63 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:27:03 +0800
Subject: [PATCH 27/60] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../stockup/stockupMainRequest/index.vue | 7 +++++++
.../stockup/stockupMainRequest/stockupMainRequest.data.ts | 1 +
2 files changed, 8 insertions(+)
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 9cc571da8..3edbc9158 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -128,6 +128,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// row['uom'] = val[0]['uom']
// }
if(formField == 'itemCode') {
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['code']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
+ if(val.length==0) return
val.forEach(item=>{
if(tableData.value.find(item1=>item1['itemCode'] == item['code'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index 373e50f03..26fb57890 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -649,6 +649,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive
([
width: 150
},
tableForm:{
+ multiple:true,
isInpuFocusShow: false, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码',
searchField: 'code',
From 1e4c2ac1c135fb368f18adad269f988accb94f3d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 17:40:21 +0800
Subject: [PATCH 28/60] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../itemManage/relegate/relegateRequest/index.vue | 7 +++++++
.../containermanage/initialContainerMainRequest/index.vue | 7 +++++++
.../initialContainerMainRequest.data.ts | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index ce621fe3f..17c8549b7 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -95,6 +95,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => {
if (type == 'tableForm') {
if (formField == 'itemCode') {
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['itemCode']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['itemCode'] = item['itemCode']
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 6024c640f..20028f7e2 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -132,6 +132,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => {
if (type == 'tableForm') {
if(formField == 'containerNumber') {
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['containerNumber']==item['code']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['code']))
+ message.warning(`器具号${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['containerNumber']==item['code']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['containerNumber'] = item['code']
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index 97a6dc837..766ad8056 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -359,7 +359,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([
sort: 'custom',
tableForm:{
multiple:true,
- isInpuFocusShow: true, // 开启查询弹窗
+ isInpuFocusShow: false, // 开启查询弹窗
+ disabled: true,
searchListPlaceholder: '请选择器具号',
searchField: 'itemCode',
searchTitle: '器具信息',
From 6b3b1e809004df6b9738950a8fb594b62944d617 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 22 Jul 2024 18:23:25 +0800
Subject: [PATCH 29/60] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E5=92=8C?=
=?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/countManage/count/countPlanMain/countPlanMain.data.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index efda01683..087d2cc37 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -128,6 +128,7 @@ export const CountPlanMain = useCrudSchemas(reactive([
table: {
width: 150
},
+ isForm:false,
form: {
componentProps: {
isSearchList: true, // 开启查询弹窗
@@ -147,6 +148,7 @@ export const CountPlanMain = useCrudSchemas(reactive([
table: {
width: 150
},
+ isForm: false,
form: {
componentProps: {
isSearchList: true, // 开启查询弹窗
From 0c5cfe4980ef079dfb6c40652e442d6970e0fd87 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 22 Jul 2024 18:24:24 +0800
Subject: [PATCH 30/60] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/wms/countManage/count/countPlanMain/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index eaf2b9d63..2dfa1d077 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -57,6 +57,7 @@
:tableData="tableData"
:apiUpdate="CountPlanMainApi.updateCountPlanMain"
:apiCreate="CountPlanMainApi.createCountPlanMain"
+ :CountPlanMain1FormAllSchemas="CountPlanMain1.allSchemas"
fromeWhere="countPlan"
:countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
@handleAddTable="handleAddTable"
@@ -111,7 +112,8 @@ import {
CountPlanDetail,
CountPlanDetailRules,
CountPlanMain,
- CountPlanMainRules
+ CountPlanMainRules,
+ CountPlanMain1
} from './countPlanMain.data'
import * as CountPlanMainApi from '@/api/wms/countPlanMain'
import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'
From 65a7b33f4aec300148b6be3531327482592d4de6 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 18:37:30 +0800
Subject: [PATCH 31/60] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SearchHigh/src/SearchHigh.vue | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index e7aba727d..427d5fca2 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -24,7 +24,7 @@
-
@@ -265,6 +265,18 @@ const buttonBaseClick = (val) => {
}
}
+watch(()=>popoverVisible.value,()=>{
+ if(popoverVisible.value){
+ getDictOptions()
+ }
+})
+const allDictOptions = ref({}) //所有下拉框选项
+const getDictOptions = ()=>{
+ let selectList = searchOption_high.value.filter(item=>getInputType(item.field) == 'select')
+ selectList.forEach(item=>{
+ allDictOptions.value[item.field] = getStrDictOptions(item.dictType)
+ })
+}
// 初始化下拉option值
const initSelectOptions = (item) => {
return getStrDictOptions(searchOption_high.value.find(searchOptionItem => (searchOptionItem.field == item)).dictType)
From 1cb86dc6121240e8e9aed57deabc9a5fbe9fd522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 18:38:58 +0800
Subject: [PATCH 32/60] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionRecord/inspectionRecordMain.data.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 4d92bf0f9..0070e6814 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -380,6 +380,7 @@ export const InspectionRecordMain = useCrudSchemas(
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
+ isForm: false,
search: {
component: 'DatePicker',
componentProps: {
@@ -389,7 +390,6 @@ export const InspectionRecordMain = useCrudSchemas(
}
},
form: {
- component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
From cc513599e1e4ffb3a4f51e0fd57bf991345d29d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 18:50:11 +0800
Subject: [PATCH 33/60] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qms/inspectionRecord/inspectionRecordMain.data.ts | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 0070e6814..4cd5cfa11 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -434,6 +434,17 @@ export const InspectionRecordMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '执行结果',
+ field: 'estimateCode',
+ dictType: DICT_TYPE.EVALUATION_CODE,
+ sort: 'custom',
+ isSearch: false,
+ isForm: false,
+ table: {
+ width: 150
+ }
+ },
{
label: '创建时间',
field: 'createTime',
From e7ec27eac3102a344a55530e2dc591b967e3f27b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 19:01:31 +0800
Subject: [PATCH 34/60] =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionreturnRequestMainNo/index.vue | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 660783b9f..e736a4825 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -177,24 +177,30 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
// 明细查询页赋值
if(formField == 'itemCode') {
+ if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+ message.warning(`物料${val[0]['itemCode']}已经存在`)
+ return
+ }
+
const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){
message.warning('当前物料可制造与其他数据不一致，请重新选择！')
} else {
+
row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom']
row['inventoryStatus'] = val[0]['inventoryStatus']
- row['qty'] = val[0]['qty']
+ row['qty'] = Number(val[0]['qty'])
// 修改 tableform 属性 数量最大值设置为库存余额中数量
- ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
- if(item.field == 'qty') {
- item.tableForm.max = val[0]['qty']
- }
- if(item.field == 'batch') {
- item.tableForm.disabled = false
- }
- })
+ ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+ if(item.field == 'qty' && Number(val[0]['qty'])>item.tableForm.min) {
+ item.tableForm.max = Number(val[0]['qty'])
+ }
+ if(item.field == 'batch') {
+ item.tableForm.disabled = false
+ }
+ })
}
} else if(formField == 'workStationCode') {
val.forEach(item=>{
From 8cc1c6158ad5b00267752b57fe5ccaa9f92b2a97 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 19:08:07 +0800
Subject: [PATCH 35/60] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliverplan/deliverPlanMain/index.vue | 1 +
.../containermanage/containerMainRequest/index.vue | 8 +++++++-
.../containermanage/scrapContainerMainRequest/index.vue | 7 +++++++
.../productredress/productredressRequestMain/index.vue | 2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 20fdfe023..679089713 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -158,6 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
if(formField == 'itemCode') {
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(val.length==0) return
val.forEach(item=>{
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index 6226545d9..56c7fe1f9 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -157,7 +157,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => {
if (type == 'tableForm') {
if(formField == 'containerNumber') {
-
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['containerNumber']==item['itemCode']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['itemCode']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['containerNumber']==item['itemCode']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['containerNumber'] = item['itemCode']
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 1eaca15ea..2255710a7 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -133,6 +133,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => {
if (type == 'tableForm') {
if(formField == 'containerNumber') {
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['containerNumber']==item['itemCode']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['itemCode']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
+ val = val.filter(item=>!tableData.value.find(item1=>item1['containerNumber']==item['itemCode']))
+ if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['containerNumber'] = item['itemCode']
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 086524541..85d9c1a37 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -131,6 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// 明细查询页赋值
row[formField] = val[0][searchField]
if (formField == 'itemCode') {
+ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['batch']==item['batch']&&item1['packingNumber']==item['packingNumber']&&item1['locationCode']==item['locationCode']&&item1['inventoryStatus']==item['inventoryStatus']))
+ if(val.length==0) return
val.forEach(item=>{
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['batch'] == item['batch']&&item1['packingNumber'] == item['packingNumber']&&item1['toLocationCode'] == item['locationCode']&&item1['inventoryStatus'] == item['inventoryStatus'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
From dacca1e12bd981270e92765fca80c9ffe413f459 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 19:09:04 +0800
Subject: [PATCH 36/60] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliverplan/deliverPlanMain/index.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 679089713..47f96799d 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -157,10 +157,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
})
if (type == 'tableForm') {
if(formField == 'itemCode') {
+ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+ if(itemCodes.length>0){
+ itemCodes = itemCodes.map(item=>(item['itemCode']))
+ message.warning(`物料${itemCodes.join(',')}已经存在`)
+ }
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
if(val.length==0) return
val.forEach(item=>{
- if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row[formField] = item[searchField]
newRow['uom'] = item['customerUom']
From 2c3da301df3f7c9d61db56348396770b239e95da Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 19:38:42 +0800
Subject: [PATCH 37/60] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=81=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productionreturn/productionreturnJobMain/index.vue | 2 +-
.../productionreturn/productionreturnRecordMain/index.vue | 2 +-
.../productionreturnRequestMain/index.vue | 4 ++--
.../productionreturnRequestMainNo/index.vue | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index fc7c9400a..2d64cb732 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -260,7 +260,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"jobProductionreturnMain")
}
/** 导出按钮操作 */
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index cd2f00442..ae8aebbeb 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -144,7 +144,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"recordProductionreturnMain")
}
/** 导出按钮操作 */
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index a77b1ffdb..82d8d0dfa 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -191,7 +191,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
message.warning(`物料${val[0]['itemCode']}已经存在`)
return
- }
+ }
const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){
@@ -574,7 +574,7 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"requestProductionreturnMain")
}
/** 详情操作——子表表单 */
const detailOpenForm = (type, row) => {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index e736a4825..529e57f8a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -181,12 +181,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
message.warning(`物料${val[0]['itemCode']}已经存在`)
return
}
-
+
const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){
message.warning('当前物料可制造与其他数据不一致，请重新选择！')
} else {
-
+
row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom']
@@ -524,7 +524,7 @@ const openForm =async (type: string, row?: number) => {
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
- detailRef.value.openDetail(row, titleName, titleValue)
+ detailRef.value.openDetail(row, titleName, titleValue,"requestProductionreturnMainNo")
}
/** 删除按钮操作 */
@@ -716,7 +716,7 @@ const labelPrint = async (row) => {
// 批量打印--生产退料
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
-
+
console.log('批量打印',val)
// let rows:any = []
// val.forEach(item=>{
From e63520bb8a4fd32f325bc4cfc0c607d934d391d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 22 Jul 2024 19:43:55 +0800
Subject: [PATCH 38/60] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/aql/aql.data.ts | 19 ++++++++++++++
src/views/qms/counter/counter.data.ts | 25 ++++++++++++++++---
src/views/qms/dynamicRule/dynamicRule.data.ts | 1 +
.../inspectionJob/inspectionJobMain.data.ts | 19 ++++++++++++++
.../inspectionMethod/inspectionMethod.data.ts | 1 +
.../inspectionRecordMain.data.ts | 19 ++++++++++++++
.../inspectionRequestMain.data.ts | 19 ++++++++++++++
.../inspectionScheme/inspectionScheme.data.ts | 1 +
.../inspectionTemplate.data.ts | 1 +
.../qualityNotice/qualityNoticeMain.data.ts | 19 ++++++++++++++
src/views/qms/sampleCode/sampleCode.data.ts | 1 +
.../samplingProcess/samplingProcess.data.ts | 4 +++
.../qms/samplingScheme/samplingScheme.data.ts | 1 +
src/views/qms/selectedSet/selectedSet.data.ts | 1 +
14 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts
index f60bf83b7..9810dcd88 100644
--- a/src/views/qms/aql/aql.data.ts
+++ b/src/views/qms/aql/aql.data.ts
@@ -536,6 +536,25 @@ export const Aql = useCrudSchemas(
width: 105
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ isSearch: true,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
index 9723b65a8..de708bee0 100644
--- a/src/views/qms/counter/counter.data.ts
+++ b/src/views/qms/counter/counter.data.ts
@@ -153,10 +153,10 @@ export const Counter = useCrudSchemas(
field: 'nextStage',
sort: 'custom',
isSearch: false,
- form:{
+ form: {
component: 'Select',
componentProps: {
- options:[],
+ options: [],
optionsAlias: {
labelField: 'stage',
valueField: 'stage'
@@ -167,6 +167,25 @@ export const Counter = useCrudSchemas(
width: 140
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ isSearch: true,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
@@ -231,7 +250,7 @@ export const Counter = useCrudSchemas(
width: 150
}
},
-
+
{
label: '操作',
field: 'action',
diff --git a/src/views/qms/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts
index 3bf0ed6ca..13394072c 100644
--- a/src/views/qms/dynamicRule/dynamicRule.data.ts
+++ b/src/views/qms/dynamicRule/dynamicRule.data.ts
@@ -39,6 +39,7 @@ export const DynamicRule = useCrudSchemas(
field: 'available',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
+ isSearch: true,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Switch',
diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
index 093592ed4..763f23842 100644
--- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts
@@ -572,6 +572,25 @@ export const InspectionJobMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ isSearch: true,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
index 821f809d9..53343e5ad 100644
--- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts
+++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts
@@ -55,6 +55,7 @@ export const InspectionMethod = useCrudSchemas(
label: '是否可用',
field: 'available',
sort: 'custom',
+ isSearch: true,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
index 4cd5cfa11..1ed5d7378 100644
--- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
@@ -445,6 +445,25 @@ export const InspectionRecordMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ isSearch: true,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
index a81a200bc..0b83ac846 100644
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@@ -425,6 +425,25 @@ export const InspectionMain = useCrudSchemas(
width: 150
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ isSearch: true,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
index 041851697..d82869314 100644
--- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
@@ -184,6 +184,7 @@ export const InspectionSchemeMain = useCrudSchemas(
label: '是否可用',
field: 'available',
sort: 'custom',
+ isSearch: true,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
diff --git a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
index 03ba803a2..60c8c6736 100644
--- a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
+++ b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
@@ -59,6 +59,7 @@ export const InspectionTemplateMain = useCrudSchemas(
label: '是否可用',
field: 'available',
sort: 'custom',
+ isSearch: true,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
diff --git a/src/views/qms/qualityNotice/qualityNoticeMain.data.ts b/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
index 00d24e626..c2dce6077 100644
--- a/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
+++ b/src/views/qms/qualityNotice/qualityNoticeMain.data.ts
@@ -317,6 +317,25 @@ export const QualityNoticeMain = useCrudSchemas(
width: 175
}
},
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ isSearch: true,
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ table: {
+ width: 110
+ }
+ },
{
label: '创建时间',
field: 'createTime',
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 330f5dec9..233b0e86c 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -102,6 +102,7 @@ export const SampleCode = useCrudSchemas(
field: 'available',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
+ isSearch: true,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Switch',
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index 08d418c6e..74ae82da4 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -85,6 +85,7 @@ export const SamplingProcess = useCrudSchemas(
field: 'available',
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
+ isSearch: true,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Switch',
@@ -93,6 +94,9 @@ export const SamplingProcess = useCrudSchemas(
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
+ },
+ table: {
+ width: 110
}
},
{
diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts
index 7ede5cd2f..b85abf027 100644
--- a/src/views/qms/samplingScheme/samplingScheme.data.ts
+++ b/src/views/qms/samplingScheme/samplingScheme.data.ts
@@ -28,6 +28,7 @@ export const SamplingScheme = useCrudSchemas(
label: '是否可用',
field: 'available',
sort: 'custom',
+ isSearch:true,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
diff --git a/src/views/qms/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts
index b13c7af2d..3fdbf7d8b 100644
--- a/src/views/qms/selectedSet/selectedSet.data.ts
+++ b/src/views/qms/selectedSet/selectedSet.data.ts
@@ -30,6 +30,7 @@ export const SelectedSet = useCrudSchemas(
label: '是否可用',
field: 'available',
sort: 'custom',
+ isSearch: true,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
From a9fe7878d44c3e38912e9e138b31f7f7956854ec Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 22 Jul 2024 19:52:08 +0800
Subject: [PATCH 39/60] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
=?UTF-8?q?=E9=80=80=E8=B4=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchasereturnRequestMain/index.vue | 2 +
.../purchasereturnRecordSpareMain/index.vue | 198 ++
.../purchasereturnRecordSpareMain.data.ts | 906 +++++++++
.../purchasereturnRequestSpareMain/index.vue | 1014 ++++++++++
.../purchasereturnRequestSpareMain.data.ts | 1674 +++++++++++++++++
5 files changed, 3794 insertions(+)
create mode 100644 src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
create mode 100644 src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
create mode 100644 src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
create mode 100644 src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 7875f9402..b8aa0129c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -915,9 +915,11 @@ const submitForm = async (formType, submitData) => {
formRef.value.formLoading = false
return
}
+ data.returnSourceType='1'
await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data)
message.success(t('common.createSuccess'))
} else {
+ data.returnSourceType='1'
await PurchasereturnRequestMainApi.updatePurchasereturnRequestMain(data)
message.success(t('common.updateSuccess'))
}
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
new file mode 100644
index 000000000..0a762707e
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
new file mode 100644
index 000000000..ef0a33ad3
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
@@ -0,0 +1,906 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购退货记录主表
+ */
+export const PurchasereturnRecordMain = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ sortTableDefault: 1012,
+ sortSearchDefault:1,
+ isSearch: true
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '采购收货记录单号',
+ field: 'purchaseReceiptRecordNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true,
+ sortTableDefault: 3,
+ sortSearchDefault: 5,
+ }, {
+ label: 'qad采购退货记录单号',
+ field: 'qadPurchaseReturnRecordCode',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortSearchDefault:3,
+ sortTableDefault: 4,
+ isTable: true
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortSearchDefault:3,
+ isSearch: true,
+ sortTableDefault: 2
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false
+ },
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1,
+ sortSearchDefault:2,
+ isSearch: true
+ },
+ {
+ label: '从月台代码',
+ field: 'fromDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '出库事务类型',
+ field: 'outTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransactionType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ },
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ // {
+ // label: '原因',
+ // field: 'available',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: true,
+ // },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable: false,
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ },
+ }
+]))
+
+//表单校验
+export const PurchasereturnRecordMainRules = reactive({
+ requestNumber: [
+ { required: true, message: '请选择申请单号', trigger: 'change' }
+ ],
+ supplierCode: [
+ { required: true, message: '请选择供应商代码', trigger: 'change' }
+ ],
+ fromWarehouseCode: [
+ { required: true, message: '请选择从仓库代码', trigger: 'change' }
+ ],
+ fromAreaTypes: [
+ { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+ ],
+ outTransaction: [
+ { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+ ],
+ inTransaction: [
+ { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+ ],
+ executeTime: [
+ { required: true, message: '请输入执行时间', trigger: 'change' }
+ ],
+ activeDate: [
+ { required: true, message: '请输入生效日期', trigger: 'change' }
+ ],
+ available: [
+ { required: true, message: '请输入是否可用', trigger: 'blur' }
+ ],
+ departmentCode: [
+ { required: true, message: '请输入部门', trigger: 'blur' }
+ ],
+ interfaceType: [
+ { required: true, message: '请选择接口类型', trigger: 'change' }
+ ],
+ number: [
+ { required: true, message: '请输入单据号', trigger: 'blur' }
+ ],
+ businessType: [
+ { required: true, message: '请输入业务类型', trigger: 'blur' }
+ ],
+ createTime: [
+ { required: true, message: '请选择创建时间', trigger: 'change' }
+ ],
+ creator: [
+ { required: true, message: '请输入创建者', trigger: 'blur' }
+ ],
+})
+
+/**
+ * @returns {Array} 采购退货记录子表
+ */
+export const PurchasereturnRecordDetail = useCrudSchemas(reactive([
+
+ {
+ label: '从包装号',
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortTableDefault: 1001,
+ sortSearchDefault: 1001,
+ },
+ {
+ label: '到包装号',
+ field: 'toPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ hiddenInMain: true,
+ sortSearchDefault: 1002,
+ sortTableDefault: 1001,
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1004,
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1004,
+ form: {
+ component: 'InputNumber',
+ }
+ },
+ {
+ label: '退货数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6,
+ disabled:false
+ }
+ },
+ sortTableDefault: 1004,
+ hiddenInMain:true,
+ isForm:false,
+ tableForm:{
+ type:'InputNumber',
+ min:0,
+ precision: 6,
+ disabled:false
+ }
+ },
+ {
+ label: '从器具号',
+ field: 'fromContainerNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain: true
+ },
+ {
+ label: '到器具号',
+ field: 'toContainerNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain: true
+ },
+ {
+ label: '从批次',
+ field: 'fromBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortTableDefault: 1000,
+ },
+ {
+ label: '到批次',
+ field: 'toBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortTableDefault: 1000,
+ hiddenInMain: true
+ },
+ {
+ label: '替代批次',
+ field: 'altBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain: true
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1009,
+ hiddenInMain: true
+ },
+ // {
+ // label: '到库位代码',
+ // field: 'toLocationCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // sortTableDefault: 1009,
+ // hiddenInMain: true
+ // },
+ {
+ label: '从库位组代码',
+ field: 'fromLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1010,
+ hiddenInMain: true
+ },
+ // {
+ // label: '到库位组代码',
+ // field: 'toLocationGroupCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // sortTableDefault: 1010,
+ // hiddenInMain: true
+ // },
+ {
+ label: '从库区代码',
+ field: 'fromAreaCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1010,
+ hiddenInMain: true
+ },
+ // {
+ // label: '到库区代码',
+ // field: 'toAreaCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // sortTableDefault: 1010,
+ // hiddenInMain: true
+ // },
+ {
+ label: '从货主代码',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1010,
+ hiddenInMain: true
+ },
+ {
+ label: '到货主代码',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1010,
+ hiddenInMain: true
+ },
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1008,
+ hiddenInMain: true
+ },
+ {
+ label: '订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 4,
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 5,
+ },
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ },
+ sortTableDefault: 1013,
+ hiddenInMain: true,
+ isSearch: false
+ },
+ {
+ label: '原因',
+ field: 'reason',
+ dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1013,
+ hiddenInMain: true
+ },
+
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortSearchDefault: 6,
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortSearchDefault: 6,
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortSearchDefault: 7,
+ hiddenInMain: true
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortSearchDefault: 7,
+ hiddenInMain: true
+ },
+ // {
+ // label: '数量',
+ // field: 'qty',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable:true,
+ // sortTableDefault: 1005,
+ // form: {
+ // component: 'InputNumber',
+ // }
+ // },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sortTableDefault: 1006,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '单价',
+ field: 'singlePrice',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain:true,
+ sortTableDefault: 1006,
+ form: {
+ component: 'InputNumber',
+ }
+ },
+ {
+ label: '金额',
+ field: 'amount',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain:true,
+ sortTableDefault: 1006,
+ form: {
+ component: 'InputNumber',
+ }
+ },
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1011,
+ hiddenInMain: true
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true
+ },
+ // {
+ // label: '任务明细ID',
+ // field: 'jobDetailId',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '原因',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1007,
+ hiddenInMain: true
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1014,
+ hiddenInMain: true,
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ hiddenInMain: true,
+ sortTableDefault: 1014,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+
+]))
+
+//表单校验
+export const PurchasereturnRecordDetailRules = reactive({
+ fromPackingNumber: [
+ { required: true, message: '请选择从包装号', trigger: 'change' }
+ ],
+ toPackingNumber: [
+ { required: true, message: '请选择到包装号', trigger: 'change' }
+ ],
+ fromBatch: [
+ { required: true, message: '请输入从批次', trigger: 'blur' }
+ ],
+ toBatch: [
+ { required: true, message: '请输入到批次', trigger: 'blur' }
+ ],
+ reason: [
+ { required: true, message: '请选择原因', trigger: 'change' }
+ ],
+ fromLocationCode: [
+ { required: true, message: '请选择从库位代码', trigger: 'change' }
+ ],
+ fromLocationGroupCode: [
+ { required: true, message: '请选择从库位组代码', trigger: 'change' }
+ ],
+ fromAreaCode: [
+ { required: true, message: '请选择从库区代码', trigger: 'change' }
+ ],
+ inventoryStatus: [
+ { required: true, message: '请选择库存状态', trigger: 'change' }
+ ],
+ poNumber: [
+ { required: true, message: '请选择订单号', trigger: 'change' }
+ ],
+ poline: [
+ { required: true, message: '请选择订单行', trigger: 'change' }
+ ],
+})
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
new file mode 100644
index 000000000..74f26175a
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -0,0 +1,1014 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
new file mode 100644
index 000000000..cfe8ea285
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
@@ -0,0 +1,1674 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+import * as LocationApi from "@/api/wms/location";
+import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+ pageSize:10,
+ pageNo:1,
+ code:'PurchaseReturnRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+
+
+// 采购收货记录展示列
+export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ fixed: 'left',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '采购收货记录单号',
+ field: 'number',
+ fixed: 'left',
+ sort: 'custom',
+ table: {
+ width: 200
+ },
+ isSearch: true
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: '采购订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+ field: 'fromBatch',
+ sort: 'custom',
+ isForm:false,
+ isTableForm:false,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ // {
+ // label: '包装规格',
+ // field: 'packUnit',
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '从库位代码',
+ // field: 'fromLocationCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ //
+ // },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+
+
+]))
+
+/**
+ * @returns {Array} 采购退货申请主表
+ */
+export const PurchasereturnRequestMain = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true,
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ isForm:false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:1,
+ form: {
+ value: '1',
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ // {
+ // label: '供应商代码',
+ // field: 'supplierCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // sortTableDefault:1,
+ // isSearch: true,
+ // form:{
+ // componentProps:{
+ // enterSearch: true,
+ // isSearchList: true, // 开启查询弹窗
+ // searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+ // searchField: 'code', // 查询弹窗赋值字段
+ // searchTitle: '供应商信息', // 查询弹窗标题
+ // searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+ // searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ // verificationParams: [{
+ // key: 'code',
+ // action: '==',
+ // value: '',
+ // isMainValue: false,
+ // isSearch: true,
+ // isFormModel: true,
+ // }], // 失去焦点校验参数
+ // }
+ // }
+ // },
+ // {
+ // label: '维修备件收货记录单号',
+ // field: 'purchaseReceiptRecordNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // // labelMessage: '信息提示说明！！！',
+ // componentProps: {
+ // enterSearch: true,
+ // disabled:true,
+ // isSearchList: true, // 开启查询弹窗
+ // searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+ // searchField: 'number', // 查询弹窗赋值字段
+ // searchTitle: '采购收货记录', // 查询弹窗标题
+ // searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
+ // searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
+ // searchCondition: [
+ // {
+ // key: 'supplierCode',
+ // value: 'supplierCode',
+ // isMainValue: true
+ // }],
+ // verificationParams: [{
+ // key: 'number',
+ // action: '==',
+ // value: '',
+ // isMainValue: false,
+ // isSearch: true,
+ // isFormModel: true,
+ // }], // 失去焦点校验参数
+ // }
+ // }
+ // },
+ // {
+ // label: '发货单号',
+ // field: 'asnNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isForm: false,
+ // sortTableDefault:2
+ // },
+ // {
+ // label: '要货计划单号',
+ // field: 'ppNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isForm: false,
+ // isTable: false,
+ // },
+ // {
+ // label: '承运商',
+ // field: 'carrierCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '运输方式',
+ // field: 'transferMode',
+ // sort: 'custom',
+ // dictType: DICT_TYPE.TRANSFER_MODE,
+ // dictClass: 'string',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '车牌号',
+ // field: 'vehiclePlateNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '从仓库代码',
+ // field: 'fromWarehouseCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // isTable: false,
+ // },
+ // {
+ // label: '到仓库代码',
+ // field: 'toWarehouseCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTableForm:false,
+ // isForm: false,
+ // isTable: false,
+ // },
+ // {
+ // label: '从库区类型范围',
+ // field: 'fromAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '到库区类型范围',
+ // field: 'toAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTableForm:false,
+ // isForm: false,
+ // },
+ // {
+ // label: '从库区代码范围',
+ // field: 'fromAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // isTable: false,
+ // },
+ // {
+ // label: '到库区代码范围',
+ // field: 'toAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // isTable: false,
+ // isTableForm:false,
+ // },
+ // {
+ // label: '从月台代码',
+ // field: 'fromDockCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // isTable: false,
+
+ // },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'PurchaseReturn',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isForm: false,
+ isTable: false,
+ },
+ // {
+ // label: '申请时间',
+ // field: 'requestTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // isForm: false,
+ // isTable: false,
+ // },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isForm:false,
+ isTableForm:false,
+ isTable: false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm:false,
+ table: {
+ width: 150
+ },
+ isTable: false,
+ formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ return userDeptArray.find((account) => account.id == cellValue)?.name
+ },
+ form: {
+ value: userDept.id,
+ component: 'Select',
+ api: () => userDeptArray,
+ componentProps: {
+ disabled: true,
+ optionsAlias: {
+ labelField: 'name',
+ valueField: 'id'
+ }
+ }
+ }
+ },
+ {
+ label: '原因',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ isForm: false,
+ table: {
+ width: 180
+ },
+ formatter: dateFormatter,
+ detail: {
+ dateFormat : 'YYYY-MM-DD HH:mm:ss'
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ isTable:false,
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ table: {
+ width: 130
+ },
+ isForm: false,
+ isTable: false
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ }
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
+ },
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm:false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm:false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm:false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 300,
+ fixed: 'right'
+ },
+ }
+]))
+
+//表单校验
+export const PurchasereturnRequestMainRules = reactive({
+ supplierCode: [
+ { required: true, message: '请输入供应商代码', trigger: 'blur' }
+ ],
+ dueTime: [
+ { required: true, message: '请选择截止时间', trigger: 'blur' }
+ ],
+ purchaseReceiptRecordNumber: [
+ { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+ ],
+ carrierCode: [
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ ],
+ vehiclePlateNumber: [
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ ],
+ remark: [
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
+ fromWarehouseCode: [
+ { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+ ],
+ fromAreaTypes: [
+ { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+ ],
+ departmentCode: [
+ { required: true, message: '请输入部门', trigger: 'blur' }
+ ],
+ autoCommit: [
+ { required: true, message: '请选择是否自动提交', trigger: 'change' }
+ ],
+ autoAgree: [
+ { required: true, message: '请选择是否自动通过', trigger: 'change' }
+ ],
+ autoExecute: [
+ { required: true, message: '请选择是否自动执行', trigger: 'change' }
+ ],
+ directCreateRecord: [
+ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+ ],
+ businessType: [
+ { required: true, message: '请输入业务类型', trigger: 'blur' }
+ ],
+})
+
+/**
+ * @returns {Array} 采购退货申请子表
+ */
+export const PurchasereturnRequestDetail = useCrudSchemas(reactive([
+ // {
+ // label: '订单号',
+ // field: 'poNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm:{
+ // disabled:true
+ // },
+ // form: {
+ // componentProps:{
+ // disabled:true
+ // }
+ // }
+ // },
+ // {
+ // label: '订单行',
+ // field: 'poLine',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm:{
+ // isInpuFocusShow: false, // 开启查询弹窗
+ // searchListPlaceholder: '请选择订单行',
+ // searchField: 'poLine',
+ // searchTitle: '采购收货记录信息',
+ // searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+ // searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage,
+ // searchCondition: [{
+ // key: 'number',
+ // value: 'purchaseReceiptRecordNumber',
+ // message: '请填写采购收货记录号！',
+ // isMainValue: true
+ // }]
+ // },
+ // form: {
+ // // labelMessage: '信息提示说明！！！',
+ // componentProps: {
+ // isSearchList: false,
+ // searchListPlaceholder: '请选择订单行',
+ // searchField: 'poLine',
+ // searchTitle: '采购收货记录信息',
+ // searchAllSchemas: PurchasereceiptRecordDetail.allSchemas,
+ // searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage,
+ // searchCondition: [{
+ // key: 'number',
+ // value: 'purchaseReceiptRecordNumber',
+ // message: '请填写采购收货记录号！',
+ // isMainValue: true
+ // }]
+ // }
+ // },
+ // },
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择包装号',
+ searchField: 'packingNumber',
+ searchTitle: '库存余额信息',
+ searchAllSchemas: Balance.allSchemas,
+ searchPage: BalanceApi.getBalancePageSpare,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ },{
+ key: 'businessType',
+ value: 'PurchaseReturnSpare',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ },{
+ key: 'inOrOut',
+ value: 'out',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ }]
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ disabled:true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择包装号',
+ searchField: 'packingNumber',
+ searchTitle: '库存余额信息',
+ searchAllSchemas: Balance.allSchemas,
+ searchPage: BalanceApi.getBalancePageSpare,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ },{
+ key: 'businessType',
+ value: 'PurchaseReturnSpare',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ },{
+ key: 'inOrOut',
+ value: 'out',
+ action: '==',
+ isSearch: true,
+ isMainValue: false
+ }]
+ }
+ }
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm:false,
+ isTable:false,
+ hiddenInMain: true,
+ isForm: false,
+ tableForm:{
+ disabled:true
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm:false,
+ isTable:false,
+ hiddenInMain: true,
+ isForm: false,
+ tableForm:{
+ disabled:true
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '批次',
+ field: 'batch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '替代批次',
+ field: 'altBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ tableForm:{
+ disabled:true
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '器具号',
+ field: 'containerNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: true,
+ tableForm:{
+ disabled:true
+ },
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ // isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true,
+ type: 'Select',
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '退货数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6,
+ disabled:false
+ }
+ },
+ isTable:false,
+ isTableForm:false,
+ tableForm:{
+ disabled:true,
+ type:'InputNumber',
+ min:0,
+ precision: 6
+ }
+ },
+ // { //与国强联调的时候发现退货数量用的是qty
+ // label: '退货数量',
+ // field: 'returnedQty',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'InputNumber',
+ // componentProps: {
+ // min: 0,
+ // precision: 6,
+ // disabled:false
+ // }
+ // },
+ // isTable: false,
+ // isTableForm: false,
+ // isForm:false,
+ // tableForm:{
+ // type:'InputNumber',
+ // min:0,
+ // precision: 6,
+ // disabled:false
+ // }
+ // },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true,
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true,
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '库存余额',
+ field: 'inventoryBalance',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled: true,
+ min: 0,
+ precision: 6
+ }
+ },
+ tableForm:{
+ hidden:false,//控制列是否展示
+ type:'InputNumber',
+ min:0,
+ precision: 6,
+ disabled:true,
+ },
+ hiddenInMain: true,
+ isTable: false,
+ isDetail: false,
+ },
+ {
+ label: '退货数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 0,
+ precision: 6
+ }
+ },
+ isForm:false,
+ tableForm:{
+ type:'InputNumber',
+ min:0,
+ precision: 6
+ }
+ },
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ hiddenInMain: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true,
+ type: 'Select',
+ },
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '从货主代码',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ {
+ label: '到货主代码',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ hiddenInMain: true,
+ isTableForm: false,
+ isTable: false,
+ isForm: false,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ }
+ },
+ // {
+ // label: '到货日期',
+ // field: 'arriveDate',
+ // formatter: dateFormatter2,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // hiddenInMain: true,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width: '100%'},
+ // type: 'date',
+ // dateFormat: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // }
+ // },
+ // tableForm:{
+ // disabled:true,
+ // type: 'FormDate',
+ // dateFormat: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // },
+ // isTableForm: false
+ // },
+ // {
+ // label: '生产日期',
+ // field: 'produceDate',
+ // formatter: dateFormatter2,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD'
+ // },
+ // hiddenInMain: true,
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // disabled: true,
+ // style: {width: '100%'},
+ // type: 'date',
+ // dateFormat: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // }
+ // },
+ // tableForm:{
+ // disabled:true,
+ // type: 'FormDate',
+ // format: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // },
+ // isTableForm: false
+ // },
+ // {
+ // label: '过期日期',
+ // field: 'expireDate',
+ // formatter: dateFormatter2,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // hiddenInMain: true,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // disabled: true,
+ // style: {width: '100%'},
+ // type: 'date',
+ // dateFormat: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // }
+ // },
+ // isTableForm: false,
+ // isTable: false,
+ // tableForm:{
+ // disabled:true,
+ // type: 'FormDate',
+ // format: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // }
+ // },
+ // {
+ // label: '任务明细ID',
+ // field: 'jobDetailId',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm:{
+ // disabled:true
+ // },
+ // isTableForm:false,
+ // hiddenInMain: true,
+ // isForm:false,
+ // form: {
+ // componentProps:{
+ // disabled:true
+ // }
+ // },
+ // },
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ isForm: false,
+ isTableForm: false,
+ isTable: false,
+ hiddenInMain: true,
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ },
+ },
+
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ hiddenInMain: true,
+ tableForm:{
+ disabled:true
+ },
+ isForm: false,
+ isTableForm:false,
+ },
+ // {
+ // label: '接口类型',
+ // field: 'interfaceType',
+ // dictType: DICT_TYPE.INTERFACE_TYPE,
+ // dictClass: 'string',
+ // isSearch: true,
+ // isTable: true,
+ // hiddenInMain: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm:{
+ // disabled:true
+ // },
+ // isForm:false,
+ // isTableForm:false,
+ // form: {
+ // componentProps:{
+ // disabled:true
+ // }
+ // },
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm:{
+ // disabled:true
+ // },
+ // isTableForm: false,
+ // isTable: false,
+ // hiddenInMain: true,
+ // isForm: false,
+ // form: {
+ // componentProps:{
+ // disabled:true
+ // }
+ // },
+ // },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ isTableForm:false,
+ isForm:false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ tableForm:{
+ disabled:true
+ },
+ isTableForm:false,
+ isForm:false
+ },
+ // {
+ // label: '原因',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ {
+ label: '操作',
+ hiddenInMain:true,
+ field: 'action',
+ isDetail: false,
+ isForm: false ,
+ table: {
+ width: 150,
+ fixed: 'right'
+ },
+ isTableForm:false,
+ }
+]))
+
+//表单校验
+export const PurchasereturnRequestDetailRules = reactive({
+ // packingNumber: [
+ // { required: true, message: '请输入包装号', trigger: 'blur' }
+ // ],
+ // batch: [
+ // { required: true, message: '请输入批次', trigger: 'blur' }
+ // ],
+ // inventoryStatus: [
+ // { required: true, message: '请选择库存状态', trigger: 'change' }
+ // ],
+ // poNumber: [
+ // { required: true, message: '请输入订单号', trigger: 'blur' }
+ // ],
+ // poLine: [
+ // { required: true, message: '请输入订单行', trigger: 'blur' }
+ // ],
+ // reason: [
+ // { required: true, message: '请选择原因', trigger: 'change' }
+ // ],
+ itemCode: [
+ { required: true, message: '请输入物料代码', trigger: 'blur' }
+ ],
+ remark: [
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
+})
+
+export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ isTableForm: true,
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ disabled:true
+ },
+ isTableForm: true,
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '器具号',
+ field: 'containerNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true,
+ min: 1,
+ precision: 6
+ },
+ },
+ tableForm: {
+ disabled:true,
+ type: 'InputNumber',
+ min: 1,
+ precision: 6
+ }
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select',
+ disabled: true
+ }
+ },
+ {
+ label: '从库位代码1',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '生产日期',
+ field: 'produceDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ disabled:true,
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ tableForm:{
+ disabled:true,
+ type:'FormDate',
+ placeholder: '请选择生产日期',
+ valueFormat: 'x',
+ },
+ },
+
+ {
+ label: '替代批次',
+ field: 'altBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false
+ },
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false,
+ tableForm: {
+ type: 'Select'
+ }
+ },
+ {
+ label: '批次',
+ field: 'batch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled: true,
+ isSearchList: true,
+ searchListPlaceholder: '请选择包装',
+ searchField: 'packQty',
+ searchTitle: '物品包装信息',
+ searchAllSchemas: Itempackaging.allSchemas,
+ searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+ searchCondition: [
+ {
+ key: 'itemCode',
+ value: 'itemCode',
+ message: '请选择订单行',
+ isMainValue: true
+ },
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }
+
+ ]
+ }
+ },
+ tableForm: {
+ disabled: true,
+ isInpuFocusShow: true,
+ searchListPlaceholder: '请选择包装',
+ searchField: 'packQty',
+ searchTitle: '物品包装信息',
+ searchAllSchemas: Itempackaging.allSchemas,
+ searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+ searchCondition: [
+ {
+ key: 'itemCode',
+ value: 'itemCode',
+ message: '请选择订单行',
+ isMainValue: true
+ },
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ isTableForm: true,
+ isForm: true
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150,
+ componentProps: {
+ disabled: true
+ }
+ },
+ tableForm:{
+ disabled:true
+ },
+ isTableForm: true,
+ isForm: true
+ },
+]))
+
From 0efa2747711574293b637aa16d33ed0271bb42af Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 23 Jul 2024 09:06:47 +0800
Subject: [PATCH 40/60] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/purchasereturnRequestDetail/index.ts | 12 ++++++++++++
.../purchasereturnRequestSpareMain/index.vue | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts
index a50d8fcce..9a7a46f64 100644
--- a/src/api/wms/purchasereturnRequestDetail/index.ts
+++ b/src/api/wms/purchasereturnRequestDetail/index.ts
@@ -38,6 +38,18 @@ export const getPurchasereturnRequestDetailPage = async (params) => {
}
}
+
+// 查询采购退货申请子列表
+export const getPurchasereturnRequestDetailPageSpare = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/purchasereturn-request-detail/seniorSpare', data })
+ } else {
+ return await request.get({ url: `/wms/purchasereturn-request-detail/pageSpare`, params })
+ }
+}
+
// 查询采购退货申请子详情
export const getPurchasereturnRequestDetail = async (id: number) => {
return await request.get({ url: `/wms/purchasereturn-request-detail/get?id=` + id })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index 74f26175a..08379c3f4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -85,7 +85,7 @@
:detailAllSchemasRules="PurchasereturnRequestDetailRules"
:apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail"
:apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail"
- :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage"
+ :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageSpare"
:apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail"
:Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail"
@@ -188,7 +188,7 @@ const onEnter = async (field, value) => {
const isCreateLabel = ref(false)
const formLabelRef = ref()
const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
- getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage
+ getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageSpare
})
const { getList: getDetailList } = detatableMethods
@@ -411,7 +411,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
const Echo = []
const { tableObject, tableMethods } = useTable({
- getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage // 分页接口
+ getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageSpare // 分页接口
})
// 获得表格的各种操作
From 753cc6de574c0158c52f1dfc1a5037b4e93c0b7d Mon Sep 17 00:00:00 2001
From: zhaoyiran
Date: Tue, 23 Jul 2024 09:24:44 +0800
Subject: [PATCH 41/60] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/counter/counter.data.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
index de708bee0..2246ff6b3 100644
--- a/src/views/qms/counter/counter.data.ts
+++ b/src/views/qms/counter/counter.data.ts
@@ -173,6 +173,7 @@ export const Counter = useCrudSchemas(
sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE,
isSearch: true,
+ isForm: false,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Switch',
From 8267f93ef40b835acff5d9e74b377569bb6d94e6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 23 Jul 2024 09:43:48 +0800
Subject: [PATCH 42/60] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=85=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/SearchHigh/src/SearchHigh.vue | 37 +++++++++++++++++---
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 427d5fca2..02dc5690c 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -23,7 +23,7 @@
-
+
+
+ 