From 53537e768bd916e326643fca1f432f9aab4f8475 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 24 Jun 2024 14:00:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 83aee647a..561228f9b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -48,17 +48,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ component: 'InputNumber', } }, - { - label: '财务凭证号', - field: 'voucher_number', - sort: 'custom', - table: { - width: 180, - }, - isTable:false, - sortTableDefault:6, - isForm: false - }, + { label: '状态', @@ -328,7 +318,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sortTableDefault:10 }, { - label: '过账日期', + label: '过账时间', field: 'postingDate', formatter: dateFormatter, detail: { @@ -341,6 +331,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ width: 180 } }, + { + label: '财务凭证号', + field: 'voucher_number', + sort: 'custom', + table: { + width: 180, + }, + isTable:true, + sortTableDefault:6, + isForm: false + }, { label: '业务类型', field:'businessType', @@ -899,7 +900,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive } }, { - label: '凭证号', + label: '财务凭证号', field: 'voucherNumber', sort: 'custom', table: { From ff53c7c2109e7014f182b685cd9931768d5e6acb Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 24 Jun 2024 14:05:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=BB=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 561228f9b..175285f38 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -333,7 +333,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, { label: '财务凭证号', - field: 'voucher_number', + field: 'voucherNumber', sort: 'custom', table: { width: 180, From 30de64151c1081a8e2c18524b1d8ec3c9a5c6c84 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 24 Jun 2024 14:35:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 3 +++ .../relegate/relegateRequest/relegateRequestMain.data.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index cae70d430..0311d8b2e 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -393,6 +393,9 @@ const submitForm = async (formType, data) => { await RelegateRequestMainApi.createRelegateRequestMain(data) message.success(t('common.createSuccess')) } else { + if(data.masterId){ + data.id = data.masterId + } await RelegateRequestMainApi.updateRelegateRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 5713273e7..c759b61b6 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -668,7 +668,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isForm: false, - isTable: true, + isTable: false, sort: 'custom', isTableForm: false, }, From ee334558ed5e7ea18f936d12546df918606653fd Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 24 Jun 2024 14:46:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 45ab2b064..afd300ab9 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -938,7 +938,10 @@ const handleDelete = async (id: number) => { // 刷新列表 await getList() updateKey.value += 1 - } catch {} + } catch { + tableObject.loading = false + getList() + } } // 筛选提交 const searchFormClick = async (searchData) => {