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

src/views/qms/inspectionRequest/index.vue

@@ -88,6 +88,17 @@
       @ListTableSubmit="ListTableSubmit"
     />
   </div>
+
+    <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+
 </template>
 
 <script setup lang="ts">
@@ -105,6 +116,7 @@ import ListTable from '@/components/ListTable/src/ListTable.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { formatDate } from '@/utils/formatTime'
+import { getReportUrl } from '@/utils/systemParam'
 // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 
 defineOptions({ name: 'inspectionMain' })
@@ -226,7 +238,8 @@ const butttondata = (row) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-request-main:edit'
-    }) // 编辑
+    }),// 编辑
+    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
   ]
 }
 const listTableRef = ref()
@@ -263,6 +276,9 @@ const buttonTableClick = async (val, row) => {
       '包装信息',
       InspectionRequestPackage.allSchemas.tableColumns
     )
+  }else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
   } 
 }
 
@@ -350,6 +366,15 @@ const handleSubmit = async (id: number) => {
   }
 }
 
+// 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {

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

@@ -142,67 +142,70 @@ const importFileName = ref()
  */
  if ( routeName.value == 'OktoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
     businessType :'OkToHold'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '合格转隔离任务'
 } else if ( routeName.value == 'NoktoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'NOK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
     businessType :'NokToHold'
   }
-  fromInventoryStatus.value = 'NOK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'NokToHold'
   importFileName.value = '不合格转隔离任务'
 } else if ( routeName.value == 'HoldtookJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
     businessType :'HoldToOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格任务'
 } else if ( routeName.value == 'HoldtoscrapJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
     businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废任务'
 } else if ( routeName.value == 'OktoscrapJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
     businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废任务'
 } else if ( routeName.value == 'ScraptoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
     businessType :'ScrapToHold'
   }
-  fromInventoryStatus.value = 'SCRAP'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'ScrapToHold'
   importFileName.value = '报废转隔离任务'
 } else {
   console.log(146 , fromInventoryStatus.value)
-  fromInventoryStatus.value = null
+  tableObject.params = {
+     businessType :'Move'
+  }
+  // fromInventoryStatus.value = null
   businessType.value = 'Move'
   importFileName.value = '库存移动任务'
 }
@@ -332,6 +335,15 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

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

@@ -103,61 +103,68 @@ const { tableObject, tableMethods } = useTable({
  */
  if ( routeName.value == 'OktoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus: 'HOLD',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus: 'HOLD',
     businessType:'OkToHold'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'OkToHold'
    importFileName.value = '合格转隔离记录'
-} else if ( routeName.value == 'NoktoholdRecordMain') {
+ } else if ( routeName.value == 'NoktoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'NOK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
     businessType:'NoktoHold'
   }
-  fromInventoryStatus.value = 'NOK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'NoktoHold'
    importFileName.value = '不合格转隔离记录'
 }else if ( routeName.value == 'HoldtookRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
     businessType:'HoldtoOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
+   businessType.value = 'HoldtoOk'
    importFileName.value = '隔离转合格记录'
 } else if ( routeName.value == 'HoldtoscrapRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
     businessType:'HoldtoScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
+   businessType.value = 'HoldtoScrap'
    importFileName.value = '隔离转报废记录'
 } else if ( routeName.value == 'OktoscrapRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
     businessType:'OktoScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
+   businessType.value = 'OktoScrap'
    importFileName.value = '合格转报废记录'
 } else if ( routeName.value == 'ScraptoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
     businessType:'ScraptoHold'
   }
-  fromInventoryStatus.value = 'SCRAP'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'ScraptoHold'
    importFileName.value = '报废转隔离记录'
 } else {
-   console.log(146, fromInventoryStatus.value)
-   fromInventoryStatus.value = null
+   tableObject.params = {
+     businessType :'Move'
+   }
    businessType.value = 'Move'
    importFileName.value = '库存移动记录'
 
@@ -281,6 +288,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

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

@@ -115,73 +115,78 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
 }
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    businessType :'Move'
   }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -789,6 +794,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

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

@@ -116,73 +116,80 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
 }
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    businessType :'Move'
   }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
+
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -803,6 +810,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

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

@@ -116,73 +116,78 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
+  }
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
 }
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    businessType :'Move'
   }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -803,6 +808,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@@ -810,12 +810,14 @@ const onChangeForm = async (field, cur, formRef)=>{
     if(subList&&subList.length>0){
       tableData.value = subList.map(item=>({
         'batch':item['batch'],
-        'status':item['inventoryStatus'],
+        'inventoryStatus':item['inventoryStatus'],
         'inventoryBalance':item['qty'],
         'qty':0,
         'reason_type':'',
         'reason':''
       }))
+    }else{
+      tableData.value = []
     }
   }
 }

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts

@@ -254,6 +254,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       },
       form: {
         component: 'Select',
+        value:locationList[0]['value'],
         componentProps: {
           options: locationList
         }