From 1357c0f9e150632f2ae11bdd2d57b8f4e35c0fc0 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 08:21:49 +0800 Subject: [PATCH 01/24] =?UTF-8?q?YT-1440=EF=BC=9ASCP01.SPARC=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImportForm/src/ImportFormPlanCSV.vue | 2 +- .../supplierdeliver/purchasePlanMain/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ImportForm/src/ImportFormPlanCSV.vue b/src/components/ImportForm/src/ImportFormPlanCSV.vue index b38c14e3a..18fe25de1 100644 --- a/src/components/ImportForm/src/ImportFormPlanCSV.vue +++ b/src/components/ImportForm/src/ImportFormPlanCSV.vue @@ -140,7 +140,7 @@ const props = defineProps({ accept: { type: String, required: false, - default: '.xlsx,.xls' + default: '.csv' }, // 是否更新已经存在的用户数据.默认值是1 mode: { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 0034bd503..019a3be47 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -452,11 +452,11 @@ const isShowMainButton1 = (row, val) => { return [ // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开 defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭 - defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布 + defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1','5']) }), // 发布 defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受 defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受 defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架 - defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改 + // defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改 defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 { From 1ad0f785d0e3efe59a78b4762144468f92644337 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 5 Dec 2024 08:52:24 +0800 Subject: [PATCH 02/24] =?UTF-8?q?YT-1458=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=9A=84=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMainAssemble/index.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 9573cc3ba..cf2699d27 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -289,16 +289,16 @@ const butttondata = (row,$index) => { defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除 - { - label: '生成备料计划', - name: 'scbljh', - hide: isShowMainButtonBl(row,['6']), - type: 'primary', - icon: 'Select', - hasPermi:'wms:production-main:publish', - link: true, // 文本展现按钮 - color: '' - }, + // { + // label: '生成备料计划', + // name: 'scbljh', + // hide: isShowMainButtonBl(row,['6']), + // type: 'primary', + // icon: 'Select', + // hasPermi:'wms:production-main:publish', + // link: true, // 文本展现按钮 + // color: '' + // }, { label: '生成收货申请', name: 'scshsq', From 4b74c87b30972f33502a4fbd79245709ae3f99af Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 08:54:41 +0800 Subject: [PATCH 03/24] =?UTF-8?q?YT-1440:SCP01.SPARC=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 1493c0007..2062ab927 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -452,7 +452,7 @@ const isShowMainButton1 = (row, val) => { return [ // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开 defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭 - defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布 + defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1','5']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布 defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:accept'}), // 接受 defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:noaccept'}), // 不接受 defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:unpublish'}), // 下架 From 810f8798400daddec12ec0e40e422ed344c4d74e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 08:55:18 +0800 Subject: [PATCH 04/24] =?UTF-8?q?YT-1514=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E3=80=81=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=85=B7?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E9=A2=84=E6=B5=8B=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=B9=B4=E6=9C=88=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatement/customerStatementMain.data.ts | 4 ++-- .../customerStatementShareRecordMain.data.ts | 4 ++-- .../customerToolApportStatementForecastMain.data.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 54d5073a4..98a865cd6 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -105,7 +105,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM', - type: 'daterange', + type: 'monthrange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, @@ -115,7 +115,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - type: 'datetime', + type: 'monthrange', valueFormat: 'YYYY-MM', } }, diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts index bce69b789..b101e1864 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/customerStatementShareRecordMain.data.ts @@ -83,7 +83,7 @@ export const CustomerStatementShareRecordMain = useCrudSchemas(reactive Date: Thu, 5 Dec 2024 08:57:42 +0800 Subject: [PATCH 05/24] =?UTF-8?q?YT-1529=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=EF=BC=8C=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C=E6=A8=A1=E5=85=B7=E5=88=86?= =?UTF-8?q?=E6=91=8A=E5=8D=95=E4=BB=B7=E5=AD=97=E6=AE=B5=E5=BA=94=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatement/customerStatementMain.data.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 98a865cd6..2e0ed0655 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -485,12 +485,12 @@ export const CustomerStatementShareReconciliation = useCrudSchemas(reactive Date: Thu, 5 Dec 2024 09:06:54 +0800 Subject: [PATCH 06/24] =?UTF-8?q?YT-1522=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5SPARC=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 2062ab927..ad01b90e2 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -375,7 +375,16 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增 - defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 + // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 + { + label: t(`ts.导入SPARC订单`).replace('ts.', ''), + name: 'import', + hide: false, + type: 'warning', + icon: 'ep:upload', + color: '', + hasPermi: 'wms:purchase-plan-main:import' + }, // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出 defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细 //defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表 From 4b7644e287a37a6f5a7962bff954d682ade6c81b Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 09:13:29 +0800 Subject: [PATCH 07/24] =?UTF-8?q?YT-1517=EF=BC=9A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=A2=84=E6=B5=8B=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=B9=B4=E6=9C=88=EF=BC=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8F=90=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 --- .../ImportForm/src/ImportCustomerStatementForecastForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue index 2e5fdae96..cf0d77457 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue @@ -309,7 +309,7 @@ const verifyData = async () => { }else if(data.status==2){ try { // 确认 - await message.confirm('已存在相同客户代码及年月的客户对账单，是否确认覆盖？') + await message.confirm('已存在相同客户代码及年月的客户模具分摊对账单预测，是否重新导入?') //确定走的 submitForm(); // await PurchasepriceApi.deletePurchaseprice(id) @@ -321,7 +321,7 @@ const verifyData = async () => { //取消走的 } }else if(data.status==3){ - await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已提交，无法导入。') + await message.alertWarning('已存在相同客户代码及年月的客户模具分摊对账单预测，且已提交，无法导入。') } } From 73aa21a33a3da831ba0a0b46d61f70f6577ab608 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 09:40:10 +0800 Subject: [PATCH 08/24] =?UTF-8?q?YT-1518=EF=BC=9A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E9=A2=84=E6=B5=8B=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=B4=A6=E7=A5=A8=E5=8F=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerToolApportStatementForecastMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts index 606e8c3f9..b3fac64cf 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts @@ -183,7 +183,7 @@ export const CustomerToolApportStatementForecastDetailRules = reactive({ export const CustomerToolApportStatementForecastDetail = useCrudSchemas(reactive([ { label: '帐票号', - field: 'number', + field: 'invoiceNumber', sort: 'custom', isSearch: true, }, From da1866e773bd0048d505482f4bc7845e7d1706da Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 09:42:01 +0800 Subject: [PATCH 09/24] =?UTF-8?q?YT-1537:=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRecordMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue index 0114187d5..224d3021b 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/index.vue @@ -132,7 +132,7 @@ const Echo = [] const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-record-main:import` }), // 导入 + //defaultButtons.defaultImportBtn({hasPermi:`wms:customer-sale-invoice-record-main:import` }), // 导入 defaultButtons.defaultExportBtn({hasPermi:`wms:customer-sale-invoice-record-main:export` }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From 30608a28829d8b9067b3324c9cc99eb330caae1b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 10:02:07 +0800 Subject: [PATCH 10/24] =?UTF-8?q?YT-1505=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=EF=BC=8C=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B9=B4=E6=9C=88=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=8E=A7=E4=BB=B6=E5=BA=94=E8=AF=A5=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B9=B4=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchHigh/src/SearchHigh.vue | 30 ++++++++++++------- src/locales/en-US.ts | 4 ++- src/locales/zh-CN.ts | 6 ++-- .../supplierMoldCostMain.data.ts | 16 ++++++++-- 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index 44c20ff59..7cbf987b0 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -49,17 +49,16 @@ /> - + - + - + + + - + @@ -193,7 +192,9 @@ const moreListOptions = ref({ } else if (type?.form?.component == 'DatePicker') { if(type?.form?.componentProps?.type=='datetimerange'|| type?.form?.componentProps?.type == 'datetime'){ data = 'datePicker' - }else if(type?.form?.componentProps?.type == 'date'){ + } else if(type?.form?.componentProps?.type=='monthrange'|| type?.form?.componentProps?.type == 'month'){ + data = 'monthPicker' + } else if(type?.form?.componentProps?.type == 'date'){ data = 'date' } } @@ -221,7 +222,7 @@ const getFilterable = (val) => { // 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,between,isNull,isNotNull const formatMoreListActions = (val) => { if (val) { - if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'){ + if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker'){ return moreListOptions.value.action.filter(item => item.value == 'between') }else{ return moreListOptions.value.action.filter(item => item.value != 'between') @@ -255,7 +256,7 @@ const moreListPush = () => { const lastestType = ref('') // 筛选条件改变重置其他项 const resetSelect = (val) => { - if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') { + if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date'|| getInputType(val.column) == 'monthPicker') { val.action = 'between' val.disabled = false }else{ @@ -285,11 +286,12 @@ const actionSelect = (val)=>{ // 查询 重置按钮事件 const buttonBaseClick = (val) => { + console.log(moreListData.value.filters) if (val == 'search') { // 查询 let data = [] moreListData.value.filters.forEach(item => { let obj = {} - if(item.value1&&item.value1.length>0 || (item.value1&&typeof item.value1 === 'number')){ + if(item.value1&&item.value1.length>0&&!item.value || (item.value1&&typeof item.value1 === 'number')){ obj = { column: item.column, action: item.action, @@ -363,6 +365,12 @@ const changeDateTimePicker = (e, val,from) =>{ let startTime = new Date(e[0] + ' 00:00:00').getTime() let endTime = new Date(e[1] + ' 23:59:59').getTime() val.value = startTime + ',' + endTime + }else if(from == 'monthrange'){ + let startTime = new Date(e[0] + '-01 00:00:00').getTime() + const lastDay = new Date(e[1].split('-')[0],e[1].split('-')[1], 0).getDate(); + let endTime = new Date(e[1] + '-'+lastDay+' 23:59:59').getTime() + val.value = startTime + ',' + endTime + console.log(val) }else if(from == 'datetimerange'){ val.value = e.join(',') } diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index d25048231..bde9ea22e 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -687,7 +687,9 @@ export default { 版本号:'Version Number', 发布时间:'Publish Time', 开始时间:'Start Time', - 结束时间:'Finish Time', + 结束时间: 'Finish Time', + 开始月份: 'Start Month', + 结束月份: 'Finish Month', 业务类型:'Business Type', 预测时间类型:'Forecast time type', 预测日期:'Forecast Date', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 9e748c598..c0de5bab8 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -691,8 +691,10 @@ export default { 美元:'美元', 版本号:'版本号', 发布时间:'发布时间', - 开始时间:'开始时间', - 结束时间:'结束时间', + 开始时间: '开始时间', + 结束时间: '结束时间', + 开始月份: '开始年月', + 结束月份: '结束年月', 业务类型:'业务类型', 预测时间类型:'预测时间类型', 预测日期:'预测日期', diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts index 8f4280e27..e94af8281 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts @@ -67,8 +67,9 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - type: 'datetime', - valueFormat: 'YYYY-MM' + valueFormat: 'YYYY-MM', + type: 'monthrange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } } }, @@ -97,7 +98,16 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive([ dateFormat : 'YYYY-MM-DD HH:mm:ss' }, isTable:true, - isForm: false + isForm: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, }, { label: '更新者', From 4917d3560c19c3934b2631c469e661ad4a1e0c1b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 10:49:11 +0800 Subject: [PATCH 11/24] =?UTF-8?q?YT-1530=E5=88=9B=E5=BB=BA=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=BB=E6=9C=AA=E7=A8=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D=3D=E6=89=80=E6=9C=89=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=8A=A0=E4=B9=8B=E5=92=8C=EF=BC=8C=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index 37b382c1d..e1c5026cd 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -68,11 +68,7 @@ (formRef, formModel, tableData) => { const { taxRate = 0 } = formModel // 1、主数据未税金额 mainBeforeTaxAmount : 所有明细行未税金额的和 - let mainBeforeTaxAmount = tableData.reduce( - (prev, item) => - prev + Number(item['beforeTaxAmount']), - 0 - ) + let mainBeforeTaxAmount = tableData.reduce((prev, item) =>prev + Number(item['beforeTaxAmount'].toFixed(2)),0).toFixed(2) // 2.主数据税额 mainTaxAmount = 未税金额*税率/100 保留两位小数 let mainTaxAmount = Number(Number(mainBeforeTaxAmount*taxRate*0.01).toFixed(2)) const sumObject = { From 86f1a4161714ccf522bc08dcaa3cf69456bcfe8e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 10:55:08 +0800 Subject: [PATCH 12/24] =?UTF-8?q?YT-1531=E5=88=9B=E5=BB=BA=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=A8=A1=E5=85=B7=E5=88=86?= =?UTF-8?q?=E6=91=8A=E5=8D=95=E4=BB=B7=E4=B8=8D=E5=BA=94=E4=BF=9D=E7=95=99?= =?UTF-8?q?2=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index af4d60e2a..fb9f1fae9 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -427,13 +427,13 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { disabled: true, - precision: 2 + precision: 5 } }, tableForm: { disabled: true, type: 'InputNumber', - precision: 2, + precision: 5, } }, { From 18289a50c507393fd251c512b901c3cd64c67208 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 11:32:11 +0800 Subject: [PATCH 13/24] =?UTF-8?q?YT-1551:=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=8D=95=E5=87=BB=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=8F=B7=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=9B=E8=AF=A6=E6=83=85=E5=BC=80=E7=A5=A8=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRecordMain.data.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index 73d2355bb..396cabe48 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -196,7 +196,10 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ }, table:{ width:180 - } + }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, }, { From 697a597872dfd518a1d5eab08dc7a727bc75108b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 5 Dec 2024 11:38:46 +0800 Subject: [PATCH 14/24] =?UTF-8?q?YT-1458=E5=A2=9E=E5=8A=A0=E5=A4=87?= =?UTF-8?q?=E6=96=99=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueMain.data.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 1b17e5e4f..e92acfb6d 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -661,6 +661,22 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ }], // 失去焦点校验参数 }, }, + { + label: '备料数量', + field: 'issueQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + }, + }, { label: '计划数量', field: 'planQty', From 03b06d911512eba3edddd069908643c4a60bacb2 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 5 Dec 2024 13:03:24 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B7=B2=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleEstimate/finishedShipmentMain/index.vue | 2 +- .../saleEstimate/unfinishedShipmentMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue index aab050700..a6028e46f 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue @@ -213,7 +213,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await FinishedShipmentDetailApi.exportFinishedShipmentDetail(tableObject.params) - download.excel(data, '已发未结发货记录主.xlsx') + download.excel(data, '已发已结记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue index 8e5f5a65f..fdcbe43b1 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue @@ -214,7 +214,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await UnfinishedShipmentDetailApi.exportUnfinishedShipmentDetail(tableObject.params) - download.excel(data, '已发未结发货记录主.xlsx') + download.excel(data, '已发未结记录主.xlsx') } catch { } finally { exportLoading.value = false From 012e517996c6af5d4e0f612003361531be6c2de4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 13:08:11 +0800 Subject: [PATCH 16/24] =?UTF-8?q?YT-1506=E5=AE=A2=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95-=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C=E5=88=86=E6=91=8A=E4=B8=AD?= =?UTF-8?q?=E5=BA=94=E8=83=BD=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=88=86=E6=91=8A=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=B0=E5=88=86=E6=91=8A?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moldAllocation/customerStatement/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue index b18029692..a27c86eb2 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue @@ -848,5 +848,6 @@ const handleDetailSubmitForm = async (formType, data) => { } ] } + getList() } From a0d61192c1b2bf44d30e2dc07e563658e8c72af0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 13:12:05 +0800 Subject: [PATCH 17/24] =?UTF-8?q?YT-1520=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=98=8E=E7=BB=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=B0=91=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index fb9f1fae9..981b0ec0c 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -322,6 +322,7 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, isForm: false, + isTableForm: false, tableForm: { disabled: true } From 4e4dab2afa0987b796d510d6725c34de799206a3 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 13:13:22 +0800 Subject: [PATCH 18/24] =?UTF-8?q?YT-1553=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=98=8E=E7=BB=86=E9=A1=B5?= =?UTF-8?q?=E5=BA=94=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRecordMain.data.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index 396cabe48..8080d8162 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -281,6 +281,18 @@ export const CustomerSaleInvoiceDetailRules = reactive({ }) export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ + { + label: '序号', + type: 'index', + field: 'numberIndex', + sort: 'custom', + isSearch: false, + isForm: false, + isTableForm: false, + tableForm: { + disabled: true + } + }, { label: '品番', field: 'itemCode', From d27c7709402c0d570668cb6e184d12dec052bdd6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 13:49:18 +0800 Subject: [PATCH 19/24] =?UTF-8?q?YT-1559=E5=88=9B=E5=BB=BA=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=BB=98=E8=AE=A4=E5=8C=85=E8=A3=85=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=92=8C=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B8=A6=E5=87=BA=EF=BC=8C=E6=97=A0=E6=B3=95=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRequestMain/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index e47416124..71d4d6103 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -127,6 +127,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] + newRow['packUnit'] = item['defaultPackUnit'] + newRow['packQty'] = item['defaultPackQty'] newRow['uom'] = item['uom'] tableData.value.push(newRow) }) From 409c09f529cbb1e23509e4533564bcb341682bd8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 13:56:27 +0800 Subject: [PATCH 20/24] =?UTF-8?q?YT-1550=E9=94=80=E5=94=AE=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=EF=BC=8C=E9=87=91=E7=A8=8E=E7=A5=A8?= =?UTF-8?q?=E5=8F=B7=E5=BA=94=E6=8E=A7=E5=88=B6=E5=AD=97=E6=AE=B5=E9=95=BF?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 981b0ec0c..87d32b5a1 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -29,6 +29,9 @@ export const CustomerSaleInvoiceMainRules = reactive({ taxRate: [required], taxAmount: [required], adTaxAmount: [required], + goldenTaxInvoiceNumber: [{ + max: 64, message: '字符长度不可以大于64', trigger: 'blur' + }] }) export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ From c8667c3681ffe4339c2233e42d87640905fb2d44 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 14:03:46 +0800 Subject: [PATCH 21/24] =?UTF-8?q?YT-1560=E9=87=87=E8=B4=AD=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E3=80=81=E5=88=B6=E9=80=A0=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=BA=94=E8=BF=87=E6=BB=A4=E5=8F=AF=E5=88=B6?= =?UTF-8?q?=E9=80=A0=E3=80=81=E5=8F=AF=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manufacturePackage/manufacturePackage.data.ts | 6 +++++- .../labelManage/purchasePackage/purchasePackage.data.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 1ad09830c..dd51b272c 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -245,7 +245,11 @@ export const PackageInventory = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }, { + key: 'enableMake', + value: 'TRUE', + isMainValue: false + }], verificationParams: [{ key: 'code', action: '==', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 2b0bb74b7..1baff2838 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -257,7 +257,11 @@ export const PackageInventory = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }, { + key: 'enableBuy', + value: 'TRUE', + isMainValue: false + }], verificationParams: [{ key: 'code', action: '==', From 22af57a9e3198a1aa846dadd85a11597f8e74bb0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 14:09:59 +0800 Subject: [PATCH 22/24] =?UTF-8?q?YT-1540=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=81=E5=8F=B7=E5=8F=A3?= =?UTF-8?q?=E5=93=81=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=BD=A6=E9=97=B4=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 754b5ed19..72559f15b 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -162,13 +162,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(formField == 'workshop'){ setV['workshop'] = val[0]['code'] setV['productionLine'] = '' - if(tableData.value){ - tableData.value.forEach(item => { - item.itemCode ='' - item.bomVersion = '' - item.uom = '' - }) - } + tableData.value =[] + }else if(formField == 'productionLine'){ + setV['productionLine'] = val[0]['code'] + tableData.value =[] }else{ setV[formField] = val[0][searchField] } From 43432576d583ebc6c01dea6527e4d7f83785df97 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 14:13:37 +0800 Subject: [PATCH 23/24] =?UTF-8?q?YT-1541=E5=8F=91=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E3=80=81=E5=A4=87=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E4=BB=A3=E7=A0=81=E3=80=81=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=81=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 3d7d13528..c2246c291 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -235,6 +235,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //车间代码 setV['productionLineCode'] = '' setV['workStationCode'] = '' + tableData.value =[] } if (formField == 'productionLineCode') { //生产线 @@ -246,6 +247,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(res&&res.list&&res.list.length>0){ setV['workStationCode'] = res.list[0].code } + tableData.value =[] + } + if (formField == 'workStationCode') { + tableData.value =[] } formRef.setValues(setV) } From f35b9fc52f4889149d7964eaa477675c21ec9ec1 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 5 Dec 2024 14:14:30 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7/=E5=8F=B7=E8=AF=95=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7/=E5=8D=8F=E5=AE=9A=E5=93=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=20=20YT-1557?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d80ef2409..d46203baa 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -2626,6 +2626,7 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive