修复bug

5 months ago · 92015f23c4
8 changed files with 143 additions and 43 deletions
--- a/src/api/wms/warehouse/index.ts
+++ b/src/api/wms/warehouse/index.ts
@ -59,3 +59,14 @@ export const exportWarehouse = async (params) => {
 export const importTemplate = () => {
  return request.download({ url: '/wms/warehouse/get-import-template' })
 }
+
+// 查询仓库列表
+export const pageBusinessTypeToWarehouse = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/warehouse/pageBusinessTypeToWarehouseSenior', data })
+  } else {
+    return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params })
+  }
+}
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@ -177,7 +177,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
    item.form.componentProps.searchCondition = [
@ -187,7 +187,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
    item.tableForm.searchCondition = [
@ -197,7 +197,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
    item.form.componentProps.searchCondition = [
@ -207,7 +207,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
  }
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
      row['inventoryStatus'] = val[0]['inventoryStatus']
      row['fromLocationCode'] = val[0]['locationCode']
      row['itemCode'] = val[0]['itemCode']
+      row['uom'] = val[0]['uom']
    } else {
      const setV = {}
      setV[formField] = val[0][searchField]
@ -136,6 +137,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
    setV['inventoryStatus'] = val[0]['inventoryStatus']
    setV['fromLocationCode'] = val[0]['locationCode']
    setV['itemCode'] = val[0]['itemCode']
+    setV['uom'] = val[0]['uom']
    formRef.setValues(setV)
  })
 }
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@ -506,7 +506,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
      width: 150
    },
    tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
    }
  },
  {
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@ -83,9 +83,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      // labelMessage: '信息提示说明！！！',
      componentProps: {
        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请科目账户信息',
+        searchListPlaceholder: '请选择领用描述',
        searchField: 'usageDescription',
-        searchTitle: '科目账户信息',
+        searchTitle: '领用描述信息',
        searchAllSchemas: SubjectAccount.allSchemas,
        searchPage: SubjectAccountApi.getSubjectAccountPage
      }
@ -605,7 +605,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
      searchCondition: [{
        key: 'code', // 查询列表中字段
        value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心信息！', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      }]
    },
@ -621,7 +621,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
        searchCondition: [{
          key: 'code', // 查询列表中字段
          value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心信息!', // 当前置条件为空时 弹出信息提示
          isMainValue: true // 表示查询条件不是主表的字段的值
        }]
      }
@ -644,12 +644,12 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
      searchCondition: [{
        key: 'code', // 查询列表中字段
        value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      },{
        key: 'costcentreCode', // 查询列表中字段
        value: 'costcentreCode', // 指查询具体值
-        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心代码!', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      }]
    },
@ -665,12 +665,12 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
        searchCondition: [{
          key: 'code', // 查询列表中字段
          value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
          isMainValue: true // 表示查询条件不是主表的字段的值
        },{
          key: 'costcentreCode', // 查询列表中字段
          value: 'costecentreCode', // 指查询具体值
-          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心代码!', // 当前置条件为空时 弹出信息提示
          isMainValue: false // 表示查询条件不是主表的字段的值
        }]
      }
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@ -14,7 +14,7 @@ import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/loc
 import * as LocationApi from "@/api/wms/location";
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
-
+const businessType = 'UnplannedReceipt'
 const { t } = useI18n() // 国际化

 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@ -165,9 +165,9 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
      // labelMessage: '信息提示说明！！！',
      componentProps: {
        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请科目账户信息',
+        searchListPlaceholder: '请领用描述信息',
        searchField: 'usageDescription',
-        searchTitle: '科目账户信息',
+        searchTitle: '领用描述信息',
        searchAllSchemas: SubjectAccount.allSchemas,
        searchPage: SubjectAccountApi.getSubjectAccountPage
      }
@ -643,7 +643,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
      searchField: 'code',
      searchTitle: '库位信息',
      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationPage,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
      searchCondition: [{
        key: 'available',
        value: 'TRUE',
@ -653,6 +653,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
        value: 'toWarehouseCode',
        message: '请填写到仓库代码！',
        isMainValue: true,
+      },
+      {
+        key: 'businessType',
+        value: businessType ,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
      }]
    },
    form: {
@ -663,7 +672,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
        searchField: 'code', // 查询弹窗赋值字段
        searchTitle: '库位信息', // 查询弹窗标题
        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.getLocationListByAreaAndBusinesstype, // 查询弹窗所需分页方法
        searchCondition: [{
          key: 'available',
          value: 'TRUE',
@ -673,6 +682,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
          value: 'toWarehouseCode',
          message: '请填写到仓库代码！',
          isMainValue: true,
+        },
+        {
+          key: 'businessType',
+          value: businessType ,
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
        }]
      }
    }
@ -796,7 +814,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
      searchCondition: [{
        key: 'code', // 查询列表中字段
        value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心信息！', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      }]
    },
@ -812,7 +830,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
        searchCondition: [{
          key: 'code', // 查询列表中字段
          value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心信息!', // 当前置条件为空时 弹出信息提示
          isMainValue: true // 表示查询条件不是主表的字段的值
        }]
      }
@ -835,12 +853,12 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
      searchCondition: [{
        key: 'code', // 查询列表中字段
        value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      },{
        key: 'costcentreCode', // 查询列表中字段
        value: 'costcentreCode', // 指查询具体值
-        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
        isMainValue: true // 表示查询条件不是主表的字段的值
      }]
    },
@ -848,20 +866,20 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
      // labelMessage: '信息提示说明！！！',
      componentProps: {
        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '选择成本中心',
+        searchListPlaceholder: '选择科目代码',
        searchField: 'projectCode',
-        searchTitle: '成本中心信息',
+        searchTitle: '科目代码信息',
        searchAllSchemas: SubjectAccount.allSchemas,
        searchPage: SubjectAccountApi.getSubjectAccountPage,
        searchCondition: [{
          key: 'code', // 查询列表中字段
          value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
          isMainValue: true // 表示查询条件不是主表的字段的值
        },{
          key: 'costcentreCode', // 查询列表中字段
          value: 'costecentreCode', // 指查询具体值
-          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
          isMainValue: false // 表示查询条件不是主表的字段的值
        }]
      }
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@ -167,7 +167,77 @@ const { tableObject, tableMethods } = useTable({
    toInventoryStatus:'SCRAP'
  }
 }
-
+console.log(99 ,  businessType.value)
+InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
+  if(item.field == 'fromWarehouseCode') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+})
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
  if(item.field == 'fromPackingNumber') {
@ -211,7 +281,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
      item.form.componentProps.searchCondition = [
@ -221,7 +291,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
    }else if (toInventoryStatus.value == null) {
@ -232,7 +302,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
      item.form.componentProps.searchCondition = [
@ -242,7 +312,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
        isMainValue: false
      },{
        key: 'isIn',
-        value: true,
+        value: 'in',
        isMainValue: false
      }]
    }
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@ -78,12 +78,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      searchField: 'code',
      searchTitle: '仓库基础信息',
      searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
+      searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
    },
    form: {
      // labelMessage: '信息提示说明！！！',
@ -93,12 +88,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'code',
        searchTitle: '仓库基础信息',
        searchAllSchemas: Warehouse.allSchemas,
-        searchPage: WarehouseApi.getWarehousePage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
      }
    }
  },
@ -680,6 +670,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
        key: 'type',
        value: 'businessType',
        isMainValue: true
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
      }]
    },
    form: {
@ -696,6 +690,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
            key: 'type',
            value: 'businessType',
            isMainValue: true
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
          }]
      }
    }