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

src/api/wms/productputawayRecordMain/index.ts

@@ -61,7 +61,13 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/productreceiptRecordMain/index.ts

@@ -60,7 +60,13 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 
 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/productrepairRecordMain/index.ts

@@ -58,7 +58,13 @@ export const deleteProductrepairRecordMain = async (id: number) => {
 
 // 导出制品返修记录主 Excel
 export const exportProductrepairRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/productscrapRecordMain/index.ts

@@ -57,7 +57,13 @@ export const deleteProductscrapRecordMain = async (id: number) => {
 
 // 导出制品报废记录主 Excel
 export const exportProductscrapRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/productscrapRequestMain/index.ts

@@ -54,7 +54,13 @@ export const deleteProductscrapRequestMain = async (id: number) => {
 
 // 导出制品报废申请主 Excel
 export const exportProductscrapRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/supplieritem/index.ts

@@ -73,5 +73,9 @@ export const selectItembasicTypeToSupplieritem = async (params) => {
     return await request.post({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritemSenior`, data })
   } else {
     return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params })
+  }
 }
+
+export const getDefaultLocationCode = async(data: SupplieritemVO)=> {
+  return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data })
 }

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -210,10 +210,11 @@ const formsSuccess = async (formType,data) => {
 Workstation.allSchemas.tableFormColumns.map(item => {
   if(item.field == 'rawLocationCode') {
       item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'RAW',
+      // },
       {
-        key: 'areaType',
-        value: 'RAW',
-      },{
           key: 'available',
           value: 'TRUE',
         }
@@ -221,10 +222,11 @@ Workstation.allSchemas.tableFormColumns.map(item => {
     }
     if(item.field == 'fgLocationCode') {
       item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'FG',
+      // },
       {
-        key: 'areaType',
-        value: 'FG',
-      },{
           key: 'available',
           value: 'TRUE',
         }

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -27,10 +27,11 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
         </el-button>
+        
       </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -318,6 +318,172 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '出库后剩余库存自动转换为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '超过高储是否允许叫料',
+    field: 'allowIssueRequest',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '优先空库位',
+    field: 'emptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '优先非空库位',
+    field: 'notEmptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混批次',
+    field: 'enableMixLot',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混物品',
+    field: 'enableMixItem',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混状态',
+    field: 'enableMixStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '巷道排序方向',
+    field: 'aisleOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架排序方向',
+    field: 'sheIfOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行排序方向',
+    field: 'rowOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '列排序方向',
+    field: 'columOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   {
     label: '生效时间',
     field: 'activeTime',

src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -7,11 +7,11 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 
-// import * as WarehouseApi from '@/api/wms/warehouse'
-// import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
 
-// import * as LocationApi from '@/api/wms/location'
-// import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 import {validateYS} from '@/utils/validator'
 
@@ -156,35 +156,30 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  // {
-  //   label: '默认收货库位',
-  //   field: 'defaultLocationCode',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     // labelMessage: '信息提示说明！！！',
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       searchListPlaceholder: '请选择库位代码', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '库位信息', // 查询弹窗标题
-  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-  //       searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-  //       searchCondition: [{
-  //         key: 'available',
-  //         value: 'TRUE',
-  //         isMainValue: false
-  //       },{
-  //         key: 'warehouseCode',
-  //         value: 'defaultWarehouseCode',
-  //         message: '请填写默认收货仓库！',
-  //         isMainValue: true
-  //       }]
-  //     }
-  //   }
-  // },
+  {
+    label: '默认收货库位',
+    field: 'defaultLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
   // {
   //   label: '结算方式',
   //   field: 'settlementType',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -775,7 +775,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -550,7 +550,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -54,6 +54,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 详情 -->
@@ -83,6 +84,8 @@ import { PurchasereceiptRequestMain,PurchasereceiptRequestMainRules,Purchaserece
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
 import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
@@ -107,6 +110,8 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  //console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -115,9 +120,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['code']
       } else if(formField == 'poNumber') {
         row['poNumber'] = val[0]['number']
-      } else {
-        // row['poNumber'] = val[0]['number']
+      } else if(formField == 'poLine'){
         row['poLine'] = val[0]['lineNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        let supplierCode = formRef.formModel.supplierCode;
+        let itemCode = val[0]['itemCode']
+        let queryData:SupplieritemApi.SupplieritemVO={
+          supplierCode:supplierCode,
+          itemCode:itemCode
+        } 
+        SupplieritemApi.getDefaultLocationCode(queryData).then(res =>{
+          row['defaultToLocationCode'] = res
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
       }
     } else {
       const setV = {}
@@ -151,6 +169,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -159,7 +179,11 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'export') { // 导出
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -386,6 +410,13 @@ const searchFormClick = (searchData) => {
 //   }
 // }
 
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -7,6 +7,12 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { PurchasePlanDetail, PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -46,42 +52,70 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isForm: false,
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
-    label: '要货计划单号',
-    field: 'ppNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
       width: 180
     },
-    isForm: false,
+    isForm: true,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '要货计划单号',
+    field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
       }
-    }
+    },
+    isForm: true,
   },
   {
     label: '承运商',
@@ -94,6 +128,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '运输方式',
     field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
     sort: 'custom',
     table: {
       width: 150
@@ -328,7 +363,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoCommit,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -348,7 +383,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoAgree,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -368,7 +403,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoExecute,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -456,7 +491,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'number',
       searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
     },
     form: {
       labelMessage: '该订单号会影响订单行的选择',
@@ -466,7 +507,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'number',
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
       }
     }
   },
@@ -507,7 +554,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         message: '请填写订单号！',
         isMainValue: true
       }]
-      }
+    }
   },
   {
     label: '物料代码',
@@ -517,22 +564,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码',
-      searchField: 'code',
-      searchTitle: '物料基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      disabled: true
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
-        searchField: 'code',
-        searchTitle: '物料基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
+        disabled: true
       }
     }
   },
@@ -566,14 +602,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '包装号',
     field: 'packingNumber',
@@ -581,7 +610,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: true,
+    isTableForm: false,
     isForm: false
   },
   {
@@ -625,7 +654,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {
@@ -645,20 +675,41 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
     },
+    isTableForm: true,
+    isForm: false
   },
   {
-    label: '到货日期',
-    field: 'arriveDate',
+    label: '生产日期',
+    field: 'produceDate',
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -678,13 +729,34 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm:{
       type:'FormDate',
-      placeholder: '请选择到货日期',
+      placeholder: '请选择生产日期',
       valueFormat: 'x',
     },
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -704,7 +776,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm:{
       type:'FormDate',
-      placeholder: '请选择生产日期',
+      placeholder: '请选择到货日期',
       valueFormat: 'x',
     },
   },
@@ -758,30 +830,69 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
-      },
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
     },
-    isTableForm: false,
-    isForm: false
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
   },
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
   },
   {
     label: '供应商计量数量',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -8,7 +8,7 @@ import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
-import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
 const { t } = useI18n() // 国际化