From 0d415af788464c71e78bb411189cc9d696b9b12b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 09:58:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 3 ++- .../unplannedreceiptRequestMain/index.vue | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index d923fc149..bf355fdd1 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -100,7 +100,7 @@ `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}` ).replace('ts.', '') " - :disabled="disabledInput(headerItem, row)" + :disabled="itemIsDisabled(headerItem, row)" style="flex: 1" @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)" @clear="clearInput(headerItem.field, row, index)" @@ -120,6 +120,7 @@ :key="headerItem.field + $index + 'button'" v-if="headerItem?.tableForm?.isInpuFocusShow || showInputSearch(headerItem, row)" @click="inpuFocus(headerItem, row, index)" + :disabled="itemIsDisabled(headerItem, row)" > diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 893f27bb4..b475abf6e 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -575,12 +575,12 @@ const buttonTableClick = async (val, row) => { // 打开创建标签页面 // dialogVisible.value = true formLabelRef.value.open('create', row) + + console.log(detailListTableColumns.tableFormColumns) detatableData.tableList.map((item) => { if (item.itemType == '可采购') { - detailListTableColumns.tableFormColumns = - UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter( - (item) => item.field != 'productionLineCode' - ) + item.disabled_productionLineCode = true + item.disabled_supplierCode = false // 修改 tableform 属性 SupplieritemApi.getSupplieritemPage({ pageSize: 10, @@ -596,10 +596,8 @@ const buttonTableClick = async (val, row) => { }) }) } else if (item.itemType == '可制造') { - detailListTableColumns.tableFormColumns = - UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter( - (item) => item.field != 'supplierCode' - ) + item.disabled_supplierCode = true + item.disabled_productionLineCode = false ProductionlineitemApi.getProductionlineitemPage({ pageNo: 1, itemCode: item.itemCode, From 37502721498e404386889f6f2857ebcd06a73c27 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 10:30:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?YT-1451=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=BA=94=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=B0=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index d726ccf0c..ebe38e028 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -367,6 +367,10 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = false itemColumns.componentProps.disabled = true } + if(itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = false + itemColumns.componentProps.disabled = true + } }) } else { @@ -380,6 +384,10 @@ const openForm =async (type: string, row?: number) => { itemColumns.componentProps.isSearchList = true itemColumns.componentProps.disabled = false } + if(itemColumns.field == 'productionLineCode') { + itemColumns.componentProps.isSearchList = true + itemColumns.componentProps.disabled = false + } }) } formRef.value.open(type, row) From 6ba63ea1190563655a01fe6ea70c4bf546284a34 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 10:55:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 968e7311b..262e565a1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1244,7 +1244,6 @@ const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + // 物料状态是号试显示生准订单的发货单模版 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) const handleDocumentPrint = async (id, stausId) => { - debugger await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => { if (res) { //号试（生准订单）模板 From cb5d046cbc1accc264f120a6633fdd4cbaa459c5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 13:30:08 +0800 Subject: [PATCH 4/8] =?UTF-8?q?YT-1487=E3=80=90=E7=BA=B3=E5=85=A5=E5=8F=97?= =?UTF-8?q?=E9=A2=86=E4=B9=A6=E3=80=91=E4=B8=8E=E3=80=90=E9=A1=BA=E5=BC=95?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=88=90=E5=8A=9F=E6=97=B6=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=BF=99=E4=B8=AA=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=8B=E8=BD=BD=E5=B7=AE=E5=BC=82=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=B2=A1=E6=9C=89=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImportForm/src/ImportFormStep.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 0228aed64..aa795a718 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -83,7 +83,7 @@ {{ t('ts.下载模板') }} - + {{ t('ts.下载差异数据') }} From d9ebd64daa70250ff991b3e4f28a9a907c82831c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 3 Dec 2024 14:54:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 0b843af71..5cfc9a2b0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -1,5 +1,4 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' From 7e08f38217307221b7f22bd1a6335d1a9a84bd90 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Tue, 3 Dec 2024 16:10:45 +0800 Subject: [PATCH 6/8] =?UTF-8?q?YT-1459=EF=BC=9A=20=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=BB=8E=E5=BA=93=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BB=8F=E8=BF=87=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=85=8D=E7=BD=AE=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/location/index.ts | 13 ++++ .../ImportForm/src/ImportFormStep.vue | 2 +- .../deliverRecordMain.data.ts | 10 ++- .../deliverRecordMain.data.ts | 10 ++- .../deliverRecordMain.data.ts | 67 ++++++++++--------- .../deliverRecordMain.data.ts | 10 ++- 6 files changed, 69 insertions(+), 43 deletions(-) diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 3ab55c6cc..9e55c6806 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -186,3 +186,16 @@ export const getFromWarehouseCode = async (code: string) => { return await request.get({ url: `/wms/location/getFromWarehouseCode?code=` + code }) } + +// 查询库位列表 +export const getLocationListByBusinesstype = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: `/wms/location/getLocationListByBusinesstypeSenior`, data }) + } else { + return await request.get({ url: `/wms/location/getLocationListByBusinesstype`, params }) + } + +} + diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 0228aed64..aa795a718 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -83,7 +83,7 @@ {{ t('ts.下载模板') }} - + {{ t('ts.下载差异数据') }} diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 1f6ff61d6..2887db8ea 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -717,11 +717,15 @@ export const ExtendColumn = useCrudSchemas( searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法 searchCondition: [ { - key: 'available', - value: 'TRUE', + key: 'isIn', + value: false, + isMainValue: false + },{ + key: 'businessType', + value: 'Deliver', isMainValue: false } ] diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 38fede122..431ea8ea0 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -656,11 +656,15 @@ export const ExtendColumn = useCrudSchemas( searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法 searchCondition: [ { - key: 'available', - value: 'TRUE', + key: 'isIn', + value: false, + isMainValue: false + },{ + key: 'businessType', + value: 'Deliver', isMainValue: false } ] diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 2d156119f..3ec168e0e 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -713,40 +713,41 @@ export const DeliverRecordDetailRules = reactive({ -export const ExtendColumn = useCrudSchemas( - reactive([ - { - label: '从库位', - field: 'fromLocationCode', - sort: 'custom', - table: { - colProps: { - span: 24 - } - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择库位编号', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '库位信息', // 查询弹窗标题 - searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - isSearch: true +export const ExtendColumn = useCrudSchemas([ + { + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + colProps: { + span: 24 + } }, - - ]) -) + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位编号', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'isIn', + value: false, + isMainValue: false + },{ + key: 'businessType', + value: 'Deliver', + isMainValue: false + } + ] + } + }, + isSearch: true + } +]) //表单校验 export const ExtendColumnRules = reactive({ diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index eda2d2870..e403d426f 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -653,11 +653,15 @@ export const ExtendColumn = useCrudSchemas( searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationListByBusinesstype, // 查询弹窗所需分页方法 searchCondition: [ { - key: 'available', - value: 'TRUE', + key: 'isIn', + value: false, + isMainValue: false + },{ + key: 'businessType', + value: 'Deliver', isMainValue: false } ] From 521f538eb838acb711e9a9d312f63b0863bf967f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 16:26:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/post/index.ts | 14 ++ .../system/post/PostAreaPermissionForm.vue | 167 ++++++++++++++++++ src/views/system/post/index.vue | 13 +- 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 src/views/system/post/PostAreaPermissionForm.vue diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts index 405db387e..b5f99bfc0 100644 --- a/src/api/system/post/index.ts +++ b/src/api/system/post/index.ts @@ -44,3 +44,17 @@ export const deletePost = async (id: number) => { export const exportPost = async (params) => { return await request.download({ url: '/system/post/export', params }) } + +// 库位树状图 +export const getPostAreaTreeList = async () => { + return await request.get({ url: '/wms/warehouse/treeLocation' }) +} +// 根据id获取已选择节点 +export const getByPostId = async (id) => { + return await request.get({ url: '/system/post-location/getByPostId?postId=' + id }) +} +//提交选择的节点 +export const updatePostLocation = async (data) => { + return await request.post({ url: '/system/post-location/updatePostLocation',data}) +} + diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue new file mode 100644 index 000000000..7466759fe --- /dev/null +++ b/src/views/system/post/PostAreaPermissionForm.vue @@ -0,0 +1,167 @@ + + + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index a53b5ac4e..f8389611a 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -46,8 +46,12 @@ - +