计划外入库

src/api/wms/businesstype/index.ts

@@ -63,3 +63,8 @@ export const exportBusinesstype = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/businesstype/get-import-template' })
 }
+
+// 库存状态
+export const getBusinesstypeCode = async (businessCode: string) => {
+  return await request.get({ url: `/wms/businesstype/getBusinesstypeCode?businessCode=` + businessCode })
+}

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -59,7 +59,14 @@
     @submitForm="submitForm"
     @inputNumberChange="inputNumberChange"
     @tableFormSelectOnBlur="tableFormSelectOnBlur"
-  />
+  ><template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['validityDays']?addDay(row['produceDate'],row['validityDays']).format('YYYY-MM-DD'):''"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    :placeholder="t('ts.选择日期')"/>
+    </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail
@@ -101,6 +108,8 @@
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {
@@ -192,6 +201,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         } else {
           row['itemCode'] = val[0]['code']
           row['uom'] = val[0]['uom']
+          // 有效期 \ 过期日期
+          row['validityDays'] = val[0]['validityDays']
           // StdcostpriceApi.queryStdcostpriceByItemCode({"itemCode":val[0]['code']})
           // .then(res => {
           //   row['singlePrice'] = res.price
@@ -582,6 +593,9 @@ const tableData = ref([])
 const handleAddTable = () => {
   let tfk = JSON.parse(JSON.stringify(tableFormKeys))
   tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  //生产日期 到货日期 默认当天
+  tfk['produceDate'] = dayjs().valueOf()
+  tfk['arriveDate'] = dayjs().valueOf()
   tableData.value.push(tfk)
 }
 // 删除明细

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -22,6 +22,7 @@ import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
 
 import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
 import * as QadProjectApi from '@/api/wms/qadProject'
+import * as BusinesstypeApi from '@/api/wms/businesstype'
 
 const businessType = 'UnplannedReceipt'
 const { t } = useI18n() // 国际化
@@ -43,7 +44,7 @@ const queryParams = {
  // id 转str 否则form回显匹配不到
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
- 
+ const UnplannedReceipt = await BusinesstypeApi.getBusinesstypeCode("UnplannedReceipt")
 /**
  * @returns {Array} 计划外入库申请主表
  */
@@ -872,16 +873,18 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
   {
     label: '库存状态',
     field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
+    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    // dictClass: 'string',
+    isTable: true,
     table: {
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      show:true,
-    }
+      type: 'Select',
+      initOptions:UnplannedReceipt.inInventoryStatusList
+    },
   },
   {
     label: '到货日期',
@@ -955,10 +958,14 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         valueFormat: 'x',
       }
     },
+    // tableForm: {
+    //   type: 'FormDate',
+    //   dateFormat: 'YYYY-MM-DD',
+    //   valueFormat: 'x',
+    // }
     tableForm: {
-      type: 'FormDate',
+      type: 'slot',
-      dateFormat: 'YYYY-MM-DD',
+      disabled:true
-      valueFormat: 'x',
     }
   },
   {