采购收货相关修改

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -105,16 +105,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['itemCode'] = val[0]['code']
-      row['itemName'] = val[0]['name']
-      row['itemDesc1'] = val[0]['desc1']
-      row['itemDesc2'] = val[0]['desc2']
-      row['projectCode'] = val[0]['project']
-      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['purchaseReceiptRecordNumber'] = val[0]['number']
       setV['supplierCode'] = val[0]['supplierCode']
+      row['poNumber'] = val[0]['number']
+      row['poLine'] = val[0]['lineNumber']
       formRef.setValues(setV)
     }
   })
@@ -125,11 +122,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['itemCode'] = val[0]['code']
-    setV['itemName'] = val[0]['name']
-    setV['itemDesc1'] = val[0]['desc1']
-    setV['itemDesc2'] = val[0]['desc2']
-    setV['projectCode'] = val[0]['project']
-    setV['uom'] = val[0]['uom']
     formRef.setValues(setV)
   })
 }

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -17,10 +17,15 @@ import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
 import { PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as LocationApi from '@/api/wms/location'
 
 /**
  * @returns {Array} 检验申请主表
@@ -87,6 +92,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库区代码范围',
@@ -95,6 +101,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库位类型范围',
@@ -106,6 +113,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '备注',
@@ -167,6 +175,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '截止时间',
@@ -259,6 +268,25 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage
+      }
+    }
   },
   {
     label: '订单行',
@@ -267,6 +295,25 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    }
   },
   {
     label: '批次',
@@ -283,6 +330,25 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物品代码',
+      searchField: 'code',
+      searchTitle: '物品基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物品代码',
+        searchField: 'code',
+        searchTitle: '物品基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage
+      }
+    }
   },
   {
     label: '检验类型',
@@ -294,6 +360,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '下一步检验动作',
@@ -305,6 +372,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '抽检方式',
@@ -316,6 +384,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '计量单位',
@@ -341,7 +410,8 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       },
-    }
+    },
+    isForm: false
   },
   {
     label: '样品数量',
@@ -356,7 +426,8 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       },
-    }
+    },
+    isForm: false
   },
   {
     label: '货主代码',
@@ -365,6 +436,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '自动提交',
@@ -524,6 +596,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '器具号',
@@ -532,6 +606,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '库存状态',
@@ -543,6 +619,9 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '从库位代码',
@@ -551,6 +630,25 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
   },
   {
     label: '最后更新时间',
@@ -619,6 +717,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '物品描述1',
@@ -627,6 +727,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '物品描述2',
@@ -635,6 +737,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '项目代码',
@@ -643,6 +747,8 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '数量',
@@ -651,12 +757,10 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -669,6 +773,9 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '操作',

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

@@ -103,12 +103,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
-      row['itemName'] = val[0]['name']
-      row['itemDesc1'] = val[0]['desc1']
-      row['itemDesc2'] = val[0]['desc2']
-      row['projectCode'] = val[0]['project']
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else {
+        row['poNumber'] = val[0]['number']
+        row['poLine'] = val[0]['lineNumber']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -122,11 +123,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
-    setV['itemName'] = val[0]['name']
-    setV['itemDesc1'] = val[0]['desc1']
-    setV['itemDesc2'] = val[0]['desc2']
-    setV['projectCode'] = val[0]['project']
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
     formRef.setValues(setV)
   })
 }

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

@@ -5,6 +5,8 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -18,6 +20,7 @@ const queryParams = {
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -32,6 +35,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '要货计划单号',
@@ -40,6 +44,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '供应商代码',
@@ -93,6 +98,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到仓库代码',
@@ -101,6 +107,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库位类型范围',
@@ -112,6 +119,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库位类型范围',
@@ -123,6 +131,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库区代码范围',
@@ -131,6 +140,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库区代码范围',
@@ -139,6 +149,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到月台代码',
@@ -147,6 +158,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '单据号',
@@ -264,6 +276,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '截止时间',
@@ -452,6 +465,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '器具号',
@@ -460,6 +475,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '批次',
@@ -550,6 +567,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '从库位代码',
@@ -558,6 +580,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '订单号',
@@ -566,6 +590,25 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage
+      }
+    }
   },
   {
     label: '订单行',
@@ -574,6 +617,25 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    }
   },
   {
     label: '标包数量',
@@ -588,7 +650,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       },
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '标包单位',
@@ -600,6 +664,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '供应商计量数量',
@@ -614,7 +683,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       },
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '供应商计量单位',
@@ -626,6 +697,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '转换率',
@@ -639,7 +715,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         min: 0
       },
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '单据号',
@@ -689,6 +767,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述1',
@@ -697,6 +777,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述2',
@@ -705,6 +787,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '项目代码',
@@ -713,6 +797,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '数量',
@@ -727,6 +813,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -739,6 +830,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '从货主代码',
@@ -747,6 +841,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到货主代码',
@@ -755,6 +851,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '备注',

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -105,11 +105,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['itemCode'] = val[0]['code']
-      row['itemName'] = val[0]['name']
-      row['itemDesc1'] = val[0]['desc1']
-      row['itemDesc2'] = val[0]['desc2']
-      row['projectCode'] = val[0]['project']
-      row['uom'] = val[0]['uom']
+      row['poNumber'] = val[0]['number']
+      row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -125,11 +122,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['itemCode'] = val[0]['code']
-    setV['itemName'] = val[0]['name']
-    setV['itemDesc1'] = val[0]['desc1']
-    setV['itemDesc2'] = val[0]['desc2']
-    setV['projectCode'] = val[0]['project']
-    setV['uom'] = val[0]['uom']
+    setV['poNumber'] = val[0]['number']
+    setV['poLine'] = val[0]['lineNumber']
   })
 }
 

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -8,6 +8,9 @@ import { PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceipt
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
@@ -19,6 +22,7 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -52,6 +56,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '要货计划单号',
@@ -60,6 +65,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '供应商代码',
@@ -101,6 +107,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到仓库代码',
@@ -109,6 +116,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库位类型范围',
@@ -120,6 +128,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库位类型范围',
@@ -131,6 +140,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库区代码范围',
@@ -139,6 +149,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库区代码范围',
@@ -147,6 +158,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从月台代码',
@@ -155,6 +167,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '单据号',
@@ -179,7 +192,8 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true
       }
-    }
+    },
+    isForm: false,
   },
   {
     label: '申请时间',
@@ -201,6 +215,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '截止时间',
@@ -460,6 +475,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '器具号',
@@ -468,6 +485,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '批次',
@@ -484,6 +503,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到库位代码',
@@ -492,6 +513,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '库存状态',
@@ -503,6 +526,11 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    tableForm: {
+      type: 'Select'
+    },
+    isForm: false
   },
   {
     label: '订单号',
@@ -511,6 +539,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage
+      }
+    }
   },
   {
     label: '订单行',
@@ -519,6 +566,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    }
   },
   {
     label: '原因',
@@ -527,6 +593,11 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    tableForm: {
+      type: 'Select'
+    },
   },
   {
     label: '从货主代码',
@@ -535,6 +606,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到货主代码',
@@ -543,6 +616,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '单据号',
@@ -592,6 +667,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述1',
@@ -600,6 +677,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述2',
@@ -608,6 +687,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '项目代码',
@@ -616,6 +697,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '数量',
@@ -630,6 +713,11 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         min: 1,
         precision: 6
       },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -642,6 +730,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '备注',

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -105,11 +105,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['itemCode'] = val[0]['code']
-      row['itemName'] = val[0]['name']
-      row['itemDesc1'] = val[0]['desc1']
-      row['itemDesc2'] = val[0]['desc2']
-      row['projectCode'] = val[0]['project']
-      row['uom'] = val[0]['uom']
+      row['poNumber'] = val[0]['number']
+      row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -124,11 +121,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['itemCode'] = val[0]['code']
-    setV['itemName'] = val[0]['name']
-    setV['itemDesc1'] = val[0]['desc1']
-    setV['itemDesc2'] = val[0]['desc2']
-    setV['projectCode'] = val[0]['project']
-    setV['uom'] = val[0]['uom']
+    setV['poNumber'] = val[0]['number']
+    setV['poLine'] = val[0]['lineNumber']
     formRef.setValues(setV)
   })
 }

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -9,6 +9,13 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
@@ -20,6 +27,7 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -54,6 +62,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库位类型范围',
@@ -65,6 +74,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '从库区代码范围',
@@ -73,6 +83,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '单据号',
@@ -160,6 +171,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       },
       value: new Date().getTime()
     },
+    isForm: false,
   },
   {
     label: '截止时间',
@@ -252,6 +264,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库位类型范围',
@@ -263,6 +276,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '到库区代码范围',
@@ -271,6 +285,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '自动提交',
@@ -409,6 +424,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '器具号',
@@ -417,6 +434,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '批次',
@@ -436,6 +455,9 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '订单号',
@@ -444,6 +466,25 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    }
   },
   {
     label: '订单行',
@@ -452,6 +493,25 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    }
   },
   {
     label: '从库位代码',
@@ -460,6 +520,25 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择从库位代码',
+      searchField: 'code',
+      searchTitle: '库位基础信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择从库位代码',
+        searchField: 'code',
+        searchTitle: '库位基础信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
+    }
   },
   {
     label: '单据号',
@@ -550,6 +629,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述1',
@@ -558,6 +639,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述2',
@@ -566,6 +649,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '项目代码',
@@ -574,6 +659,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '数量',
@@ -588,6 +675,11 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -600,6 +692,9 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '从货主代码',
@@ -608,6 +703,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到货主代码',
@@ -616,6 +713,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '最后更新时间',

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

@@ -58,6 +58,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '开始时间',
@@ -80,6 +81,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '结束时间',
@@ -102,6 +104,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '单据号',
@@ -228,9 +231,9 @@ export const DemandforecastingMainRules = reactive({
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
+  // number: [
+  //   { required: true, message: '请输入单据号', trigger: 'blur' }
+  // ],
   // businessType: [
   //   { required: true, message: '请输入业务类型', trigger: 'blur' }
   // ],
@@ -364,6 +367,11 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -376,6 +384,9 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '最后更新时间',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

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

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -104,13 +104,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
-      row['projectCode'] = val[0]['project']
-      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['supplierCode'] = val[0]['code']
       formRef.setValues(setV)
     }
   })
@@ -120,9 +116,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
-    setV['projectCode'] = val[0]['project']
-    setV['uom'] = val[0]['uom']
     formRef.setValues(setV)
   })
 }

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

@@ -345,9 +345,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      value: ''
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '项目代码',
@@ -355,6 +354,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '标包数量',
@@ -368,7 +369,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '标包单位',
@@ -379,6 +382,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '供应商计量数量',
@@ -392,7 +397,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '供应商计量单位',
@@ -403,6 +410,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
   },
   {
    label: '转换率',
@@ -416,6 +425,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
     width: 150
   },
+  isTableForm: false,
+  isForm: false,
   },
   {
     label: '已发货数量',
@@ -430,7 +441,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         precision: 6
       },
       value: 1
-    }
+    },
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '已收货数量',
@@ -445,7 +458,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '已退货数量',
@@ -460,7 +475,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '已上架数量',
@@ -475,7 +492,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '超收百分比',
@@ -486,9 +505,12 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6
+        min: 0
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
     }
   },
   {
@@ -503,7 +525,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '金额',
@@ -517,7 +541,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '订单数量',
@@ -531,6 +557,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 6
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
     }
   },
   {
@@ -542,6 +572,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '单据号',
@@ -597,6 +630,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       },
       value: 'OPEN'
+    },
+    tableForm:{
+      type: 'Select'
     }
   },
   {

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -105,13 +105,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['itemCode'] = val[0]['code']
-      row['uom'] = val[0]['uom']
       row['poNumber'] = val[0]['number']
       row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['supplierCode'] = val[0]['code']
       formRef.setValues(setV)
     }
   })
@@ -122,7 +120,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['itemCode'] = val[0]['code']
-    setV['uom'] = val[0]['uom']
     setV['poNumber'] = val[0]['number']
     setV['poLine'] = val[0]['lineNumber']
     formRef.setValues(setV)

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

@@ -51,6 +51,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '仓库代码',
@@ -59,6 +60,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '月台代码',
@@ -67,6 +69,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
   },
   {
     label: '业务类型',
@@ -121,6 +124,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '结束时间',
@@ -143,6 +147,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isForm: false,
   },
   {
     label: '备注',
@@ -411,6 +416,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         precision: 6
       }
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '计划数量',
@@ -437,6 +444,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 150
+    },
+    tableForm: {
+      type: 'Select'
     }
   },
   {
@@ -498,7 +508,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
       }
-    }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '操作',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -105,15 +105,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       row[formField] = val[0][searchField]
       row['itemCode'] = val[0]['code']
-      row['itemName'] = val[0]['name']
-      row['itemDesc1'] = val[0]['desc1']
-      row['itemDesc2'] = val[0]['desc2']
-      row['projectCode'] = val[0]['project']
-      row['uom'] = val[0]['uom']
+      row['poNumber'] = val[0]['number']
+      row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['supplierCode'] = val[0]['code']
+      setV['ppNumber'] = val[0]['number']
       formRef.setValues(setV)
     }
   })
@@ -124,11 +122,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     setV['itemCode'] = val[0]['code']
-    setV['itemName'] = val[0]['name']
-    setV['itemDesc1'] = val[0]['desc1']
-    setV['itemDesc2'] = val[0]['desc2']
-    setV['projectCode'] = val[0]['project']
-    setV['uom'] = val[0]['uom']
+    setV['poNumber'] = val[0]['number']
+    setV['poLine'] = val[0]['lineNumber']
     formRef.setValues(setV)
   })
 }

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

@@ -6,6 +6,11 @@ const { t } = useI18n() // 国际化
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -32,6 +37,17 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '发货单号',
@@ -41,6 +57,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isSearch: true,
+    isForm: false
   },
   {
     label: '供应商代码',
@@ -93,6 +110,13 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    form: {
+      value: 'T1',
+      componentProps: {
+        disbaled: true
+      }
+    },
+    isForm: false
   },
   {
     label: '到仓库代码',
@@ -101,6 +125,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '到月台代码',
@@ -109,6 +134,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '时间窗口',
@@ -117,6 +143,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm: false
   },
   {
     label: '计划到货时间',
@@ -248,6 +275,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
     label: '截止时间',
@@ -269,6 +297,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
     label: '部门',
@@ -466,22 +495,22 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '批次',
     field: 'batch',
@@ -497,6 +526,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到货日期',
@@ -568,6 +599,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage
+    }
   },
   {
     label: '订单行',
@@ -576,6 +626,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
+    }
   },
   {
     label: '标包数量',
@@ -590,6 +659,13 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -602,6 +678,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '供应商计量数量',
@@ -616,6 +697,13 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -628,6 +716,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '转换率',
@@ -641,6 +734,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         min: 0
       }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0
     }
   },
   {
@@ -699,6 +798,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '到货主代码',
@@ -707,6 +808,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品名称',
@@ -715,6 +818,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述1',
@@ -723,6 +828,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物品描述2',
@@ -731,6 +838,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '数量',
@@ -745,6 +854,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         min: 1,
         precision: 6
       }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -757,6 +871,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '项目代码',
@@ -765,6 +882,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '创建时间',
@@ -847,9 +966,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 
 //表单校验
 export const SupplierdeliverRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请输入包装号', trigger: 'blur' }
-  ],
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'blur' }
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],
@@ -863,10 +982,10 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { required: true, message: '请输入标包数量', trigger: 'blur' }
   ],
   poNumber: [
-    { required: true, message: '请输入订单号', trigger: 'blur' }
+    { required: true, message: '请选择订单号', trigger: 'change' }
   ],
   poLine: [
-    { required: true, message: '请输入订单行', trigger: 'blur' }
+    { required: true, message: '请选择订单行', trigger: 'change' }
   ],
   stdPackUnit: [
     { required: true, message: '请选择标包单位', trigger: 'change' }
@@ -875,6 +994,6 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { required: true, message: '请输入转换率', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物品代码', trigger: 'blur' }
+    { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
 })