Merge remote-tracking branch 'origin/master'

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -11,6 +11,9 @@ import { Customerdock } from '../../../basicDataManage/customerManage/customerdo
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
+import * as BalanceApi  from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -675,12 +678,33 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+      searchCondition: [{
+        key: 'locationCode',
+        value: 'CUST',
+        isMainValue: false
+      }]
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePage,
+        searchCondition: [{
+          key: 'locationCode',
+          value: 'CUST',
+          isMainValue: false
+        }]
       }
     }
   },

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -746,6 +746,11 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -149,7 +149,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    }else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -850,12 +850,18 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
 
 //表单校验
 export const ProductionreturnRequestDetailRules = reactive({
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
+  productionLineCode: [
+    { required: true, message: '请选择生产线代码', trigger: 'change' }
+  ],
   // packingNumber: [
   //   { required: true, message: '请选择包装号', trigger: 'change' }
   // ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' }
+  // ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -1,805 +1,10 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
-
-import * as WorkshopApi  from '@/api/wms/workshop'
-import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
-
-import * as ProductionlineApi  from '@/api/wms/productionline'
-import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
-
-import * as WorkstationApi  from '@/api/wms/workstation'
-import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
-
-import * as BalanceApi  from '@/api/wms/balance'
-import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-
-import * as ProductionlineitemApi  from '@/api/wms/productionlineitem'
-import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 
 import * as SupplieritemApi  from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
 const { t } = useI18n() // 国际化
 
-// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
-const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'MaterialReturnRequest'
-}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
-
- // 获取当前操作人的部门
-import { useUserStore } from '@/store/modules/user'
-const userStore = useUserStore()
-const userDept = userStore.userSelfInfo.dept
-
-/**
- * @returns {Array} 生产退料申请主表
- */
-export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '车间代码',
-    field: 'workshopCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '车间信息', // 查询弹窗标题
-        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-  },
-  {
-    label: '从仓库代码',
-    field: 'fromWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
-    // dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isForm: false,
-    isSearch: true,
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: userDept.name,
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
-    // dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 300,
-      fixed: 'right'
-    },
-  }
-]))
-
-//表单校验
-export const ProductionreturnRequestMainRules = reactive({
-  departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
-  autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
-  ],
-  autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
-  ],
-  autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
-  ],
-  directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-})
-
-/**
- * @returns {Array} 生产退料申请子表
- */
-export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition:[{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '工位信息', // 查询弹窗标题
-      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号', // 输入框占位文本
-        searchField: 'packingNumber', // 查询弹窗赋值字段
-        searchTitle: '库存余额信息', // 查询弹窗标题
-        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-        searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装号', // 输入框占位文本
-      searchField: 'packingNumber', // 查询弹窗赋值字段
-      searchTitle: '库存余额信息', // 查询弹窗标题
-      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
-    },
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物品描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物品描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
-]))
-
-//表单校验
-export const ProductionreturnRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
-  // fromLocationCode: [
-  //   { required: true, message: '请输入从库位代码', trigger: 'blur' }
-  // ],
-  itemCode: [
-    { required: true, message: '请输入物品代码', trigger: 'blur' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-})
-
 /**
  * @returns {Array} 隔离退料申请子表创建标签
  */
@@ -813,17 +18,6 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     },
     tableForm:{
       disabled: true
-      // isInpuFocusShow: true,
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
-      // searchTitle: '生产线物品关系信息', // 查询弹窗标题
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
     }
   },
   {

src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@@ -103,7 +103,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+        row['uom'] = val[0]['uom']
+      } else {
+        row[formField] = val[0][searchField]
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -115,7 +120,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -593,7 +593,13 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {

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

@@ -207,6 +207,19 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         value: businessType.value,
         isMainValue: false
       }]
+    }else if (toInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value ,
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      }]
     }
   }
 })