不合格转gel

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -299,6 +299,14 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         }]
     },
   },
+  {
+    label: '项目',
+    field: 'project',
+    sort: 'custom',
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '库位',
     field: 'location',

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@@ -83,7 +83,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...InventorymoveJobMain.allSchemas.tableColumns,...InventorymoveJobDetail.allSchemas.tableMainColumns])
-
+const businessType = ref()
 const fromInventoryStatus = ref()
 const toInventoryStatus = ref()
 
@@ -142,46 +142,67 @@ const importFileName = ref()
  if ( routeName.value == 'OktoholdJobMain') {
   tableObject.params = {
     fromInventoryStatus: 'OK',
-    toInventoryStatus:'HOLD'
+    toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "HOLD"
+  businessType.value = 'OkToHold'
   importFileName.value = '合格转隔离任务'
+} else if ( routeName.value == 'NoktoholdJobMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'NOK',
+    toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离任务'
 } else if ( routeName.value == 'HoldtookJobMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    toInventoryStatus:'OK',
+    businessType :'HoldToOk'
   }
   fromInventoryStatus.value = 'HOLD'
   toInventoryStatus.value = "OK"
+  businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格任务'
 } else if ( routeName.value == 'HoldtoscrapJobMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
   fromInventoryStatus.value = 'HOLD'
   toInventoryStatus.value = "SCRAP"
+  businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废任务'
 } else if ( routeName.value == 'OktoscrapJobMain') {
   tableObject.params = {
     fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "SCRAP"
+  businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废任务'
 } else if ( routeName.value == 'ScraptoholdJobMain') {
   tableObject.params = {
     fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD'
+    toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
   }
   fromInventoryStatus.value = 'SCRAP'
   toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
   importFileName.value = '报废转隔离任务'
 } else {
   console.log(146 , fromInventoryStatus.value)
   fromInventoryStatus.value = null
+  businessType.value = 'Move'
   importFileName.value = '库存移动任务'
 }
 

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@@ -108,6 +108,14 @@ const { tableObject, tableMethods } = useTable({
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "HOLD"
   importFileName.value = '合格转隔离记录'
+} else if ( routeName.value == 'NoktoholdRecordMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'NOK',
+    toInventoryStatus:'HOLD'
+  }
+  fromInventoryStatus.value = 'NOK'
+  toInventoryStatus.value = "HOLD"
+  importFileName.value = '不合格转隔离记录'
 }else if ( routeName.value == 'HoldtookRecordMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',