YT-2772：补料任务和补料记录主数据中部门显示不正确

6 days ago · 2cf95b174c
5 changed files with 115 additions and 20 deletions
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@ -75,6 +75,7 @@ import * as RepleinshJobDetailApi from '@/api/wms/repleinshJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 const { loadStart, loadDone } = usePageLoading()
 // 补料任务主
 defineOptions({ name: 'RepleinshJobMain' })
@ -314,10 +315,13 @@ const buttonTableClick = async (val, row) => {
    buttonBaseClick('refresh',null)
  }
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
  detailRef.value.openDetail(row, titleName, titleValue,"jobRepleinshMain")
 }

--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@ -1,6 +1,24 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'RepleinmentRequest',
+  businessTypeCode: 'Repleinment'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+import { getLocationPageRepleinsh } from '@/api/wms/location'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 /**
 * @returns {Array} 补料任务主表
 */
@ -225,14 +243,30 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+        label: '部门',
+        field: 'departmentCode',
+        sort: 'custom',
+        isForm: false,
+        table: {
+          width: 150
+        },
+        isTable: false,
+        formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+          return userDeptArray.find((account) => account.id == cellValue)?.name
+        },
+        form: {
+          value: userDept.id,
+          component: 'Select',
+          api: () => userDeptArray,
+          componentProps: {
+            disabled: true,
+            optionsAlias: {
+              labelField: 'name',
+              valueField: 'id'
+            }
+          }
+        }
+      },
  {
    label: '承接时间',
    field: 'acceptTime',
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@ -69,6 +69,7 @@ import * as RepleinshRecordDetailApi from '@/api/wms/repleinshRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 const { loadStart, loadDone } = usePageLoading()
 // 补料记录主
 defineOptions({ name: 'RepleinshRecordMain' })
@ -139,10 +140,13 @@ const butttondata = (row,$index) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
  detailRef.value.openDetail(row, titleName, titleValue,"record_repleinsh_main")
 }

--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@ -1,6 +1,24 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'RepleinmentRequest',
+  businessTypeCode: 'Repleinment'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+import { getLocationPageRepleinsh } from '@/api/wms/location'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 /**
 * @returns {Array} 补料记录主表
 */
@ -225,14 +243,30 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '部门代码',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+          label: '部门',
+          field: 'departmentCode',
+          sort: 'custom',
+          isForm: false,
+          table: {
+            width: 150
+          },
+          isTable: false,
+          formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+            return userDeptArray.find((account) => account.id == cellValue)?.name
+          },
+          form: {
+            value: userDept.id,
+            component: 'Select',
+            api: () => userDeptArray,
+            componentProps: {
+              disabled: true,
+              optionsAlias: {
+                labelField: 'name',
+                valueField: 'id'
+              }
+            }
+          }
+        },
  {
    label: '接口类型',
    field: 'interfaceType',
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@ -645,6 +645,7 @@ export const RepleinshRequestMainRules = reactive({
  toAreaTypes: [{ required: true, message: '请选择到库区类型范围', trigger: 'change' }],
  departmentCode: [{ required: true, message: '请输入部门', trigger: 'blur' }],
  day: [{ required: true, message: '请选择日期时间', trigger: 'blur' }],
+  deliNo: [{ required: true, message: '请选择便次', trigger: 'blur' }],
  autoCommit: [{ required: true, message: '请选择是否自动提交', trigger: 'change' }],
  autoAgree: [{ required: true, message: '请选择是否自动通过', trigger: 'change' }],
  autoExecute: [{ required: true, message: '请选择是否自动执行', trigger: 'change' }],
@ -926,6 +927,24 @@ export const RepleinshRequestDetail = useCrudSchemas(
      },
      isTable: true,
    },
+    {
+      label: '来源库位',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: true,
+      sortSearchDefault: 1000,
+      // isSearch: true,
+      sortTableDefault: 1100,
+      isTableForm: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
    {
      label: '目标库位',
      field: 'toLocationCode',