From a2f5cb9464bfc70240ee61474ac21ef3a7cc61d8 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 11 Jun 2024 09:36:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/preparetoissueDetail/index.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/api/wms/preparetoissueDetail/index.ts b/src/api/wms/preparetoissueDetail/index.ts index 44655ff0f..c9b0fddc5 100644 --- a/src/api/wms/preparetoissueDetail/index.ts +++ b/src/api/wms/preparetoissueDetail/index.ts @@ -18,7 +18,14 @@ export interface PreparetoissueDetailVO { // 查询备料计划子列表 export const getPreparetoissueDetailPage = async (params) => { - return await request.get({ url: `/wms/preparetoissue-detail/page`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/preparetoissue-detail/senior', data }) + } else { + return await request.get({ url: `/wms/preparetoissue-detail/page`, params }) + } + } // 查询备料计划子详情 From 5890359726438753c681591174de1185e37cf0e7 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 11 Jun 2024 09:38:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c34237694..07ef4a755 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -566,9 +566,15 @@ const buttonBaseClick = (val) => { } // 保存 else if (val == 'save') { - debounce(() => { + let timer = null + if(!timer){ submitForm() - }, 2000)() + timer = setTimeout(()=>{ + if(timer){ + clearTimeout(timer) + } + },2000) + } } // 关闭 else if (val == 'close') { From 7fec5a2177021e342183d65dd52107813b783bdd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 11 Jun 2024 09:39:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/XButton/src/ButtonBase.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue index 18d850111..adf88fab7 100644 --- a/src/components/XButton/src/ButtonBase.vue +++ b/src/components/XButton/src/ButtonBase.vue @@ -72,8 +72,17 @@ const props = defineProps({ const emit = defineEmits(['buttonBaseClick', 'updataTableColumns']) const buttonBaseClick = (val, item, $event) => { - clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题 - emit('buttonBaseClick', val, item, $event) + let timer = null + if(!timer){ + clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题 + emit('buttonBaseClick', val, item, $event) + timer = setTimeout(()=>{ + if(timer){ + clearTimeout(timer) + } + },2000) + } + } const popoverVisible = ref(false) // 关闭页面 From 7bf75ea9255d0a3c2c2eb822c743b91ac282cd05 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 11 Jun 2024 09:57:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/sparepartsinlocation/index.vue | 14 ++- .../sparePartsInLocationMain.data.ts | 93 +++++++++---------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue index 6b0d3fc8a..f739ba809 100644 --- a/src/views/eam/sparepartsinlocation/index.vue +++ b/src/views/eam/sparepartsinlocation/index.vue @@ -76,8 +76,7 @@ :apiDelete="SparePartsInLocationDetailApi.deleteSparePartsInLocationDetail" @searchTableSuccessDetail="searchTableSuccessDetail" :isShowAddBtn="true" - :detailButtonIsShowAdd="true" - :detailButtonIsShowAddStatusArray="['0']" + :detailButtonIsShowAdd="false" /> @@ -126,17 +125,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => const setV = {} setV[formField] = val[0][searchField] if (type == 'tableForm') { - if (formField == 'sparePartsCode') { - row['sparePartsCode'] = val[0].itemNumber + if (formField == 'locationCode') { + // row['sparePartsCode'] = val[0].itemNumber + row['locationCode'] = val[0].code + row['areaCode'] = val[0].areaCode + row['sparePartsCode'] = val[0].sparePartsCode row['currentQty'] = val[0].qty } } else { if (formField == 'locationCode') { setV['locationCode'] = val[0].code setV['areaCode'] = val[0].areaCode + setV['sparePartsCode'] = val[0].sparePartsCode + setV['currentQty'] = val[0].qty + } } - formRef.setValues(setV) }) }) diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts index 9a311ae27..5908cfbd3 100644 --- a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts +++ b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts @@ -112,40 +112,7 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, }, - { - label: '库位编号', - field: 'locationCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择库位编号', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '库位信息', // 查询弹窗标题 - searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - }, - { - label: '库区编号', - field: 'areaCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '备注', @@ -187,6 +154,8 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive([ export const SparePartsInLocationDetailRules = reactive({ number: [required], masterId: [required], + locationCode: [required], + areaCode: [required], sparePartsCode: [required], applyQty: [required], concurrencyStamp: [required], @@ -228,21 +197,18 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( isTableForm:false }, { - label: '备件编号', - field: 'sparePartsCode', + label: '库位编号', + field: 'locationCode', sort: 'custom', - table: { - width: 150 - }, + isSearch: false, form: { - // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择备件编号', // 输入框占位文本 - searchField: 'itemNumber', // 查询弹窗赋值字段 - searchTitle: '备件信息', // 查询弹窗标题 - searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 - searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 + searchListPlaceholder: '请选择库位编号', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', @@ -257,8 +223,8 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择备件编号', // 输入框占位文本 searchField: 'itemNumber', // 查询弹窗赋值字段 searchTitle: '备件信息', // 查询弹窗标题 - searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 - searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', @@ -268,6 +234,36 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( ] } }, + { + label: '库区编号', + field: 'areaCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled: true + } + }, + { + label: '备件编号', + field: 'sparePartsCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled: true + } + }, { label: '库存数量', field: 'currentQty', @@ -321,7 +317,8 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, - isTableForm:false + isTableForm:false, + isTable:false } ]))