Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/location/index.ts

@@ -34,6 +34,15 @@ export const getLocationPage = async (params) => {
     return await request.get({ url: `/wms/location/page`, params })
   }
 }
+export const getLocationPageRepleinsh = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/senior', data })
+  } else {
+    return await request.get({ url: `/wms/location/pageForRepleinsh`, params })
+  }
+}
 // 查询库位所有列表
 export const getLocationList = async (params) => {
   return await request.get({ url: `/wms/location/list`, params })
@@ -115,4 +124,4 @@ export const selectConfigToLocation = async (params) => {
   } else {
     return request.get({ url: `/wms/location/pageConfigToLocation`, params })
   }
-}
+}

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -691,6 +691,11 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+      },{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
       }]
     },
     form: {
@@ -978,4 +983,4 @@ export const IssueRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+})

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -25,6 +25,7 @@ const queryParams = {
  // 获取当前操作人的部门
  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回显匹配不到
@@ -486,7 +487,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
         searchCondition:[{
           key: 'available',
           value: 'TRUE',
@@ -500,7 +501,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'code', // 查询弹窗赋值字段
       searchTitle: '库位信息', // 查询弹窗标题
       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
       searchCondition:[{
         key: 'available',
         value: 'TRUE',
@@ -857,4 +858,4 @@ export const RepleinshRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+})