From 6841cd6d101b16c15bdbdce945ded0ab310e17ab Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Mon, 25 Nov 2024 12:00:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?YT-1226,YT-1227:=20=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=AD=97=E6=AE=B5bug=E4=BF=AE=E5=A4=8D=E5=92=8C=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=8F=91=E8=B4=A7=E7=B1=BB=E5=9E=8B=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E8=AF=A5=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=AA=8C=E8=AF=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 2 ++ .../deliverRecordMain/deliverRecordMain.data.ts | 1 + .../deliverRecordMain/deliverRecordMain.data.ts | 10 +++++++--- .../deliverRecordMain/deliverRecordMain.data.ts | 4 ++++ .../deliverRecordMain/deliverRecordMain.data.ts | 4 ++++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index c0afdfae0..0741ab595 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -330,6 +330,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { @@ -397,6 +398,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 7881765dd..71dd8f3e0 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -376,6 +376,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, hiddenInMain: true, }, { diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 76749405d..bde9903c6 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -25,6 +25,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, + isTable: false, isSearch: false }, { @@ -33,7 +34,8 @@ export const DeliverRecordMain = useCrudSchemas( sort: 'custom', table: { width: 180 - } + }, + isTable: false, }, { label: '发货记录单号', @@ -54,7 +56,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, isDetail: true }, { @@ -332,7 +334,7 @@ export const DeliverRecordMain = useCrudSchemas( isTable: false }, { - label: '业务类型', + label: '发货类型', field: 'businessType', sort: 'custom', table: { @@ -590,6 +592,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '包装规格', @@ -656,6 +659,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库位', diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 28fc088e2..54ddf8364 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -352,6 +352,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '包装规格', @@ -418,6 +420,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '从库位', diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index d39c4d472..4340d7d6f 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -298,6 +298,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '包装规格', @@ -364,6 +366,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + hiddenInMain: true, }, { label: '从库位', From a1f802e43d84c1f8c8d4d1c6c4b97e2ce21b4c88 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 12:00:48 +0800 Subject: [PATCH 02/10] =?UTF-8?q?YT-1229=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E4=BF=9D=E5=AD=98=E7=B3=BB=E7=BB=9F=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 8d30ff991..3e2a1d128 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1378,9 +1378,9 @@ export const ProductionreturnRequestDetailRules = reactive({ qty:[ { validator:validateQty, message: '数量必须大于0', trigger: 'change'} ], - // batch: [ - // { required: true, message: '请输入批次', trigger: 'blur' } - // ], + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], inventoryStatus: [ { required: true, message: '请选择库存状态', trigger: 'change' } ], From 5de20060905c01ea56793e98d6106586dead63ad Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 25 Nov 2024 13:08:04 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E3=80=81=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E4=BB=B6=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/labelManage/manufacturePackage/index.vue | 3 ++- .../labelManage/manufacturePackage/manufacturePackage.data.ts | 3 ++- .../wms/basicDataManage/labelManage/purchasePackage/index.vue | 3 ++- .../labelManage/purchasePackage/purchasePackage.data.ts | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 64665c60a..4101909ad 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -378,7 +378,8 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: true, + type: 'MakeLabel' } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 4ea0ae2bf..147b93726 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -31,7 +31,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, @@ -52,6 +52,7 @@ export const Package = useCrudSchemas(reactive([ label: '关联号', field: 'relateNumber', sort: 'custom', + isSearch:true }, { label: '标签条码字符串', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 96d5f49b4..dfe1acbee 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -401,7 +401,8 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: true, + type: 'PurchaseLabel' } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 838b2edb9..0acf47726 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -43,7 +43,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, From 2fb11cf39b7e442f6a0e8639f918d201a230fe53 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 13:30:22 +0800 Subject: [PATCH 04/10] =?UTF-8?q?YT-1230=E9=A1=BA=E5=BC=95=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=BA=B3=E5=85=A5=E5=8F=97=E9=A2=86=E4=B9=A6?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E5=BA=94=E6=98=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inducedProduct/deliverRecordMain/deliverRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index bde9903c6..226862371 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -941,7 +941,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ } }, { - label: '物料类型', + label: '类型', field: 'type', sort: 'custom', dictType: DICT_TYPE.LEADERSHIP_MATERIAL_TYPE, From 725c3fca61c4f3e9de5f38592bd1fa537d334464 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 13:42:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?YT-1215=E5=88=9B=E5=BB=BA=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=B6=EF=BC=8C=E5=BC=B9=E7=AA=97=E5=86=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8A=8A=20=E2=80=9C=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8D=95=E5=8F=B7=E2=80=9D=20=E6=8C=AA=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E5=89=8D=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index b9168dcd2..ba5671a8d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -550,6 +550,21 @@ export const PurchasePlanMainRules = reactive({ */ export const PurchasePlanDetail = useCrudSchemas( reactive([ + { + label: '要货计划单号', + field: 'number', + sort: 'custom', + isTableForm: false, + hiddenInMain: true, + table: { + width: 180 + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '采购订单号', field: 'poNumber', @@ -861,21 +876,7 @@ export const PurchasePlanDetail = useCrudSchemas( } }, - { - label: '要货计划单号', - field: 'number', - sort: 'custom', - isTableForm: false, - hiddenInMain: true, - table: { - width: 180 - }, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '已收货数量', field: 'receivedQty', From 7514140139bd59d3aa066e7dfef6e667e28e0721 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 13:47:30 +0800 Subject: [PATCH 06/10] =?UTF-8?q?YT-1214=E5=88=9B=E5=BB=BA=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 2 ++ .../supplierdeliverRequestMain.data.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 105da516f..2e599dd83 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -276,6 +276,7 @@ export default defineComponent({ if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) + event.target.blur();//回车之后自动失去焦点 } }} onBlur={(e) => { onBlur(item.field,formModel.value[item.field]) }} @@ -409,6 +410,7 @@ export default defineComponent({ if(event.keyCode === 13){ //回车 emit('onEnter',item.field,formModel.value[item.field],event) + event.target.blur();//回车之后自动失去焦点 } }} {...(notRenderOptions.includes(item?.component as string) && diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 43f5db515..6bff0c144 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -88,6 +88,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, + isEnter:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 From bec6cf822bffe6d2ee14578e2a618aa00494bd28 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 14:12:36 +0800 Subject: [PATCH 07/10] =?UTF-8?q?YT-1207=E8=A6=81=E8=B4=A7=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E7=BF=BB=E9=A1=B5=E4=B9=8B=E5=90=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain.data.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index a4de606ac..92724f740 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -108,9 +108,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '计划员', field: 'planerId', sort: 'custom', - table: { - width: 150 - }, + isTable:false, isForm: false, isSearch:true, @@ -182,9 +180,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', - table: { - width: 150 - }, + isSearch:true, isTable:true, isForm: false, @@ -217,9 +213,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ label: '版本号', field: 'version', sort: 'custom', - table: { - width: 150 - }, + isSearch:true, search: { // labelMessage: '信息提示说明！！！', From d57fbd74f7d3f6f12436b390e4c6cc89a348c620 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 14:48:52 +0800 Subject: [PATCH 08/10] =?UTF-8?q?YT-1196WMS=20=E6=A0=87=E5=87=86=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=BB=B7=E6=A0=BC=E5=8D=95=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=EF=BC=8C=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/stdcostprice/index.vue | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index d00607fb4..d1035afbe 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -206,33 +206,38 @@ const openForm = (type: string, row?: any) => { } // form表单提交 -const formsSuccess = async (formType,data) => { - var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) { - return item.field === 'activeTime' || item.field === 'expireTime'; - }); - if(isHave){ - if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') - return; - } - } - if(data.activeTime==0)data.activeTime = null; - if(data.expireTime==0)data.expireTime = null; - basicFormRef.value.formLoading = true - if (formType === 'create') { - await StdcostpriceApi.createStdcostprice(data) - message.success(t('common.createSuccess')) - } else { - await StdcostpriceApi.updateStdcostprice(data) - message.success(t('common.updateSuccess')) - } - basicFormRef.value.dialogVisible = false - basicFormRef.value.formLoading = false - if (formType === 'create') { - getList() - }else{ - buttonBaseClick('refresh',null) +const formsSuccess = async (formType, data) => { + try{ + var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) { + return item.field === 'activeTime' || item.field === 'expireTime'; + }); + if(isHave){ + if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ + message.error('失效时间要大于生效时间') + return; } + } + if(data.activeTime==0)data.activeTime = null; + if(data.expireTime==0)data.expireTime = null; + basicFormRef.value.formLoading = true + if (formType === 'create') { + await StdcostpriceApi.createStdcostprice(data) + message.success(t('common.createSuccess')) + } else { + await StdcostpriceApi.updateStdcostprice(data) + message.success(t('common.updateSuccess')) + } + basicFormRef.value.dialogVisible = false + basicFormRef.value.formLoading = false + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } + } catch { + basicFormRef.value.formLoading = false + + } } // 查询页面返回 From 8a0f2cd3af3cf15a732f671a81ef057f0815759e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 14:51:54 +0800 Subject: [PATCH 09/10] =?UTF-8?q?YT-1202WMS=20=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E3=80=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E7=9B=B4=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/productionlineitem/index.vue | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index 3badcc8e2..5314a421e 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -220,32 +220,36 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { + try{ var isHave =Productionlineitem.allSchemas.formSchema.some(function (item) { - return item.field === 'activeTime' || item.field === 'expireTime'; - }); - if(isHave){ - if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ - message.error('失效时间要大于生效时间') - return; - } - } - if(data.activeTime==0)data.activeTime = null; - if(data.expireTime==0)data.expireTime = null; - basicFormRef.value.formLoading = true - if (formType === 'create') { - await ProductionlineitemApi.createProductionlineitem(data) - message.success(t('common.createSuccess')) - } else { - await ProductionlineitemApi.updateProductionlineitem(data) - message.success(t('common.updateSuccess')) - } - basicFormRef.value.formLoading = false - basicFormRef.value.dialogVisible = false - if (formType === 'create') { - getList() - }else{ - buttonBaseClick('refresh',null) + return item.field === 'activeTime' || item.field === 'expireTime'; + }); + if(isHave){ + if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ + message.error('失效时间要大于生效时间') + return; } + } + if(data.activeTime==0)data.activeTime = null; + if(data.expireTime==0)data.expireTime = null; + basicFormRef.value.formLoading = true + if (formType === 'create') { + await ProductionlineitemApi.createProductionlineitem(data) + message.success(t('common.createSuccess')) + } else { + await ProductionlineitemApi.updateProductionlineitem(data) + message.success(t('common.updateSuccess')) + } + basicFormRef.value.formLoading = false + basicFormRef.value.dialogVisible = false + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } + } catch { + basicFormRef.value.formLoading = false + } } // 查询页面返回 From 5be417f74f7e4790b624f27dbfffa2f7e3ebeb8d Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 25 Nov 2024 15:04:35 +0800 Subject: [PATCH 10/10] =?UTF-8?q?YT-1237=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=BA=94=E4=B8=8E=E8=A1=A5?= =?UTF-8?q?=E7=BB=99=E5=93=81=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain.data.ts | 308 +++++++++--------- 1 file changed, 146 insertions(+), 162 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index e632c9a82..1d5cf2ffb 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1701,56 +1701,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive([ /** - * @returns {Array} 制品收货申请创建标签 + * @returns {Array} 号口品收货申请创建标签 */ export const ProductreceiptRequestLabel = useCrudSchemas(reactive([ { - label: '生产线代码', - field: 'productionLineCodePackage', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - tableForm:{ + tableForm: { disabled: true - // isInpuFocusShow: true, - // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 - // searchField: 'productionLineCode', // 查询弹窗赋值字段 - // searchTitle: '生产线物料关系信息', // 查询弹窗标题 - // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 - // searchCondition:[{ - // key: 'itemCode', - // value: 'itemCode', - // isMainValue: true - // }] + }, + form: { + componentProps: { + disabled: true + } } }, { - label: '供应商代码', - field: 'supplierItemCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'supplierCode', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 - searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] - } }, { - label: '物料代码', - field: 'itemCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 @@ -1765,38 +1745,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, { - label: '物料名称', - field: 'itemName', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { - label: '物料描述1', - field: 'itemDesc1', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + }, + { + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true, + } }, { - label: '物料描述2', - field: 'itemDesc2', + label: '标签生产线代码', + field: 'productionLineCodePackage', sort: 'custom', table: { width: 150 }, + isTable: false, + tableForm: { + disabled: true, + }, + }, + { + label: '供应商代码', + field: 'supplierItemCode', + sort: 'custom', isTableForm: false, isForm: false, + table: { + width: 150 + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'supplierCode', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码！', + isMainValue: true + }] + } }, + { - label: '项目代码', - field: 'projectCode', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 @@ -1805,56 +1879,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( isForm: false, }, { - label: '批次', - field: 'batch', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true, - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '数量', - field: 'qty', + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, + { label: '库存状态', field: 'inventoryStatus', @@ -1862,6 +1916,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( dictClass: 'string', isTable: true, sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1879,22 +1935,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源生产线代码', field: 'productionLineCode', sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '来源生产线代码', - field: 'productionLineCode', - sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1911,6 +1953,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源工位代码', field: 'workStationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1927,6 +1971,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源库位代码', field: 'fromLocationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1953,78 +1999,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } } }, - { - label: '包装规格1', - field: 'packUnit', - sort: 'custom', - table: { - width: 150, - componentProps: { - disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - tableForm: { - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - { - label: '包装数量1', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true, - } - }, { label: '包装规格2', field: 'secondPackUnit', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150, componentProps: { @@ -2052,6 +2033,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, tableForm: { + enterSearch: true, disabled: true, isInpuFocusShow: true, searchListPlaceholder: '请选择包装', @@ -2077,12 +2059,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '包装数量2', field: 'secondPackQty', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, form: { componentProps: { - disabled:true + disabled: true } }, tableForm: {