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

src/api/wms/itempackage/index.ts

@@ -39,6 +39,16 @@ export const getItempackagingPageTree = async (params) => {
     return await request.get({ url: `/wms/itempackage/pageTree`, params })
   }
 }
+// 查询物料包装信息树形列表
+export const getItempackagingPageTreeSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itempackage/seniorTreeSCP', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageTreeSCP`, params })
+  }
+}
 // 查询物料包装信息 列表--供应商发货申请
 export const getItempackagingPageBySupplierdeliver = async (params) => {
   if (params.isSearch) {

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -91,14 +91,19 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Itempackaging.allSchemas.tableColumns)
-
+if(routeName.value.includes('SCP')){
+  tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
+  if(routeName.value.includes('SCP')){
+    val = val.filter(item=>item.field!='action')
+  }
   tableColumns.value = val
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ItempackagingApi.getItempackagingPageTree // 分页接口
+  getListApi:routeName.value.includes('SCP')?ItempackagingApi.getItempackagingPageTreeSCP:ItempackagingApi.getItempackagingPageTree // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -504,6 +504,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150