From f4184ba82bc8b6b25f754e716e59dd01cadf35b2 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 4 Jun 2024 10:57:18 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E9=98=B2=E6=8A=96=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 716e2006a..c34237694 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -130,6 +130,7 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import TableForm from '@/components/TableForm/src/TableForm.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { debounce } from 'lodash-es' const props = defineProps({ // 显示窗口宽度设置 @@ -565,7 +566,9 @@ const buttonBaseClick = (val) => { } // 保存 else if (val == 'save') { - submitForm() + debounce(() => { + submitForm() + }, 2000)() } // 关闭 else if (val == 'close') { From 0b3eff0f4f14d6cf24650d414406b83c0b64b0e3 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 11:17:13 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=9D=97=E7=AD=9B=E9=80=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countadjustRecordMain.data.ts | 20 +++++++++---------- .../countadjustRequestMain.data.ts | 20 +++++++++---------- .../inventoryinitRecordMain.data.ts | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index ce3dc3ce0..32950081e 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -24,15 +24,15 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '盘点记录单号', - field: 'countRecordNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + // { + // label: '盘点记录单号', + // field: 'countRecordNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, { label: '仓库代码', field: 'warehouseCode', @@ -214,7 +214,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, form: { component: 'Switch', diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 1f92d5613..32cfaf266 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -55,16 +55,16 @@ export const CountadjustRequestMain = useCrudSchemas(([ }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isForm: false, - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // isForm: false, + // }, { label: '盘点记录单号', field: 'countRecordNumber', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index 68d7615bb..98a51c6ac 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -211,7 +211,7 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: false, sort: 'custom', table: { From 8fae5b662bd34195c13646d0a44e404803054612 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Tue, 4 Jun 2024 11:49:06 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=8F=AD=E7=BB=84=20=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/orderManage/team/team.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index f2e67fdcc..c3b374686 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - isSearch: true, + isTable: false, + isSearch: false, sort: 'custom', form: { component: 'Switch', From 12ea2c658a0f7fb9b4110e621c7c5d05321e028f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 4 Jun 2024 11:59:07 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/axios/config.ts | 2 +- src/views/wms/inventoryManage/balance/index.vue | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index 811650873..9bf0a928a 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -16,7 +16,7 @@ const config: { /** * 接口请求超时时间 */ - request_timeout: 30000, + request_timeout: 300000, /** * 默认接口请求类型 diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index bc9a950bc..c546435e2 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)] }) console.log('批量打印',rows.join(',')) + let getLoading = ElLoading.service({ + lock: true, + text: 'loading...', + background: 'rgba(0, 0, 0, 0.7)' + }) PackageApi.getBalanceToPackageSelection(rows).then(res => { console.log('res',res); + getLoading?.close() if(res.zzLabel){ //制造标签 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) @@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{ }).catch(err => { console.log(err) + getLoading?.close() }) // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) } From c5001f1e65aa3b52e853fa77e30434c08a4208b3 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 13:23:51 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissueRecordMain/transferissueRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 90ca89564..17ae897cd 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -292,7 +292,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: false, sort: 'custom', table: { From 78de8f5822af93411ca5673b4c28c8edb8b69442 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 13:53:46 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferreceiptRecordMain/transferreceiptRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index 7ad4cddb8..e56a47f96 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -300,7 +300,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: false, sort: 'custom', table: { From 7078e0a10142c61466fb677cf5d3406a3358f248 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 4 Jun 2024 13:56:58 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/defaultButtons.ts | 14 ++++- .../purchasePlanMain/index.vue | 58 +++++++++++++++++-- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 77d1d6bb5..522bd47f7 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -492,7 +492,19 @@ export function mainListOrderPubBtn(option:any) { hasPermi: '' }) } - +// 主列表-订单流程-批量发布按钮 +export function mainListSelectionOrderPubBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.发布`).replace('ts.', ''), + name: 'mainOrderSelectionPub', + hide: false, + type: 'primary', + color: '', + float:'left', + link: false, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-订单流程-关闭按钮 export function mainListOrderCloBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 3641a4eb1..385e8b237 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -1,7 +1,7 @@