YT-2415不良品流程隔离转合格从仓库改成从库位，明细根据库位筛选

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -172,7 +172,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码',
+        searchListPlaceholder: '请选择从库位代码',
         searchField: 'code',
         searchTitle: '库位信息',
         searchAllSchemas: Location.allSchemas,

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

@@ -59,6 +59,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @clearSearchInput="clearSearchInput"
   />
 
   <!-- 详情 -->
@@ -256,9 +257,9 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
-        key:'fromWarehouseCode',
+        key:'fromLocationCode',
-        value:'fromWarehouseCode',
+        value:'fromLocationCode',
-        message: '请选择从仓库代码！',
+        message: '请选择从库位代码！',
         isMainValue: true
       },
         {
@@ -276,9 +277,9 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
     } else if (fromInventoryStatus.value == null) {
       item.tableForm.searchCondition = [
       {
-        key:'fromWarehouseCode',
+        key:'fromLocationCode',
-        value:'fromWarehouseCode',
+        value:'fromLocationCode',
-        message: '请选择从仓库代码！',
+        message: '请选择从库位代码！',
         isMainValue: true
       },
       {
@@ -421,21 +422,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
-      if (formField == 'fromWarehouseCode') {
+      if (formField == 'fromLocationCode') {
-        if(InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.push({
-          key: 'warehouseCode',
-          value: val[0]["code"],
-          isMainValue: false
-        })
-      } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
-          if (item.key == 'warehouseCode') {
-            item.value = val[0]["code"]
-          }
-        })
-        }
-      
         tableData.value = []
       }
       setV[formField] = val[0][searchField]
@@ -814,7 +801,11 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
   }
 }
-
+const clearSearchInput=(field) => {
+  if (field=='fromLocationCode') {
+   tableData.value = []
+  }
+}
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOkTOHOLD/inventorymoveRequestMain.data.ts

@@ -66,39 +66,32 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '从仓库代码',
+    label: '从库位代码',
-    field: 'fromWarehouseCode',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      enterSearch: true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从仓库代码',
-      searchField: 'code',
-      searchTitle: '仓库基础信息',
-      searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
-    },
      form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         enterSearch: true,
-        isSearchList: true,
+        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从仓库代码',
+        searchListPlaceholder: '请选择从库位代码',
         searchField: 'code',
-        searchTitle: '仓库基础信息',
+        searchTitle: '库位信息',
-        searchAllSchemas: Warehouse.allSchemas,
+        searchAllSchemas: Location.allSchemas,
-        searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+        searchCondition: [
+          {
+            key: 'businessType',
+            value: 'OkToHold',
+            isMainValue: false
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -569,9 +562,9 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchAllSchemas: BalancePopWindow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
       searchCondition: [{
-        key:'fromWarehouseCode',
+        key:'fromLocationCode',
-        value:'fromWarehouseCode',
+        value:'fromLocationCode',
-        message: '请选择从仓库代码！',
+        message: '请选择从库位代码！',
         isMainValue: true
       },{
         key: 'available',
@@ -589,9 +582,9 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchAllSchemas: BalancePopWindow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
         searchCondition: [{
-          key:'fromWarehouseCode',
+          key:'fromLocationCode',
-          value:'fromWarehouseCode',
+          value:'fromLocationCode',
-          message: '请选择从仓库代码！',
+          message: '请选择从库位代码！',
           isMainValue: true
         },{
           key: 'available',