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

src/api/wms/customer/index.ts

@@ -35,6 +35,11 @@ export const getCustomerPage = async (params) => {
 export const getCustomerList = async (params) => {
   return await request.get({ url: `/wms/customer/list`, params })
 }
+
+// 查询客户列表
+export const getCustomerListPc = async (params) => {
+  return await request.get({ url: `/wms/customer/listPc`, params })
+}
 // 查询客户详情
 export const getCustomer = async (id: number) => {
   return await request.get({ url: `/wms/customer/get?id=` + id })

src/components/ImportForm/src/ImportCustomerStatementForm.vue

@@ -318,7 +318,6 @@ const verifyData = async () => {
     // buttonBaseClick('refresh',null)
   } catch {
     //取消走的
-    alert(123);
   }
   }else if(data.status==3){
     await message.alertWarning('已存在相同客户编号及年月的对账单，且已提交，无法导入。')
@@ -438,7 +437,7 @@ const queryParams = reactive({
 
 const getCustomerList = async () => {//获取客户列表
   var param ={}
-  const list = await CustomerApi.getCustomerList(param);
+  const list = await CustomerApi.getCustomerListPc(param);
   customerList.value = list;
 } 
 

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts

@@ -1,6 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
+import {dateFormatter} from "@/utils/formatTime";
 
 // 表单校验
 export const ItemSyntheticRelationRules = reactive({
@@ -76,6 +77,56 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
   },
+  {
+    label: '生效时间',
+    field: 'effectiveDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: true,
+    isForm: true,
+    isDetail:true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expirationDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    isTable: true,
+    isForm: true,
+    isDetail:true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
   {
     label: '备注',
     field: 'remark',

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@@ -62,15 +62,15 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '年月',
-    field: 'yearsMonthStr',
-    sort: 'custom',
-    detail: {
-      dateFormat: 'YYYY-MM'
-    },
-    isForm:false,
-  },
+  // {
+  //   label: '年月',
+  //   field: 'yearsMonthStr',
+  //   sort: 'custom',
+  //   detail: {
+  //     dateFormat: 'YYYY-MM'
+  //   },
+  //   isForm:false,
+  // },
   {
     label: '状态',
     field: 'status',
@@ -92,12 +92,26 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    sort: 'custom',
+    isTable:true,
     formatter: dateFormatter,
-    isSearch: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -106,7 +120,6 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '操作',
@@ -283,9 +296,10 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '验收日期',
-    field: 'acceptCheckTime',
+    field: 'checkTime',
     sort: 'custom',
     isForm: false,
+    formatter: dateFormatter,
   },
   {
     label: '订单号',
@@ -295,7 +309,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '数量-INTEX',
-    field: 'tftmQuantity',
+    field: 'intexQuantity',
     sort: 'custom',
     isForm: false,
   },
@@ -398,7 +412,7 @@ export const CustomerStatementShareReconciliation = useCrudSchemas(reactive<Crud
   },
   {
     label: '模具分摊金额',
-    field: 'allocationPrice',
+    field: 'amount',
     sort: 'custom',
     isForm: false,
   },

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -293,7 +293,7 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['3', '4', '5'])
     }), // 退回
     defaultButtons.mainListCancelBtn({
-      hasPermi: 'wms:customer-statement-main:publish',
+      hasPermi: 'wms:customer-statement-main:nodeAbrogate',
       hide: isShowMainButton(row, ['2', '3', '4', '5'])
     }) // 作废
   ]
@@ -432,7 +432,10 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  //客户对账单
   importTemplateData.templateUrl = await CustomerStatementMainApi.importTemplate()
+  //模具分摊对账单
+  importShareTemplateData.templateUrl = await CustomerStatementMainApi.importShareTemplate()
 })
 //点击重新比对方法
 const tapRematch = async (id: number) => {

src/views/wms/inventoryManage/balance/index.vue

@@ -250,17 +250,17 @@ const handleSelectionPoint = async () => {
 }
 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float: 'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float: 'right',
+  //   hasPermi: ''
+  // },
   defaultButtons.mainListPointBtn(null) // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

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

@@ -530,7 +530,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.directCreateRecord,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -804,9 +804,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    }
+    // tableForm: {
+    //   disabled: true
+    // }
   },
   // {
   //   label: '包装号',

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -293,15 +293,16 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false
-  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    isForm:false,
+  },
   {
     label: '是否可用',
     field: 'available',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -384,6 +384,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
+          newRow['inventoryQty'] = item['qty']
           if(routeName.value == 'NoktoholdRequestMain'){
             newRow['toInventoryStatus'] = "HOLD"
           }else if ( routeName.value == 'HoldtookRequestMain') {
@@ -606,11 +607,11 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
-  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
-    if(item.field == 'qty'){
-      item.tableForm.disabled = routeName.value == "HoldtookRequestMain"
-    }
-  })
+  // InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    // if(item.field == 'qty'){
+    //   item.tableForm.disabled = routeName.value == "HoldtookRequestMain"
+    // }
+  // })
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
@@ -768,6 +769,13 @@ const submitForm = async (formType, submitData) => {
   }
   formRef.value.formLoading = true
   try {
+    const cmdExists = data.subList.some(filter =>
+      parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+    );
+    if(cmdExists){
+      message.warning("数量不能大于库存数量")
+      return
+    }
     if (formType === 'create') {
       await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)
       message.success(t('common.createSuccess'))

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue

@@ -91,6 +91,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain";
+import * as ruleApi  from '@/api/wms/rule/index'
 const { loadStart, loadDone } = usePageLoading()
 // 隔离转线边申请HoldtoWipRequestMain
 // 只有隔离转线边申请在使用的
@@ -288,10 +289,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const fromManagementPrecision = ref('')
+const toManagementPrecision = ref('')
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
-  nextTick(() => {
+  nextTick(async () => {
+    console.log(formField)
     if (type == 'tableForm') {
       if (formField == 'fromPackingNumber') {
         val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
@@ -310,9 +313,38 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边
           tableData.value.push(newRow)
         })
+      } else if (formField == 'toLocationCode') {//到库位代码
+        //从批次
+        await ruleApi.getManagementPrecision({
+          itemCodes: [row['itemCode']],
+          locationCode: row['fromLocationCode']
+        }).then((res) => {
+          fromManagementPrecision.value = res[0].ManagementPrecision
+        })
+
+        if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量
+          //到批次
+          await ruleApi.getManagementPrecision({
+            itemCodes: [row['itemCode']],
+            locationCode: val[0][searchField]
+          }).then((res) => {
+            toManagementPrecision.value = res[0].ManagementPrecision
+          })
+          if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次
+            if (row['fromBatch'] == '') {
+              row['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期
+            }
+            row['fromBatchFormItemType'] = 'FormDate'
+            row['disabled_fromBatch'] = false
+          } else {
+            row['fromBatchFormItemType'] = ''
+            row['disabled_fromBatch'] = true
+          }
+          row[formField] = val[0][searchField]
         } else {
           row[formField] = val[0][searchField]
         }
+      }
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
@@ -708,4 +740,11 @@ onMounted(async () => {
   importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove()
   
 })
+const getFormattedDate = () =>{
+      const a = new Date();
+      const year = a.getFullYear();
+      const month = String(a.getMonth() + 1).padStart(2, '0');
+      const day = String(a.getDate()).padStart(2, '0');
+      return `${year}${month}${day}`;
+    }
 </script>

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts

@@ -557,11 +557,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: true,
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
     },
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
+        valueFormat: 'YYYYMMDD',
       }
     }
   },
@@ -932,9 +936,9 @@ export const InventorymoveRequestDetailRules = reactive({
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
   ],
-  fromPackingNumber: [
-    { required: true, message: '请选择从包装号', trigger: 'change' }
-  ],
+  // fromPackingNumber: [
+  //   { required: true, message: '请选择从包装号', trigger: 'change' }
+  // ],
   fromInventoryStatus: [
     { required: true, message: '请选择从库存状态', trigger: 'change' }
   ],

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts

@@ -26,7 +26,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isForm: false,
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
@@ -66,6 +66,8 @@ export const PurchaseBarterRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'uom',
     sort: 'custom',
     isSearch: false,
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
   },
   {
     label: '批次',

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue

@@ -59,7 +59,6 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-    @inputNumberChange="inputNumberChange"
     @tableFormSelectOnBlur="tableFormSelectOnBlur"
   >
   </BasicForm>
@@ -76,7 +75,6 @@
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
-
     @detailOpenForm="detailOpenForm"
     @onBlur="onBlur"
   />
@@ -162,6 +160,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   })
 }
 const handleDetailSubmitForm = async (formType, data) => {
+  if(data.qty > data.inventoryQty){
+    message.warning("换货数量不能大于库存数量")
+    return
+  }
   if (formType === 'create') {
     await PurchaseBarterRequestDetailApi.createPurchaseBarterRequestDetail(data)
     message.success(t('common.createSuccess'))
@@ -171,7 +173,7 @@ const handleDetailSubmitForm = async (formType, data) => {
     message.success(t('common.updateSuccess'))
   }
   detailRef.value.submitUpdateList()
-
+  getList()
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
@@ -181,9 +183,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     if(formField == 'itemCode'){
       setV['itemCode'] = val[0]['itemCode']
       setV['itemName'] = val[0]['itemName']
-      setV['uom'] = val[0]['supplierUom']
-      setV['packUnit'] = val[0]['packUnit']
-      setV['batch'] = formatTime(new Date(), 'yyyyMMdd')
+      setV['uom'] = val[0]['uom']
+      setV['batch'] = val[0]['batch']
+      setV['location'] = val[0]['batch']
+      setV['inventoryQty'] = val[0]['qty']
+      setV['locationCode'] = val[0]['locationCode']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
     }
     formRef.setValues(setV)
   })
@@ -490,6 +495,10 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }  
   data.subList = tableData.value // 拼接子表数据参数
+  const cmdExists = data.subList.some(filter =>
+    parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+  );
+
   try {
     if (formType === 'create') {
       if(data.subList.length == 0){
@@ -507,6 +516,10 @@ const submitForm = async (formType, submitData) => {
       if(flag){
         return
       }
+      if(cmdExists){
+        message.warning("换货数量不能大于库存数量")
+        return
+      }
       formRef.value.formLoading = true
       await PurchaseBarterRequestMainApi.createPurchaseBarterRequestMain(data)
       message.success(t('common.createSuccess'))
@@ -566,14 +579,6 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-// 创建标签
-const inputNumberChange = (field, index, row, val) => {
-  if(field == 'qty' || field == 'singlePrice'){
-    row.amount = row.qty * row.singlePrice
-  }
-}
-
-
 let validityDays = 0
 const detailOpenForm = (type, row)=>{
   console.log('detailOpenForm',row)
@@ -607,7 +612,6 @@ const tableFormSelectOnBlur = (field, val, row, index) => {
     tableData.value[index][field] = val.target.value
   }
 }
-
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts

@@ -153,7 +153,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           isFormModel:true, // filters中添加筛选的数据--取于formModel
           required:true, // 前置添加必有，和isFormModel结合使用
           isSearch: true,
-          isMainValue: false
+          isMainValue: true
         }],
         verificationParams: [
           {
@@ -297,4 +297,7 @@ export const PurchaseBarterRequestDetailRules = reactive({
   qty:[
     { validator:validateQty, message: '换货数量必须是一个正数', trigger: 'change'}
   ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
 })

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

@@ -658,6 +658,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         action: '==', // 查询拼接条件
         isSearch: true, // 使用自定义拼接条件
         isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+      },
+        {
+          key: 'itemStatus', // 查询列表中字段
+          value: 'E', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
         }]
     },
     form: {

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

@@ -549,6 +549,26 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     },
   },
+  {
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '库区描述',
+    field: 'areaDescription',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
   // {
   //   label: 'ERP库位',
   //   field: 'erpLocationCode',

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

@@ -5,15 +5,16 @@ import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/su
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
-import {getPurchaseDetailPagePoNumber} from "@/api/wms/purchaseDetail";
+import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
-import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 要货计划主表
  */
-export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const PurchasePlanMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '要货计划单号',
       field: 'number',
@@ -59,7 +60,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       field: 'supplierCode',
       sort: 'custom',
       table: {
-      width: 150,
+        width: 150
       },
       isSearch: true,
       sortTableDefault: 3,
@@ -74,19 +75,23 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '供应商信息', // 查询弹窗标题
           searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
           searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        }],
-        verificationParams: [{
+            }
+          ],
+          verificationParams: [
+            {
               key: 'code',
               action: '==',
               value: '',
               isMainValue: false,
               isSearch: 'true',
               isFormModel: true
-        }], // 失去焦点校验参数
+            }
+          ] // 失去焦点校验参数
         }
       },
       search: {
@@ -98,11 +103,13 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '供应商信息', // 查询弹窗标题
           searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
           searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        }]
+            }
+          ]
         }
       }
     },
@@ -137,7 +144,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           type: 'daterange',
           defaultTime: [new Date('1 '), new Date('1 ')]
         }
-    },
+      }
     },
     {
       label: '采购订单',
@@ -160,32 +167,39 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '采购订单信息',
           searchAllSchemas: PurchaseMain.allSchemas,
           searchPage: PurchaseMainApi.getPurchaseMainPage,
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'type',
               value: 'SCHEDULE',
               isMainValue: false
-        },{
+            },
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        },{
+            },
+            {
               key: 'supplierCode',
               value: 'supplierCode',
               message: '请填写供应商代码！',
               isMainValue: true
-        },{
+            },
+            {
               key: 'status',
               value: 2,
               isMainValue: false
-          }],
-        verificationParams: [{
+            }
+          ],
+          verificationParams: [
+            {
               key: 'number',
               action: '==',
               value: '',
               isMainValue: false,
               isSearch: 'true',
               isFormModel: true
-        }], // 失去焦点校验参数
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
@@ -202,12 +216,12 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         componentProps: {
           type: 'date',
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+          valueFormat: 'x'
         }
       },
       detail: {
         dateFormat: 'YYYY-MM-DD'
-    },
+      }
     },
     {
       label: '采购订单类型',
@@ -275,9 +289,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       isForm: false,
       isDetail: false,
       form: {
-      component:"TimePicker",
+        component: 'TimePicker',
         componentProps: {
-        format:"HH:mm",
+          format: 'HH:mm'
         }
       }
     },
@@ -292,9 +306,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       isForm: false,
       isDetail: false,
       form: {
-      component:"TimePicker",
+        component: 'TimePicker',
         componentProps: {
-        format:"HH:mm",
+          format: 'HH:mm'
         }
       }
     },
@@ -306,7 +320,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         width: 150
       },
       isTable: false,
-    isForm: false,
+      isForm: false
     },
     {
       label: '月台代码',
@@ -316,7 +330,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         width: 150
       },
       isForm: false,
-    isTable:false,
+      isTable: false
     },
     {
       label: '业务类型',
@@ -335,7 +349,6 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
 
-  
     // {
     //   label: '自动发布',
     //   field: 'autoPublish',
@@ -403,7 +416,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       isTable: false,
       table: {
         width: 150
-    },
+      }
     },
     {
       label: '创建时间',
@@ -425,7 +438,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           style: { width: '100%' },
           type: 'datetime',
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+          valueFormat: 'x'
         }
       },
       isSearch: true,
@@ -436,7 +449,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
         }
-    },
+      }
     },
     {
       label: '最后更新者',
@@ -446,7 +459,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       isTable: false,
       table: {
         width: 150
-    },
+      }
     },
     {
       label: '最后更新时间',
@@ -467,7 +480,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
           style: { width: '100%' },
           type: 'datetime',
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+          valueFormat: 'x'
         }
       }
     },
@@ -480,7 +493,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       },
       isTable: false,
       isForm: false,
-    isDetail:false,
+      isDetail: false
     },
     {
       label: '操作',
@@ -492,40 +505,26 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         fixed: 'right'
       }
     }
-]))
+  ])
+)
 
 //表单校验
 export const PurchasePlanMainRules = reactive({
-  available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
-  ],
-  supplierCode: [
-    { required: true, message: '请选择供应商代码', trigger: 'change' }
-  ],
-  poNumber: [
-    { required: true, message: '请选择采购订单号', trigger: 'change' }
-  ],
-  deliveryDate: [
-    { required: true, message: '请选择送达时间', trigger: 'change' }
-  ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  available: [{ required: true, message: '请选择是否可用', trigger: 'change' }],
+  supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
+  poNumber: [{ required: true, message: '请选择采购订单号', trigger: 'change' }],
+  deliveryDate: [{ required: true, message: '请选择送达时间', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+  number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
+  businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })
 
 /**
  * @returns {Array} 要货计划子表
  */
-export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const PurchasePlanDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '采购订单号',
       field: 'poNumber',
@@ -549,20 +548,24 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '采购订单信息',
           searchAllSchemas: PurchaseMain.allSchemas,
           searchPage: PurchaseMainApi.getPurchaseMainPage,
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        },{
+            },
+            {
               key: 'supplierCode',
               value: 'supplierCode',
               message: '请填写供应商代码！',
               isMainValue: true
-        },{
+            },
+            {
               key: 'status',
               value: 2,
               isMainValue: false
-        }]
+            }
+          ]
         }
       }
     },
@@ -584,16 +587,19 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '采购订单信息',
           searchAllSchemas: PurchaseDetail.allSchemas,
           searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'number',
               value: 'poNumber',
               message: '请填写订单号！',
               isMainValue: true
-        },{
+            },
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        }]
+            }
+          ]
         }
       },
       tableForm: {
@@ -605,16 +611,19 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
-      searchCondition: [{
+        searchCondition: [
+          {
             key: 'number',
             value: 'poNumber',
             message: '请填写订单号！',
             isMainValue: true
-      },{
+          },
+          {
             key: 'available',
             value: 'TRUE',
             isMainValue: false
-      }]
+          }
+        ]
       }
     },
     {
@@ -646,30 +655,34 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
           searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
+          searchCondition: [
+            {
               key: 'supplierCode',
               value: 'supplierCode',
               message: '请填写供应商代码！',
-          isMainValue: true,
-        },{
+              isMainValue: true
+            },
+            {
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-        }]
+            }
+          ]
         }
       }
     },
     {
-    label: '受入地',
-    field: 'receivedLocation',
+      label: '物料状态',
+      field: 'itemStatus',
       sort: 'custom',
-    sortTableDefault:6,
-    sortSearchDefault:6,
+      dictType: DICT_TYPE.ITEM_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sortTableDefault: 10,
+      sortSearchDefault: 10,
       table: {
         width: 150
       },
-    isTableForm: true,
-    isForm: true,
       form: {
         componentProps: {
           disabled: true
@@ -677,8 +690,29 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },
       tableForm: {
         type: 'Select',
-      disabled:true,
+        disabled: true
+      }
+    },
+    {
+      label: '默认收货库区',
+      field: 'defaultAreaCode',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: true,
+      isForm: true,
+      isTable: true
     },
+    {
+      label: '库区描述',
+      field: 'areaDescription',
+      table: {
+        width: 150
+      },
+      isTableForm: true,
+      isForm: true,
+      isTable: true
     },
     {
       label: '受入号',
@@ -698,8 +732,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },
       tableForm: {
         type: 'Select',
-      disabled:true,
-    },
+        disabled: true
+      }
     },
     {
       label: '订单数量',
@@ -718,14 +752,13 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       tableForm: {
         disabled: true
       }
-
     },
     {
       label: '计划数量',
       field: 'planQty',
       sort: 'custom',
-       sortTableDefault:9,
-    sortSearchDefault:9,
+      sortTableDefault: 9,
+      sortSearchDefault: 9,
       table: {
         width: 150
       },
@@ -750,7 +783,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },
       isTableForm: false,
       isForm: false,
-    isTable: false,
+      isTable: false
     },
 
     {
@@ -763,7 +796,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isTableForm: false,
       isForm: false,
       isTable: false,
-    sortTableDefault:7,
+      sortTableDefault: 7
     },
     {
       label: '计量单位',
@@ -772,8 +805,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.UOM,
       dictClass: 'string',
       isTable: true,
-       sortTableDefault:10,
-    sortSearchDefault:10,
+      sortTableDefault: 10,
+      sortSearchDefault: 10,
       table: {
         width: 150
       },
@@ -784,7 +817,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },
       tableForm: {
         type: 'Select',
-      disabled:true,
+        disabled: true
       }
     },
 
@@ -814,7 +847,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isTableForm: false,
       isForm: false,
       isTable: false,
-    sortTableDefault:6,
+      sortTableDefault: 6
     },
     {
       label: '是否可用',
@@ -852,7 +885,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       table: {
         width: 150
       },
-    isForm: false,
+      isForm: false
     },
     {
       label: '最后更新时间',
@@ -874,7 +907,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
           style: { width: '100%' },
           type: 'datetime',
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+          valueFormat: 'x'
         }
       }
     },
@@ -886,7 +919,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       isTableForm: false,
       table: {
         width: 150
-    },
+      }
     },
     {
       label: '操作',
@@ -898,9 +931,10 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         width: 150,
         fixed: 'right'
       },
-    isTableForm: false,
+      isTableForm: false
     }
-]))
+  ])
+)
 const validatePlanQty = (rule, value, callback) => {
   console.log('validatePlanQty', value)
   const numReg = /^[\d]+$/
@@ -915,17 +949,11 @@ export const PurchasePlanDetailRules = reactive({
   // available: [
   //   { required: true, message: '请选择是否可用', trigger: 'change' }
   // ],
-  shippedQty: [
-    { required: true, message: '请输入已发货数量', trigger: 'blur' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
+  shippedQty: [{ required: true, message: '请输入已发货数量', trigger: 'blur' }],
+  uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
     { validator: validatePlanQty, message: '计划数量不能小于0', trigger: 'blur' }
   ],
-  remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -882,7 +882,7 @@ const openForm = async (type: string, row?: any) => {
       if (
         item.field == 'taxRate' ||
         item.field == 'procurementCreator' ||
-        item.field == 'beforeTaxAmount' ||
+        // item.field == 'beforeTaxAmount' ||
         item.field == 'totalTaxAmount' ||
         item.field == 'goldenTaxInvoiceNumber' ||
         item.field == 'invoiceTime' ||