Merge remote-tracking branch 'origin/master_hella' into master_hella

5 months ago · 6f19ea5b3b
22 changed files with 203 additions and 158 deletions
--- a/README.md
+++ b/README.md
@ -4,6 +4,7 @@
 form: {
    labelMessage: '信息提示说明！！！',
    componentProps: {
+      value:'undefined',//默认值，设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder)
      enterSearch: true, //可输入回车  对应绑定事件：@onEnter="onEnter"
      isSearchList: true, // 开启查询弹窗
      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@ -109,3 +109,8 @@ export const selectConfigToItembasic = async (params) => {
    return await request.get({ url: `/wms/itembasic/pageConfigToItembasic`, params })
  }
 }
+
+// 根据物料代码查计量单位
+export const getQueryItemCodeInfo = async (data) => {
+  return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
+}
--- a/src/api/wms/productreceiptRequestDetail/index.ts
+++ b/src/api/wms/productreceiptRequestDetail/index.ts
@ -65,10 +65,7 @@ export const getProductreceiptRequestDetailPageScrap = async (params) => {
    return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
  }
 }
-// 根据物料代码查计量单位
-export const getQueryItemCodeInfo = async (data) => {
-  return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
-}
+

 // 查询制品收货申请子详情
 export const getProductreceiptRequestDetail = async (id: number) => {
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@ -100,6 +100,16 @@ export const exportPurchasereceiptJobMain = async (params) => {
  }
 }

+
+// 导出备件收货任务
+export const exportSparereceiptJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-spare-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel-spare`, params })
+  }
+}
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/purchasereceipt-job-main/get-import-template' })
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@ -89,6 +89,16 @@ export const exportPurchasereceiptRecordMain = async (params) => {
  }
 }

+// 导出备件收货记录
+export const exportSparereceiptRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-spare-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-spare`, params })
+  }
+}
+
 // 导出采购收货记录主 Excel
 export const exportPurchasereceiptRecordMainSCP = async (params) => {
  if (params.isSearch) {
--- a/src/api/wms/purchasereceiptRequestMain/index.ts
+++ b/src/api/wms/purchasereceiptRequestMain/index.ts
@ -88,6 +88,16 @@ export const exportPurchasereceiptRequestMain = async (params) => {
  }
 }

+// 导出备件收货申请
+export const exportSparereceiptRequestMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-spare-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel-spare`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/purchasereceipt-request-main/get-import-template' })
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@ -464,4 +464,7 @@ export default defineComponent({
  margin-right: 0 !important;
  margin-left: 0 !important;
 }
+::v-deep(.el-select-v2 .el-icon) {
+  display: inline-flex;
+}
 </style>
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@ -127,7 +127,7 @@ export const initModel = (schema: FormSchema[], formModel: Recordable) => {
    } else if (v.component && v.component !== 'Divider') {
      const hasField = Reflect.has(model, v.field)
      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
-      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
+      model[v.field] = hasField ? model[v.field] : v.value === 'undefined' ? undefined : v.value !== void 0 ? v.value : ''
    }
  })
  return model
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@ -157,7 +157,7 @@
                </div>
              </el-form-item>
            </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
              <el-form-item label="拆分规则" prop="splitRule">
                <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
                  <el-option
@ -168,7 +168,7 @@
                  />
                </el-select>
              </el-form-item>
-            </el-col>
+            </el-col> -->
            <el-col :span="12" v-if="isShowField !=0">
              <el-form-item label="aql" prop="aql">
                <el-select v-model="data.aql" placeholder="请选择aql">
@ -733,7 +733,7 @@ const rules = ref({
  description: [
    { required: true, message: '请选择描述', trigger: 'blur' }
  ],
-  splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
+  // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
  aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
  inspectionLevel: [
    { required: true, message: '请选择检验水平', trigger: ['blur', 'change'] },
@ -957,6 +957,8 @@ const validateForm = (formRef) => {

 const submitForm = async () => {
  try {
+    const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES);//拆分规则隐藏默认给第一字典值
+    data.value.splitRule = aa[0].value
    const validateForm1 = await validateForm(formProcessRef.value)
    await formMainRef.value.validate()
    if (!data.value.process || data.value.process.length == 0) {
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@ -26,27 +26,8 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'code',
    sort: 'custom',
    table: {
-      width: 150,
-      fixed: 'left'
+      width: 150
    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择月台代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '月台基础信息', // 查询弹窗标题
-        searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类
-        searchPage: DockApi.getDockPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
  },
  {
    label: '客户代码',
@ -130,6 +111,17 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从仓库代码',
+        searchField: 'code',
+        searchTitle: '仓库基础信息',
+        searchAllSchemas: Warehouse.allSchemas,
+        searchPage: WarehouseApi.getWarehousePage,
+      }
+    }
  },
  {
    label: '默认库位',
@ -142,20 +134,25 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
    //   // labelMessage: '信息提示说明！！！',
      componentProps: {
-        // disabled:true
-    //     isSearchList: true, // 开启查询弹窗
-    //     searchListPlaceholder: '请选择库位代码', // 输入框占位文本
-    //     searchField: 'code', // 查询弹窗赋值字段
-    //     searchTitle: '库位基础信息', // 查询弹窗标题
-    //     searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-    //     searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-    //     searchCondition: [{
-    //       key: 'available',
-    //       value: 'TRUE',
-    //       action: '==',
-    //       isSearch: true,
-    //       isMainValue: false
-    //     }]
+        disabled:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.selectConfigToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isSearch: true,
+          isMainValue: false
+        },
+        {
+          key: 'warehouseCode',
+          value: 'warehouseCode',
+          message: '请选择仓库',
+          isMainValue: true
+        }]
      }
    }
  },
@ -313,6 +310,12 @@ export const CustomerdockRules = reactive({
  customerCode: [
    { required: true, message: '请输入客户代码', trigger: 'blur' }
  ],
+  warehouseCode: [
+    { required: true, message: '请选择仓库', trigger: 'blur' }
+  ],
+  defaultLocationCode: [
+    { required: true, message: '请选择默认库位', trigger: 'blur' }
+  ],
  available:  [
    { required: true, message: '请选择是否可用', trigger: 'change' }
  ],
--- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@ -156,15 +156,12 @@ const openForm = (type: string, row?: any) => {
            }
            if (item.field == 'customerCode') {
              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
            }
          })       
-          
  }else {
    Customerdock.allSchemas.formSchema.forEach((item) => {
      if (item.field == 'code') {
        item.componentProps.disabled = false
-        item.componentProps.isSearchList = true
      }
      if (item.field == 'customerCode') {
              item.componentProps.disabled = false
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
@ -153,7 +153,7 @@ const openForm = (type: string, row?: any) => {
    Productionlineitem.allSchemas.formSchema.forEach((item) => {
      if (item.field == 'productionLineCode') {
        item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+        // item.componentProps.isSearchList = false
      }
      if (item.field == 'itemCode') {
        item.componentProps.disabled = true
@ -165,7 +165,7 @@ const openForm = (type: string, row?: any) => {
    Productionlineitem.allSchemas.formSchema.forEach((item) => {
      if (item.field == 'productionLineCode') {
        item.componentProps.disabled = false
-        item.componentProps.isSearchList = true
+        // item.componentProps.isSearchList = true
      }
      if (item.field == 'itemCode') {
        item.componentProps.disabled = false
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ProductionLineCodeApi from '@/api/wms/productionline'
 import { Productionline } from './../../factoryModeling/productionline/productionline.data'
+import * as LocationApi from '@/api/wms/location'

 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from './../itembasic/itembasic.data'
@ -10,6 +11,7 @@ const { t } = useI18n() // 国际化


 const confgiData = await confgiApi.queryByKey("Productionlineitem")
+const lineCodeData = await ProductionLineCodeApi.getProductionlinePage({isSearch:false})

 /**
 * @returns {Array} 生产线物料关系
@ -71,18 +73,26 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      fixed: 'left'
    },
+    isForm:true,
    form: {
+      show:true,
+      component: 'SelectV2',
+      value:'undefined',
      // labelMessage: '信息提示说明！！！',
      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择生产线',
+        // isSearchList: true,
+        placeholder:'请选择库位代码',
        searchField: 'code',
-        searchTitle: '生产线信息',
-        searchAllSchemas: Productionline.allSchemas,
-        searchPage: ProductionLineCodeApi.getProductionlinePage
-      }
+        // searchTitle: '生产线信息',
+        // searchAllSchemas: Productionline.allSchemas,
+        // searchPage: ProductionLineCodeApi.getProductionlinePage
+        options:lineCodeData.list.map(item=>({
+          label:item.code,
+          value:item.code
+        }))
      }
    },
+  },
  {
    label: '物料代码',
    field: 'itemCode',
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@ -112,7 +112,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'code', // 查询弹窗赋值字段
        searchTitle: '客户月台信息', // 查询弹窗标题
        searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerdockApi.pageCustomerCodeToCustomerDock, // 查询弹窗所需分页方法 
+        searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 
        searchCondition: [{
          key: 'available',
          value: 'TRUE',
@ -127,6 +127,38 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    }
  },
+  {
+    label: '到仓库',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: true,
+    isTableForm:false,
+    isDetail:false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: true,
+    isTableForm:false,
+    isDetail:false,
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    }
+  },
  {
    label: '发货类型',
    field: 'deliverType',
@ -800,61 +832,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
-  {
-    label: '到仓库',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '到库位',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位基础信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'areaType',
-        value: "deliverType",
-        message:"请选择发货类型",
-        isMainValue: true
-    }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位基础信息',
-        searchAllSchemas: Location.allSchemas,
-      searchPage: WorkstationApi.selectAreaTypeToLocation,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'areaType',
-          value: "deliverType",
-          message:"请选择发货类型",
-          isMainValue: false
-      }]
-      }
-    },
-  },
  {
    label: '库存状态',
    field: 'inventoryStatus',
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@ -168,6 +168,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          console.log( val[0]);
          row['uom'] = val[0]['customerUom']
        }
+      } else if(formField == 'customerDockCode') {
+        //客户月台
+        setV['toWarehouseCode'] = val[0]['warehouseCode']//到仓库
+        setV['toLocationCode'] = val[0]['defaultLocationCode']//到库位
      } else {
        setV[formField] = val[0][searchField]
      }
@ -494,7 +498,12 @@ const flag = ref(false)

 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  flag.value = false
  data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(item=>{
+    item.toWarehouseCode = data.toWarehouseCode
+    item.toLocationCode = data.toLocationCode
+  })
  let isExist = false
  tableData.value.forEach(item => {
   let rs =  tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@ -226,7 +226,7 @@ const butttondata = (row,$index) => {
  defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
  defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
  defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
-  defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','8']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
+  defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
  ] 
 }
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@ -193,7 +193,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
        row['secondPackQty'] = val[0]['packQty']
      }else if(formField == 'itemCode'){
        
-        let res = await ProductreceiptRequestDetailApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')})
+        let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')})
        if(res.length>0){
          row['uom'] = res[0]['uom']
        }
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@ -73,6 +73,7 @@ import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
 import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain";
 // 采购收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })

@ -257,8 +258,8 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
-    download.excel(data, '采购收货任务主.xlsx')
+    const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
+    download.excel(data, '备件收货任务.xlsx')
  } catch {
  } finally {
    exportLoading.value = false
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@ -71,6 +71,7 @@ import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecord
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {exportSparereceiptRecordMain} from "@/api/wms/purchasereceiptRecordMain";
 // 采购收货记录主
 defineOptions({ name: 'PurchasereceiptRecordMain' })

@ -158,8 +159,8 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-    download.excel(data, '采购收货记录主.xlsx')
+    const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
+    download.excel(data, '备件收货记录.xlsx')
  } catch {
  } finally {
    exportLoading.value = false
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@ -542,8 +542,8 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, '采购收货申请主.xlsx')
+    const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
+    download.excel(data, '备件收货申请.xlsx')
  } catch {
  } finally {
    exportLoading.value = false
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@ -267,6 +267,8 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
            newRow['purchasePrice'] = item['purchasePrice']
            newRow['invoicableQuantity'] = item['invoicableQuantity']
            newRow['itemCode'] = item['itemCode']
+            newRow['planArriveTime'] = item['prhRcpDate']
+            newRow['arrivalQty'] = item['prhRcvd']
          }
          tableData.value.push(newRow)
        })
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@ -1090,6 +1090,37 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    isDetail: false,
    isTable: true,
  },
+  
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
  //仅是主列表页面的筛选搜索条件
  {
    label: '到货时间',
@ -1112,42 +1143,18 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  },
  {
    label: '到货时间',
-    field: 'planArriveTime',
+    field: 'deliveryDate',
    table: {
      width: 150
    },
    formatter: dateFormatter2,
    sortTableDefault:5,
    isForm:false,
-    isTableForm:false,
-    isDetail: false,
-    isTable: true,
-  },
-  {
-    label: '到货数量',
-    field: 'arrivalQty',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-    isForm:false,
-    isTableForm:false,
+    isTableForm:true,
    isDetail: false,
    isTable: true,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
    tableForm:{
-      disabled: true
+      disabled:true
    }
  },
  {