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

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="InspectRequestMainRules"
     :formAllSchemas="InspectRequestMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="InspectRequestDetail.allSchemas"
     :tableFormRules="InspectRequestDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="InspectRequestMain.allSchemas"
     :detailAllSchemas="InspectRequestDetail.allSchemas"
     :detailAllSchemasRules="InspectRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="InspectRequestDetailApi.createInspectRequestDetail"
     :apiUpdate="InspectRequestDetailApi.updateInspectRequestDetail"
     :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage"
     :apiDelete="InspectRequestDetailApi.deleteInspectRequestDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,42 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['itemName'] = val[0]['name']
-      //row['altBatch'] = val[0]['altBatch']
+      row['itemDesc1'] = val[0]['desc1']
-      //row['itemCode'] = val[0]['itemCode']
+      row['itemDesc2'] = val[0]['desc2']
-      //row['itemName'] = val[0]['itemName']
+      row['projectCode'] = val[0]['project']
-      //row['itemDesc1'] = val[0]['itemDesc1']
+      row['uom'] = val[0]['uom']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['purchaseReceiptRecordNumber'] = val[0]['number']
-      //setV['supplierCode'] = val[0]['supplierCode']
+      setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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']
+    setV['uom'] = val[0]['uom']
+    formRef.setValues(setV)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -17,6 +17,11 @@ import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
+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'
+
 /**
  * @returns {Array} 检验申请主表
  */
@@ -29,6 +34,17 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '采购收货记录', // 查询弹窗标题
+        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '供应商代码',
@@ -123,6 +139,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -144,6 +161,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -164,6 +182,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -225,6 +244,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -317,6 +337,10 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -328,6 +352,10 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -538,6 +566,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -563,6 +592,25 @@ export const InspectRequestDetail = 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: '物品名称',
@@ -605,6 +653,10 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="PurchasereceiptRequestMainRules"
     :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
     :tableFormRules="PurchasereceiptRequestDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="PurchasereceiptRequestMain.allSchemas"
     :detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
     :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
     :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
     :apiPage="PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage"
     :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -82,8 +81,6 @@ 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 * as SupplierApi from '@/api/wms/supplier'
-import { Supplier } from '../../../basicDataManage/supplierManage/supplier/supplier.data'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
@@ -101,41 +98,39 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-{
- formField: 'supplierCode',
- searchTableTitle: '供应商信息',
- searchTableAllSchemas: Supplier.allSchemas,
- searchTablePage: SupplierApi.getSupplierPage
-}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['itemName'] = val[0]['name']
-      //row['altBatch'] = val[0]['altBatch']
+      row['itemDesc1'] = val[0]['desc1']
-      //row['itemCode'] = val[0]['itemCode']
+      row['itemDesc2'] = val[0]['desc2']
-      //row['itemName'] = val[0]['itemName']
+      row['projectCode'] = val[0]['project']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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']
+    formRef.setValues(setV)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -2,6 +2,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 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'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -14,6 +17,7 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -45,6 +49,17 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '承运商',
@@ -181,6 +196,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -211,6 +227,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -241,6 +258,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -261,6 +279,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -472,6 +491,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -492,6 +512,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -512,6 +533,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -562,6 +584,10 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -584,6 +610,10 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -606,6 +636,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
     }
   },
   {
@@ -629,6 +662,25 @@ export const PurchasereceiptRequestDetail = 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: '物品名称',
@@ -671,6 +723,10 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -732,6 +788,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -764,6 +821,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="PurchasereturnRequestMainRules"
     :formAllSchemas="PurchasereturnRequestMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="PurchasereturnRequestDetail.allSchemas"
     :tableFormRules="PurchasereturnRequestDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="PurchasereturnRequestMain.allSchemas"
     :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
     :detailAllSchemasRules="PurchasereturnRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail"
     :apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail"
     :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage"
     :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,41 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['itemName'] = val[0]['name']
-      //row['altBatch'] = val[0]['altBatch']
+      row['itemDesc1'] = val[0]['desc1']
-      //row['itemCode'] = val[0]['itemCode']
+      row['itemDesc2'] = val[0]['desc2']
-      //row['itemName'] = val[0]['itemName']
+      row['projectCode'] = val[0]['project']
-      //row['itemDesc1'] = val[0]['itemDesc1']
+      row['uom'] = val[0]['uom']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['purchaseReceiptRecordNumber'] = val[0]['number']
-      //setV['supplierCode'] = val[0]['supplierCode']
+      setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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']
+    setV['uom'] = val[0]['uom']
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -2,6 +2,11 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+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'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -26,8 +31,19 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaseReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '采购收货记录', // 查询弹窗标题
+        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '发货单号',
@@ -179,6 +195,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -199,6 +216,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -269,6 +287,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -299,6 +318,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -545,6 +565,25 @@ export const PurchasereturnRequestDetail = 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: '物品名称',
@@ -587,6 +626,10 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -631,6 +674,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '最后更新者',
@@ -656,6 +708,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="PutawayRequestMainRules"
     :formAllSchemas="PutawayRequestMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="PutawayRequestDetail.allSchemas"
     :tableFormRules="PutawayRequestDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="PutawayRequestMain.allSchemas"
     :detailAllSchemas="PutawayRequestDetail.allSchemas"
     :detailAllSchemasRules="PutawayRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PutawayRequestDetailApi.createPutawayRequestDetail"
     :apiUpdate="PutawayRequestDetailApi.updatePutawayRequestDetail"
     :apiPage="PutawayRequestDetailApi.getPutawayRequestDetailPage"
     :apiDelete="PutawayRequestDetailApi.deletePutawayRequestDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,41 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['itemName'] = val[0]['name']
-      //row['altBatch'] = val[0]['altBatch']
+      row['itemDesc1'] = val[0]['desc1']
-      //row['itemCode'] = val[0]['itemCode']
+      row['itemDesc2'] = val[0]['desc2']
-      //row['itemName'] = val[0]['itemName']
+      row['projectCode'] = val[0]['project']
-      //row['itemDesc1'] = val[0]['itemDesc1']
+      row['uom'] = val[0]['uom']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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']
+    setV['uom'] = val[0]['uom']
+    formRef.setValues(setV)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -3,6 +3,12 @@ import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 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 { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
@@ -29,6 +35,17 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '从仓库代码',
@@ -105,6 +122,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -135,10 +153,12 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-      }
+      },
+      value: new Date().getTime()
     },
   },
   {
@@ -155,6 +175,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -207,6 +228,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -460,6 +482,25 @@ export const PutawayRequestDetail = 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: '备注',
@@ -483,6 +524,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -542,6 +584,10 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
     }
   },
   {
@@ -585,6 +631,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',

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

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+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 { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,6 +18,17 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '版本号',
@@ -37,6 +52,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -58,6 +74,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -79,6 +96,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -103,8 +121,13 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
     isTable: false,
+    form: {
+      value: 'PurchasePrediction',
+      componentProps:{
+        disabled: true
+      }
+    }
   },
   {
     label: '状态',
@@ -148,6 +171,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -235,6 +259,15 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '单据号',
@@ -257,6 +290,25 @@ export const DemandforecastingDetail = 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: '备注',
@@ -280,6 +332,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -307,6 +360,10 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -334,6 +391,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="DemandforecastingMainRules"
     :formAllSchemas="DemandforecastingMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="DemandforecastingDetail.allSchemas"
     :tableFormRules="DemandforecastingDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="DemandforecastingMain.allSchemas"
     :detailAllSchemas="DemandforecastingDetail.allSchemas"
     :detailAllSchemasRules="DemandforecastingDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="DemandforecastingDetailApi.createDemandforecastingDetail"
     :apiUpdate="DemandforecastingDetailApi.updateDemandforecastingDetail"
     :apiPage="DemandforecastingDetailApi.getDemandforecastingDetailPage"
     :apiDelete="DemandforecastingDetailApi.deleteDemandforecastingDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,33 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['uom'] = val[0]['uom']
-      //row['altBatch'] = val[0]['altBatch']
-      //row['itemCode'] = val[0]['itemCode']
-      //row['itemName'] = val[0]['itemName']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['itemCode'] = val[0]['code']
+    setV['uom'] = val[0]['uom']
+    formRef.setValues(setV)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="PurchaseMainRules"
     :formAllSchemas="PurchaseMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="PurchaseDetail.allSchemas"
     :tableFormRules="PurchaseDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="PurchaseMain.allSchemas"
     :detailAllSchemas="PurchaseDetail.allSchemas"
     :detailAllSchemasRules="PurchaseDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PurchaseDetailApi.createPurchaseDetail"
     :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
     :apiPage="PurchaseDetailApi.getPurchaseDetailPage"
     :apiDelete="PurchaseDetailApi.deletePurchaseDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,35 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['projectCode'] = val[0]['project']
-      //row['altBatch'] = val[0]['altBatch']
+      row['uom'] = val[0]['uom']
-      //row['itemCode'] = val[0]['itemCode']
-      //row['itemName'] = val[0]['itemName']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+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 { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -25,6 +29,17 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '订单类型',
@@ -71,10 +86,12 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
-      }
+      },
+      value: new Date().getTime()
     },
   },
   {
@@ -92,6 +109,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -115,6 +133,9 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
     }
   },
   {
@@ -226,6 +247,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -257,6 +279,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -322,6 +345,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      value: ''
+    }
   },
   {
     label: '项目代码',
@@ -338,6 +364,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -358,6 +388,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -375,6 +409,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'convertRate',
    form: {
     component: 'InputNumber',
+    componentProps: {
+      min: 0
+    }
   },
    table: {
     width: 150
@@ -388,6 +425,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
     }
   },
   {
@@ -398,6 +440,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -408,6 +455,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      value: 0,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -418,6 +470,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      value: 1,
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -428,6 +485,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
     }
   },
   {
@@ -438,6 +499,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -448,6 +513,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -458,6 +527,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -489,11 +562,30 @@ export const PurchaseDetail = 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: '明细状态',
     field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_DETAIL_STATUS,
+    dictType: DICT_TYPE.WORK_ORDER_DETAIL_STATUS,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -503,7 +595,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       componentProps: {
         disabled: true
-      }
+      },
+      value: 'OPEN'
     }
   },
   {
@@ -554,6 +647,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '最后更新者',
@@ -563,6 +665,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '最后更新时间',

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="PurchasePlanMainRules"
     :formAllSchemas="PurchasePlanMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="PurchasePlanDetail.allSchemas"
     :tableFormRules="PurchasePlanDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="PurchasePlanMain.allSchemas"
     :detailAllSchemas="PurchasePlanDetail.allSchemas"
     :detailAllSchemasRules="PurchasePlanDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
     :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
     :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
     :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -99,41 +98,37 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['uom'] = val[0]['uom']
-      //row['altBatch'] = val[0]['altBatch']
+      row['poNumber'] = val[0]['number']
-      //row['itemCode'] = val[0]['itemCode']
+      row['poLine'] = val[0]['lineNumber']
-      //row['itemName'] = val[0]['itemName']
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    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)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+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 { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -24,7 +31,18 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '时间窗口',
@@ -97,6 +115,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -118,6 +137,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -146,6 +166,15 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '创建者',
@@ -168,6 +197,15 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     }
   },
   {
@@ -237,6 +275,25 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     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
+      }
     }
   },
   {
@@ -245,6 +302,25 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     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
+      }
     }
   },
   {
@@ -267,6 +343,25 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物品代码',
+        searchField: 'code',
+        searchTitle: '物品基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物品代码',
+      searchField: 'code',
+      searchTitle: '物品基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage
     }
   },
   {
@@ -282,6 +377,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '创建者',
@@ -302,6 +406,10 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     },
   },
   {
@@ -313,6 +421,10 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     },
   },
   {
@@ -350,6 +462,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '备注',

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

@@ -44,7 +44,6 @@
     @success="getList"
     :rules="SupplierdeliverRequestMainRules"
     :formAllSchemas="SupplierdeliverRequestMain.allSchemas"
-    :searchTableParams="searchTableParams"
     :tableAllSchemas="SupplierdeliverRequestDetail.allSchemas"
     :tableFormRules="SupplierdeliverRequestDetailRules"
     :tableData="tableData"
@@ -64,12 +63,12 @@
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
     :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
     :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -82,16 +81,6 @@ import { SupplierdeliverRequestMain,SupplierdeliverRequestMainRules,Supplierdeli
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { PurchasePlanMain } from '@/utils/disposition/tableColumns'
-import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
-import { SupplierdeliverRecordMain } from '@/utils/disposition/tableColumns'
-import * as supplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
-import { Supplier } from '../../../basicDataManage/supplierManage/supplier/supplier.data'
-import * as SupplierApi from '@/api/wms/supplier'
-import { Dock } from '../../../basicDataManage/factoryModeling/dock/dock.data'
-import * as DockApi from '@/api/wms/dock'
-import { Carrier } from '../../../basicDataManage/orderManage/carrier/carrier.data'
-import * as CarrierApi from '@/api/wms/carrier'
 
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
@@ -109,65 +98,41 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-{
- formField: 'ppNumber',
- searchTableTitle: '要货计划',
- searchTableAllSchemas: PurchasePlanMain.allSchemas,
- searchTablePage: PurchasePlanMainApi.getPurchasePlanMainPage
-},
-{
-  formField: 'asnNumber',
-  searchTableTitle: '供应商发货记录',
-  searchTableAllSchemas: SupplierdeliverRecordMain.allSchemas,
-  searchTablePage: supplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage
-},
-{
- formField: 'supplierCode',
- searchTableTitle: '供应商信息',
- searchTableAllSchemas: Supplier.allSchemas,
- searchTablePage: SupplierApi.getSupplierPage
-},
-{
- formField: 'toDockCode',
- searchTableTitle: '月台信息',
- searchTableAllSchemas: Dock.allSchemas,
- searchTablePage: DockApi.getDockPage
-},
-{
- formField: 'carrierCode',
- searchTableTitle: '承运商信息',
- searchTableAllSchemas: Carrier.allSchemas,
- searchTablePage: CarrierApi.getCarrierPage
-},
-])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+      row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+      row['itemCode'] = val[0]['code']
-      //row['batch'] = val[0]['toBatch']
+      row['itemName'] = val[0]['name']
-      //row['altBatch'] = val[0]['altBatch']
+      row['itemDesc1'] = val[0]['desc1']
-      //row['itemCode'] = val[0]['itemCode']
+      row['itemDesc2'] = val[0]['desc2']
-      //row['itemName'] = val[0]['itemName']
+      row['projectCode'] = val[0]['project']
-      //row['itemDesc1'] = val[0]['itemDesc1']
+      row['uom'] = val[0]['uom']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
+      setV['supplierCode'] = val[0]['code']
-      //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }
   })
 }
+// 查询页面返回——详情
+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']
+    setV['uom'] = val[0]['uom']
+    formRef.setValues(setV)
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []

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

@@ -1,7 +1,11 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 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'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -46,6 +50,17 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '联系人姓名',
@@ -117,6 +132,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -195,6 +211,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -225,6 +242,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -245,6 +263,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -297,6 +316,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -492,6 +512,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -512,6 +533,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -532,6 +554,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -563,6 +586,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -585,6 +612,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -607,6 +638,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
     }
   },
   {
@@ -630,6 +664,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物品代码',
+        searchField: 'code',
+        searchTitle: '物品基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物品代码',
+      searchField: 'code',
+      searchTitle: '物品基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage
+    }
   },
   {
     label: '备注',
@@ -688,6 +741,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     }
   },
   {
@@ -719,6 +776,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -751,6 +809,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',