From 62aa3bf209ae185b29407bfc7d2cfb07ec85bdb1 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Wed, 23 Apr 2025 14:54:32 +0800 Subject: [PATCH 01/15] =?UTF-8?q?YT-2505=E3=80=8A=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=8B=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=9A=90=E8=97=8F=E2=80=9C=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=87=91=E9=A2=9D=E2=80=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=90=8C=E6=97=B6=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E5=92=8C=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B9=9F=E9=9A=90=E8=97=8F=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapRequestMain/scrapRequestMain.data.ts | 91 ++++++++++--------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 18f751cbf..02b36717f 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -675,6 +675,7 @@ export const ScrapRequestMain = useCrudSchemas( width: 150 }, form: { + value: '', componentProps: { filterable: true } @@ -693,6 +694,7 @@ export const ScrapRequestMain = useCrudSchemas( width: 150 }, form: { + value:'', componentProps: { filterable: true } @@ -711,6 +713,7 @@ export const ScrapRequestMain = useCrudSchemas( width: 150 }, form: { + value: '', componentProps: { filterable: true } @@ -1220,50 +1223,50 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ precision: 2 } }, - { - label: '单价', - field: 'singlePrice', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - disabled: true, - min: 0, - precision: 2, - }, - }, - tableForm: { - disabled: true, - type: 'InputNumber', - min: 0, - precision: 2, - } - }, - { - label: '金额', - field: 'amount', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - disabled:true, - min: 0, - precision: 2, - } - }, - tableForm: { - type: 'InputNumber', - disabled:true, - min: 0, - precision: 2, - }, - }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // disabled: true, + // min: 0, + // precision: 2, + // }, + // }, + // tableForm: { + // disabled: true, + // type: 'InputNumber', + // min: 0, + // precision: 2, + // } + // }, + // { + // label: '金额', + // field: 'amount', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // disabled:true, + // min: 0, + // precision: 2, + // } + // }, + // tableForm: { + // type: 'InputNumber', + // disabled:true, + // min: 0, + // precision: 2, + // }, + // }, { label: '计量单位', field: 'uom', From 20bed3451797d8d86c0ef93f8d566cb73e6c987f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 23 Apr 2025 15:24:06 +0800 Subject: [PATCH 02/15] =?UTF-8?q?YT-2387=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceInvoiced/index.vue | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index a2c52ced6..e80bb0129 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -116,24 +116,27 @@ const { getList, setSearchParams } = tableMethods } } -// 列表头部按钮 -const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增 - // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 - defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 - defaultButtons.defaultFreshBtn(null), // 刷新 - defaultButtons.defaultFilterBtn(null), // 筛选 - defaultButtons.defaultSetBtn(null), // 设置 - // { - // label: '自定义扩展按钮', - // name: 'zdy', - // hide: false, - // type: 'primary', - // icon: 'Select', - // color: '' - // }, -] +const HeadButttondata = ref([]) +if(routeName.value == 'SupplierinvoiceInvoiced'){ + HeadButttondata.value = [ + defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 + defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFilterBtn(null), // 筛选 + defaultButtons.defaultSetBtn(null), // 设置 + ] +} else { + console.log(routeName.value) + HeadButttondata.value = [ + defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPassWork'}), //批量通过 + defaultButtons.defaultFreshBtn(null), // 刷新 + defaultButtons.defaultFilterBtn(null), // 筛选 + defaultButtons.defaultSetBtn(null), // 设置 + ] +} + + // 头部按钮事件 const buttonBaseClick = (val, item) => { From 63897810214cd20b674733575137c604cb0a7822 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 23 Apr 2025 17:16:13 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 2ab5f1826..8d38b3533 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -938,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas( } } }, - { - label: '箱数', - field: 'orderQty', - sort: 'custom', - sortSearchDefault: 8, - sortTableDefault:23, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true - } - }, + // { + // label: '箱数', + // field: 'orderQty', + // sort: 'custom', + // sortSearchDefault: 8, + // sortTableDefault:23, + // table: { + // width: 150 + // }, + // form: { + // componentProps: { + // disabled: true + // } + // }, + // tableForm: { + // disabled: true + // } + // }, { label: '采购标包数量', field: 'purchaseStdQty', @@ -1039,7 +1039,6 @@ export const PurchasePlanDetail = useCrudSchemas( isTableForm: false, isForm: false, isTable: true, - hiddenInMain: true, }, { label: '已收采购数量', From 5b322d7d19bc6b35d15005c91eb9be50b7189f4d Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 24 Apr 2025 10:27:47 +0800 Subject: [PATCH 04/15] =?UTF-8?q?ERP=E5=BA=93=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E6=8C=89=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/factoryModeling/areabasic/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 0a6270e46..5eaaaf516 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -372,7 +372,8 @@ const onChange = (field, e)=>{ } else { Area.allSchemas.formSchema.forEach((item) => { if (item.field == 'manageMode') { - item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + item.componentProps.options = manageModeOptions.value + // item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value } }) From b98647a0363abb8bb4ffec5c89d287c29d31b4df Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 11:23:54 +0800 Subject: [PATCH 05/15] =?UTF-8?q?YT-2511=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E7=BB=99=E5=93=81=E7=94=9F=E4=BA=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E9=80=89=E6=8B=A9=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E6=95=B0=E9=87=8F=E7=AE=A1=E7=90=86=E5=BA=94?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 6 +++--- .../productreceiptAssembleRequestMain.data.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index b05c0f139..6ba95ddb3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -2221,9 +2221,9 @@ export const ProductreceiptRequestLabelRules = reactive({ productionLineCodePackage: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - batch: [ - { required: true, message: '请选择批次', trigger: ['change','blur'] } - ], + // batch: [ + // { required: true, message: '请选择批次', trigger: ['change','blur'] } + // ], packUnit: [ { required: true, message: '请选择包装规格', trigger: ['change','blur'] } ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 56b90b895..32c0b851b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -2189,7 +2189,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas( export const ProductreceiptRequestLabelRules = reactive({ supplierItemCode: [{ required: true, message: '请选择供应商', trigger: 'change' }], productionLineCodePackage: [{ required: true, message: '请选择生产线', trigger: 'change' }], - batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }], + // batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }], packUnit: [ { required: true, message: '请选择包装规格', trigger: ['change','blur'] } ], From 0db0b9c5fec1f3603c306389467988f6adce978a Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 13:27:21 +0800 Subject: [PATCH 06/15] =?UTF-8?q?YT-2521=E3=80=8A=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=A4=96=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E3=80=8B=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E5=9B=BE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRequestMain/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 26728daa6..2f2d479fe 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -501,13 +501,13 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - if(!data.destination){ - await ElMessageBox.confirm('未填写目的地，是否保存申请？', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'warning' - }) - } + // if(!data.destination){ + // await ElMessageBox.confirm('未填写目的地，是否保存申请？', '提示', { + // confirmButtonText: '是', + // cancelButtonText: '否', + // type: 'warning' + // }) + // } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { From 8d8ce0517cb03a5b5271811197f673e1ee7945d5 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 13:33:48 +0800 Subject: [PATCH 07/15] =?UTF-8?q?YT-2505=E3=80=8A=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=8B=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=9A=90=E8=97=8F=E2=80=9C=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E9=87=91=E9=A2=9D=E2=80=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=90=8C=E6=97=B6=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E5=92=8C=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B9=9F=E9=9A=90=E8=97=8F=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E5=92=8C=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapRecordMain/scrapRecordMain.data.ts | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index b7a4f9f9c..55e2874ab 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -745,28 +745,28 @@ export const ScrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '单价', - field: 'singlePrice', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '金额', - field: 'amount', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '金额', + // field: 'amount', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, { label: '从库位组代码', field: 'fromLocationGroupCode', From ae4e10d0375afde6e39af86481357bdf85c6ca38 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 14:01:39 +0800 Subject: [PATCH 08/15] =?UTF-8?q?YT-2524=E3=80=8A=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E3=80=8B=E3=80=8A=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E3=80=8B=E9=9A=90=E8=97=8F=20=E2=80=9C=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/balance/balance.data.ts | 44 +++++++++---------- .../transaction/transaction.data.ts | 44 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index ce8f33660..5e2ee2708 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -235,28 +235,28 @@ export const Balance = useCrudSchemas( // }, // isTable: false, // }, - { - label: '到货日期', - field: 'arriveDate', - isTable: true, - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x' - } - } - }, + // { + // label: '到货日期', + // field: 'arriveDate', + // isTable: true, + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: { width: '100%' }, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x' + // } + // } + // }, { label: '生产日期', field: 'produceDate', diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts index 72a94e47d..c2e0c16c1 100644 --- a/src/views/wms/inventoryManage/transaction/transaction.data.ts +++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts @@ -205,28 +205,28 @@ export const Transaction = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '到货日期', - field: 'arriveDate', - isTable: true, - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - }, + // { + // label: '到货日期', + // field: 'arriveDate', + // isTable: true, + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // }, { label: '生产日期', field: 'produceDate', From 13462968d6864ff560c2a7a246fbf79a2472a624 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 24 Apr 2025 15:12:19 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9WMS=E5=93=81=E7=95=AA?= =?UTF-8?q?=E6=B6=88=E8=80=97=E8=A1=A8=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 4 ++-- .../wms/issueManage/repleinshItemCodeConsumeRecord/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 02b36717f..ee287c7de 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -243,9 +243,9 @@ export const ScrapRequestMain = useCrudSchemas( componentProps: { enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 + searchListPlaceholder: '请选择责任部门', // 输入框占位文本 searchField: 'costcentreDescription', // 查询弹窗赋值字段 - searchTitle: '成本中心代码', // 查询弹窗标题 + searchTitle: '责任部门', // 查询弹窗标题 searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 searchCondition: [{ diff --git a/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue b/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue index f0173da09..33142a146 100644 --- a/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue +++ b/src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue @@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:create'}), // 新增 - // defaultButtons.defaultImportBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:import'}), // 导入 + defaultButtons.defaultImportBtn(null), // 导入 defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From e223a08c236ead617114c70d0a39ab3817ac427b Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 24 Apr 2025 15:24:25 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRequestMain.data.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index 439dc58bf..cce3ba989 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -496,7 +496,7 @@ export const PackageoverRequestMain = useCrudSchemas( // 表单校验 export const PackageoverRequestMainRules = reactive({ - fromWarehouseCode: [{ required: true, message: '请选择仓库代码', trigger: 'change' }] + fromLocationCode: [{ required: true, message: '请选择从库位代码', trigger: 'change' }] }) export const PackageoverRequestDetail = useCrudSchemas( @@ -534,9 +534,9 @@ export const PackageoverRequestDetail = useCrudSchemas( searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchCondition: [ { - key: 'warehouseCode', - value: 'fromWarehouseCode', - message: '请填写从仓库代码！', + key: 'locationCode', + value: 'fromLocationCode', + message: '请填写从库位代码！', isMainValue: true }, { @@ -557,9 +557,9 @@ export const PackageoverRequestDetail = useCrudSchemas( searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchCondition: [ { - key: 'warehouseCode', - value: 'fromWarehouseCode', - message: '请填写从仓库代码！', + key: 'locationCode', + value: 'fromLocationCode', + message: '请填写从库位代码！', isMainValue: true }, { From 293f2da20a1da394c60438cf1b11cff5949353bc Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 16:03:55 +0800 Subject: [PATCH 11/15] =?UTF-8?q?YT-2476=E5=90=AF=E7=94=A8PC=E7=AB=AF?= =?UTF-8?q?=E7=BF=BB=E5=8C=85=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRequestMain/index.vue | 29 ++++++++++++------- .../packageoverRequestMain.data.ts | 21 +++++++++----- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 09fbd3265..708d34c38 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -57,6 +57,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + @clearInput="clearInput" /> @@ -124,23 +125,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromAreaCode'] = item['areaCode'] newRow['toAreaCode'] = item['areaCode'] newRow['inventoryStatus'] = item['inventoryStatus'] - newRow['fromPackUnit'] = item['packUnit'] + // newRow['fromPackUnit'] = item['packUnit'] newRow['fromPackQty'] = item['packQty'] tableData.value.push(newRow) }) } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] - row['toPackQty'] = val[0]['packQty'] + row['fromPackUnit'] = val[0]['packUnit'] + row['toPackQty'] = 0 } else { row[formField] = val[0][searchField] } } else { const setV = {} setV[formField] = val[0][searchField] - if (formField == 'fromWarehouseCode') { - setV['fromWarehouseCode'] = val[0]['code'] - setV['toWarehouseCode'] = val[0]['code'] + if (formField == 'fromLocationCode') { + setV['toLocationCode'] = val[0]['code'] } formRef.setValues(setV) } @@ -403,13 +404,17 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 - if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { - message.warning('从包装规格与到包装规格不能相同') - return - } + // if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { + // message.warning('从包装规格与到包装规格不能相同') + // return + // } if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') return + } + if(tableData.value.find(item => (item.toPackQty <= 0))) { + message.warning('到标包数量必须大于0') + return } formRef.value.formLoading = true try { @@ -477,7 +482,11 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } - +const clearInput = (field, row, index) => { + if (field == 'toPackUnit') { + row.fromPackUnit = '' + } +} /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index cce3ba989..92e073cff 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -620,13 +620,15 @@ export const PackageoverRequestDetail = useCrudSchemas( tableForm: { type: 'InputNumber', min: 0, - precision: 6 + precision: 6, + disabled:true }, form: { component: 'InputNumber', componentProps: { min: 0, - precision: 6 + precision: 6, + disabled: true } } }, @@ -659,7 +661,8 @@ export const PackageoverRequestDetail = useCrudSchemas( width: 120 }, tableForm: { - enterSearch: true, + disabled:true, + enterSearch: false, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 @@ -694,7 +697,8 @@ export const PackageoverRequestDetail = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 + disabled: true, + isSearchList: false, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 searchTitle: '物料包装信息', // 查询弹窗标题 @@ -828,11 +832,13 @@ export const PackageoverRequestDetail = useCrudSchemas( width: 120 }, tableForm: { - disabled: true + // disabled: true + type:'InputNumber' }, form: { + component:'InputNumber', componentProps: { - disabled: true + // disabled: true } } }, @@ -1020,5 +1026,6 @@ export const PackageoverRequestDetail = useCrudSchemas( export const PackageoverRequestDetailRules = reactive({ itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }], - toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }] + toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }], + toPackQty: [{ required: true, message: '请输入到标包数量', trigger: ['change','blur'] }], }) From dee22f2f6f35362a878eedd729bcb85cc6ced9f8 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 24 Apr 2025 16:54:45 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=20=20=20=E6=96=87=E6=A1=A3=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itembasic/itembasic.data.ts | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index e1229f9ba..5b9215bbb 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -370,6 +370,15 @@ export const Itembasic = useCrudSchemas(reactive([ width: 100 } , }, + { + label: '产品类', + field: 'prodCla', + sort: 'custom', + isTable: true, + table: { + width: 100 + } , + }, { label: '创建者', field: 'creator', @@ -540,17 +549,7 @@ export const Itembasic = useCrudSchemas(reactive([ }, }, - { - label: '产品类', - field: 'prodCla', - sort: 'custom', - isForm:false, - isTable: false, - isDetail:false, - table: { - width: 100 - } , - }, + { label: '种类', field: 'category', From 1f5ff500fd685b7406a707b03745b3e435cf066f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 24 Apr 2025 17:36:28 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=94=9F=E4=BA=A7=E7=BA=BF=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/productionLineLabel/index.vue | 293 ++++++++++++++++++ .../productionLineLabel.data.ts | 217 +++++++++++++ 2 files changed, 510 insertions(+) create mode 100644 src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue create mode 100644 src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts diff --git a/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue b/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue new file mode 100644 index 000000000..f7528a1a8 --- /dev/null +++ b/src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue @@ -0,0 +1,293 @@ + + + diff --git a/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts b/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts new file mode 100644 index 000000000..308e0d512 --- /dev/null +++ b/src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts @@ -0,0 +1,217 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const PackageRules = reactive({ + number: [required], + itemCode: [required], + itemName: [required], +}) +export const Package = useCrudSchemas(reactive([ + { + label: '标签号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + fixed: 'left', + width: 210 + } + }, + { + label: '标签类型', + field: 'type', + sort: 'custom', + isSearch: false, + dictType: DICT_TYPE.LABEL_TYPE, + dictClass: 'string', + table: { + width: 180 + } + }, + // { + // label: '标签模板', + // field: 'template', + // sort: 'custom', + // }, + { + label: '标签状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string', + table: { + width: 180 + } + }, + { + label: '库位代码', + field: 'relateNumber', + sort: 'custom', + table: { + width: 210 + } + }, + { + label: '库位名称', + field: 'locationName', + sort: 'custom', + table: { + width: 210 + } + }, + { + label: '标签条码字符串', + field: 'barcodeString', + sort: 'custom', + table: { + width: 380, + } + }, + // { + // label: '打印次数', + // field: 'printTimes', + // sort: 'custom', + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0 + // }, + // value: 0 + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印时间', + // field: 'lastPrintTime', + // sort: 'custom', + // formatter: dateFormatter, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人ID', + // field: 'lastPrintUserId', + // sort: 'custom', + // table: { + // width: 180 + // } + // }, + // { + // label: '最后打印人用户名', + // field: 'lastPrintUserName', + // sort: 'custom', + // table: { + // width: 170, + // } + // }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch:true, + isForm: false, + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + search: { + value: 'TRUE', + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + table: { + width: 110 + } + }, + { + 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', + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + 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: true, + table: { + width: 150 + } + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From e137f7c8fbbddc2842f926b67dff67fec4a927c0 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 19:00:21 +0800 Subject: [PATCH 14/15] =?UTF-8?q?YT-2520=E5=BA=93=E5=AD=98=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=EF=BC=8C=E5=A1=AB=E5=86=99=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E4=BB=A3=E7=A0=81=E6=8F=90=E7=A4=BA=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E9=80=89=E6=8B=A9=E5=BA=93=E4=BD=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/inventoryinitRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index c8c057454..914ce3430 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -645,7 +645,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( value: 'warehouseCode', message: '请选择仓库代码!', isMainValue: true - }], + }], + isRepeat:true, verificationParams: [{ key: 'code', action: '==', From fc0c1e936b7a99ed0ee7515627333610b15a516d Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 24 Apr 2025 19:17:32 +0800 Subject: [PATCH 15/15] =?UTF-8?q?YT-2526=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=9C=89=E7=AD=9B=E9=80=89=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index d0b59b832..826b859bd 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -76,7 +76,7 @@ @onBlur="onEnter">