From 5900f28e9b480f55aaaa0da5de3f440316b15c14 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 27 Mar 2025 15:42:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?scp=E9=A6=96=E9=A1=B5=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 64 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 39f28f658..9c821055b 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -4,7 +4,14 @@ --> - + + + + + @@ -12,8 +19,55 @@ + From 9102c59d9e0f83423a547b89179257e6568c62b1 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 27 Mar 2025 17:04:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?YT-2203=E4=BB=8E=E3=80=8A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E3=80=8B=E5=88=9B=E5=BB=BA=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=97=B6=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=BB=8E=E3=80=8A=E9=94=80=E5=94=AE=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=8B=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=9A1.?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=20=E2=80=9C=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E7=A7=8D=E7=B1=BB=E2=80=9D=20=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRequestMain.data.ts | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 37f4b2b33..a381d0664 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -5,7 +5,10 @@ import { } from '../moldAllocation/customerStatement/customerStatementMain.data' import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' +import { DICT_TYPE, getDictOptions } from '@/utils/dict' const { t } = useI18n() // 国际化 +const invoiceType = [{label:'全部',value:''},...getDictOptions(DICT_TYPE.INVOICE_TYPE)] +console.log(888, invoiceType) let custormList = [] try { @@ -255,31 +258,22 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ { label: '开票种类', field: 'invoiceType', - dictType: DICT_TYPE.INVOICE_TYPE, + // dictType: DICT_TYPE.INVOICE_TYPE, dictClass: 'string', table: { width: 150 }, - // form: { - // component: 'Select', - // value:[''], - // componentProps: { - // showAll: true,// 备用做全选 - // multiple: true, - // // emptyValues:[null, undefined], - // valueOnClear: null, - // options: [{ - // label: '全部', - // value: '' - // }, { - // label: '号口品', - // value: '号口品' - // }, { - // label: '补给品', - // value: '补给品' - // }] - // } - // }, + form: { + component: 'Select', + value:[''], + componentProps: { + // showAll: true,// 备用做全选 + multiple: true, + // emptyValues:[null, undefined], + valueOnClear: null, + options: invoiceType + } + }, }, { label: '创建时间', @@ -455,7 +449,8 @@ form:{ width: 150 }, tableForm: { - disabled:true + disabled: true, + type:'Select', } }, { From 212e01bbb0f93b2f0dc5f5513f73a4f355ebc9e4 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 27 Mar 2025 21:19:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychange/inventorychangeRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index c60e50491..b99a16673 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -461,7 +461,7 @@ const submitForm = async (formType, submitData) => { return } - let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen) + let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen&&item.fromBatch==item.toBatch) if(findInventoryStatus){ message.warning('您未修改数据') return