备件收货申请，采购订单+添加明细

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -43,6 +43,8 @@
   <BasicForm
     ref="formRef"
     @success="getList"
+    :isOpenSearchTable="true"
+    fieldTableColumn="poNumber"
     :rules="PurchasereceiptRequestMainRules"
     :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
     :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
@@ -57,7 +59,15 @@
     @submitForm="submitForm"
     @formFormDateChange="formFormDateChange"
     @onEnter="onEnter"
-  />
+  >
+  <template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    placeholder="选择日期"/>
+    </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail
@@ -101,6 +111,7 @@
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { 
@@ -118,6 +129,7 @@ import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { getAccessToken } from '@/utils/auth'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+import * as ItembasicApi from '@/api/wms/itembasic'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
@@ -141,6 +153,8 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  //console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -158,6 +172,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['itemCode'] = item['itemCode']
           newRow['uom'] = item['uom']
           newRow['poNumber'] = item['number']
+          newRow['poLineType'] = item['poLineType']
           let supplierCode = formRef.formModel.supplierCode;
           let queryData = {
             supplierCode:supplierCode,
@@ -176,7 +191,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       const setV = {}
       if(formField == 'supplierCode'){
         setV['supplierCode'] = val[0]['code']
-      }else if(formField == 'ppNumber') {
+      }else if(formField == 'poNumber') {
         //新增--采购订单--
         setV['supplierCode'] = val[0]['supplierCode']
         setV['poNumber'] = val[0]['number']
@@ -209,12 +224,20 @@ const getSearchTableData = async (number,isEnter=false)=>{
     item.width = item.table?.width || 150
   })
   tableData.value = []
+  const itemCodes = []
   tableObject.tableList.forEach(row=>{
+    itemCodes.push(row['itemCode'])
     const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
     newRow['poLine'] = row['lineNumber']
     newRow['itemCode'] = row['itemCode']
     newRow['uom'] = row['uom']
     newRow['poNumber'] =row['number']
+    newRow['supplierCode'] =row['supplierCode']
+    //生产日期 到货日期 默认当天
+    newRow['produceDate'] = dayjs().valueOf()
+    newRow['arriveDate'] = dayjs().valueOf()
+    //批次
+    newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
     newRow['defaultToLocationCode'] =row['defaultLocation']
     tableData.value.push(newRow)
     if(isEnter){
@@ -226,6 +249,15 @@ const getSearchTableData = async (number,isEnter=false)=>{
 
     }
   })
+  //有效期
+  ItembasicApi.getItembasicPage({
+    code:itemCodes.join(',')
+  }).then((res)=>{
+    res.list.forEach((item,index)=>{
+      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      findItem['expireTime'] = item['expireTime']
+    })
+  })
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@@ -53,12 +53,12 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '采购订单号',
-    field: 'ppNumber',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 180
     },
-    isSearch: true,
+    isSearch:true,
     sortTableDefault:4,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -580,13 +580,25 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
       searchTitle: '采购订单信息',
+      isConcatDetailSchemas:true,//是否是主子表合并 默认false
+      searchDetailSchemas:PurchaseDetail.allSchemas,
       searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
+      searchCondition: [
-          key:'supplierCode',
+      {
-          value:'supplierCode',
+        key:'number',
-          message: '请选择供应商！',
+        value:'poNumber',
-          isMainValue: true
+        action: '==', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isFormModel:true,
+        isMainValue: false
+      },
+      {
+        key: 'status', // 查询列表中字段
+        value: '2', // 指查询具体值
+        action: '==', // 查询拼接条件
+        isSearch: true, // 使用自定义拼接条件
+        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
       }]
     },
     form: {