From 73ce4ebf168e84edd92aed049f222884b5c69b88 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 16:40:26 +0800 Subject: [PATCH 1/9] =?UTF-8?q?loading=20=E6=8A=A5=E8=A1=A8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 18 ++++++------ .../printBusinesstypeTemplate.data.ts | 1 - src/views/report/printClientPrinter/index.vue | 12 ++++---- .../printClientPrinter.data.ts | 29 ++++++++++++++++++- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c6843b4eb..1cc45251d 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -706,20 +706,20 @@ const submitForm = async () => { return } // 主子表——提交请求 - // try { + try { const data = unref(formRef)?.formModel emit('submitForm', formType.value, data) - // } finally { - // formLoading.value = false - // } + } finally { + // formLoading.value = false + } } else { // 编辑 - // try { + try { const data = unref(formRef)?.formModel emit('submitForm', formType.value, data) - // } finally { - // formLoading.value = false - // } + } finally { + // formLoading.value = false + } } } else { // 基础数据单表——提交请求 @@ -728,7 +728,7 @@ const submitForm = async () => { const data = unref(formRef)?.formModel emit('success', formType.value, data) } finally { - formLoading.value = false + // formLoading.value = false } } } diff --git a/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts b/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts index d237fccff..2204b0d92 100644 --- a/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts +++ b/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts @@ -64,7 +64,6 @@ export const PrintBusinesstypeTemplate = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, }, { label: '操作', diff --git a/src/views/report/printClientPrinter/index.vue b/src/views/report/printClientPrinter/index.vue index 98f685147..59c64000d 100644 --- a/src/views/report/printClientPrinter/index.vue +++ b/src/views/report/printClientPrinter/index.vue @@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:printClientPrinter:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:printClientPrinter:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:printClientPrinter:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:print-client-printer:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:print-client-printer:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:print-client-printer:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:printClientPrinter:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:printClientPrinter:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:print-client-printer:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:print-client-printer:delete'}), // 删除 ] // 列表-操作按钮事件 @@ -165,6 +165,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; + basicFormRef.value.formLoading = true if (formType === 'create') { await PrintClientPrinterApi.createPrintClientPrinter(data) message.success(t('common.createSuccess')) @@ -172,6 +173,7 @@ const formsSuccess = async (formType,data) => { await PrintClientPrinterApi.updatePrintClientPrinter(data) message.success(t('common.updateSuccess')) } + basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false getList() } diff --git a/src/views/report/printClientPrinter/printClientPrinter.data.ts b/src/views/report/printClientPrinter/printClientPrinter.data.ts index d7c112767..f988470d9 100644 --- a/src/views/report/printClientPrinter/printClientPrinter.data.ts +++ b/src/views/report/printClientPrinter/printClientPrinter.data.ts @@ -18,18 +18,45 @@ export const PrintClientPrinter = useCrudSchemas(reactive([ field: 'clientCode', sort: 'custom', isSearch: true, + form: { + component: 'Select', + componentProps: { + options: [{ + name:1111, + id:111 + }], + optionsAlias: { + labelField: 'name', + valueField: 'id' + }, + filterable: true, + } + } }, { label: '打印机名称', field: 'printerName', sort: 'custom', isSearch: true, + form: { + component: 'Select', + componentProps: { + options: [{ + name:2222, + id:222 + }], + optionsAlias: { + labelField: 'name', + valueField: 'id' + }, + filterable: true, + } + } }, { label: '备注', field: 'remark', sort: 'custom', - isSearch: true, }, { label: '操作', From 219a54076fec35c9d6123ac4177233c512ed8b66 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 16:53:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 43 +++++----- .../supplierinvoiceRequestMain.data.ts | 34 +++----- ...pplierinvoiceRequestMainDifference.data.ts | 83 ++++++++++--------- 3 files changed, 78 insertions(+), 82 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index b1015fb30..044afb0cc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -602,8 +602,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, }, { - label: '创建时间', - field: 'createTime', + label: '供应商创建时间', + field: 'requestTime', isTable: true, sortTableDefault:1001, formatter: dateFormatter, @@ -879,10 +879,13 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive( isForm: false, }, { - label: '创建时间', - field: 'createTime', + label: '供应商创建时间', + field: 'requestTime', isTable:true, formatter: dateFormatter, sortTableDefault:1000, @@ -1184,10 +1184,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive( }, }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable:false, - isForm:false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, + // { + // label: '申请时间', + // field: 'requestTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable:false, + // isForm:false, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, { label: '部门', field: 'departmentCode', @@ -731,8 +731,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isForm: false, }, { - label: '创建时间', - field: 'createTime', + label: '供应商创建时间', + field: 'requestTime', isTable:true, formatter: dateFormatter, sortTableDefault:1000, @@ -1200,10 +1200,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive { From d6a90e12b547d9182a7615882c1494a17538f127 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 29 Jul 2024 17:10:49 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=80=E5=85=B3=20?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentSetting/switch/index.vue | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 9cfc75791..138b6cae1 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -32,8 +32,8 @@ {{ row.code }} -