From 00168d3c0ba7602b7bc7894b58854062586d3fd5 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 10 Oct 2024 09:30:55 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containermanage/containerRecordMain/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index 3a89bf209..fd195b656 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -139,11 +139,10 @@ const updataTableColumns = (val) => { // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From 5e926e9355b5c0c369a926dbd6ff4c22d1a5b07a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 10 Oct 2024 10:29:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6168=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index dbd13c731..3f551943e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -455,6 +455,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ } }, }, + //子表数据，仅是查询条件 { label: '货运单号', @@ -709,6 +710,26 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '财务驳回原因', + field: 'reasonFinancialRejection', + sort: 'custom', + isSearch: false, + isForm: true, + isDetail:false, + sortTableDefault:11, + table: { + width: 150 + }, + form: { + componentProps: { + style: { 'padding-bottom': '20px'}, + type:"textarea", + maxlength:50, + showWordLimit:true + } + } + }, { label: '回转凭证号', field: 'transferNumber', @@ -1825,6 +1846,23 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive Date: Thu, 10 Oct 2024 13:39:36 +0800 Subject: [PATCH 3/9] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalanceMain.data.ts | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index df57fc158..0641ff6ef 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -101,31 +101,31 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, - { - label: '生成时间', - field: 'ttGenerateTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, + // { + // label: '生成时间', + // field: 'ttGenerateTime', + // sort: 'custom', + // formatter: dateFormatter, + // isSearch: true, + // search: { + // component: 'DatePicker', + // componentProps: { + // valueFormat: 'YYYY-MM-DD HH:mm:ss', + // type: 'daterange', + // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + // } + // }, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // valueFormat: 'x' + // } + // }, + // }, { label: '应付挂账金额', field: 'ttAccountAp', From 8c91a1c9cbe84e25cde77fe6e9eeab679777fa8e Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 10 Oct 2024 15:02:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?HL-6191=20=E5=AF=86=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/updatePassword.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue index 29150d64b..3364807fe 100644 --- a/src/views/login/updatePassword.vue +++ b/src/views/login/updatePassword.vue @@ -45,6 +45,7 @@ const iconHouse = useIcon({ icon: 'ep:house' }) const iconCellphone = useIcon({ icon: 'ep:cellphone' }) const iconCircleCheck = useIcon({ icon: 'ep:circle-check' }) + const { push, replace } = useRouter() const route = useRoute() //路由信息 const rules = { password: [required], @@ -69,7 +70,8 @@ await UserApi.updateUserPassword(data) // 发送操作成功的事件 message.success(t('common.updateSuccess')) -  router.go(-1) + replace('/login?redirect=/index') + //  router.go(-1) } } finally { // formLoading.value = false From 1440816099ea8029e3a7a6cb08de5cdba38d4334 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 10 Oct 2024 15:02:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E5=88=9B=E5=BB=BA=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerMainRequest/containerMainRequest.data.ts | 3 ++- .../initialContainerMainRequest.data.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 6d2baa6b6..fc92d5ab5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -545,7 +545,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: true, + isTableForm: false }, { label: '地点ID', diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index c8ba04eef..3960c3d6d 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -512,7 +512,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: true, + isTableForm: false }, { label: '地点ID', From 1aa26f710598ef2ae2dcb49b230f47892ab6944f Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 10 Oct 2024 15:16:57 +0800 Subject: [PATCH 6/9] =?UTF-8?q?HL-6191=20=E5=AF=86=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/updatePassword.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue index 3364807fe..c3b0a71b6 100644 --- a/src/views/login/updatePassword.vue +++ b/src/views/login/updatePassword.vue @@ -70,7 +70,7 @@ await UserApi.updateUserPassword(data) // 发送操作成功的事件 message.success(t('common.updateSuccess')) - replace('/login?redirect=/index') + await replace('/login?redirect=/index') //  router.go(-1) } } finally { From d4597891bbd03225afd16c724e887febcc04dfb0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 10 Oct 2024 16:28:22 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B--=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRecordMain/index.ts | 10 ++++++++++ .../purchaseDiscreteOrderMain/index.vue | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts index adf1adcd1..7442e6f7f 100644 --- a/src/api/wms/supplierinvoiceRecordMain/index.ts +++ b/src/api/wms/supplierinvoiceRecordMain/index.ts @@ -31,6 +31,16 @@ export const getSupplierinvoiceRecordMainPage = async (params) => { return await request.get({ url: `/wms/supplierinvoice-record-main/page`, params }) } } +// 查询供应商发票记录主列表 +export const getSupplierinvoiceRecordMainPageDiscrete = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierinvoice-record-main/seniorDiscrete', data }) + } else { + return await request.get({ url: `/wms/supplierinvoice-record-main/pageDiscrete`, params }) + } +} // 查询供应商发票记录主详情 export const getSupplierinvoiceRecordMain = async (id: number) => { diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index a3c980593..23e035f6c 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -191,7 +191,7 @@ } const { tableObject, tableMethods } = useTable({ - getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口 + getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPageDiscrete // 分页接口 }) tableObject.params.isLS = 1 From 0f2e4dca1a8bd97941dc5d44bff668ca3068ac44 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 10 Oct 2024 16:36:03 +0800 Subject: [PATCH 8/9] =?UTF-8?q?HL-6231=20=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=8A=A0?= =?UTF-8?q?=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerMainRequest.data.ts | 13 +++++++++++++ .../initialContainerMainRequest.data.ts | 13 +++++++++++++ .../scrapContainerMainRequest.data.ts | 13 +++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index fc92d5ab5..f27b29eb0 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -484,6 +484,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 3960c3d6d..3c4453b19 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -446,6 +446,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index ca3856e27..14e32f9a2 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -485,6 +485,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '到数量', field: 'toQty', sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } }, { label: '计量单位', From da10fa00259991f68a006295239e930784834d5d Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 10 Oct 2024 16:36:16 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=96=B0=E5=AF=86=E7=A0=81=E6=8F=90=E7=A4=BA?= =?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/login/updatePasswordNewTips.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue index 3ec16c854..14a055432 100644 --- a/src/views/login/updatePasswordNewTips.vue +++ b/src/views/login/updatePasswordNewTips.vue @@ -23,7 +23,7 @@ - +