Browse Source

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

hella_online_20240829
zhang_li 4 months ago
parent
commit
7b5d35ca48
  1. 10
      src/api/wms/itempackage/index.ts
  2. 9
      src/views/wms/basicDataManage/itemManage/itempackage/index.vue
  3. 2
      src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

10
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) {

9
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 //
})
//

2
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

Loading…
Cancel
Save