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/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/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts
index 4d98aaeea..d0883cda9 100644
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@@ -22,6 +22,19 @@ export const getWarehousePage = async (params) => {
}
}
+
+// 查询仓库列表
+export const getWarehouseByBusinessTypeSenior = async (params) => {
+ delete params.isSearch
+ const data = {...params}
+ return request.post({ url: '/wms/warehouse/getWarehouseByBusinessTypeSenior', data })
+}
+
+// 查询仓库列表
+export const getWarehouseByBusinessTypePage = async (params) => {
+ return await request.get({ url: `/wms/warehouse/page`, params })
+}
+
// 校验仓库
export const verifyWarehouse = async (params) => {
return await request.get({ url: `/wms/warehouse/ListByCode`, 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/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/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 @@
-
+
+
+
+ 库区权限
+
编辑
@@ -66,6 +70,7 @@
+