From dfbfc0f87c0c19083beb18095850c3a678c66129 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 15:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferissueRequestMain/index.vue        | 28 +++++++++++++------
 .../transferissueRequestMain.data.ts          |  3 +-
 .../index.vue                                 |  2 ++
 .../supplierinvoiceRecordMain.data.ts         | 17 +++++++++--
 .../supplierinvoiceRecordMain.data.ts         |  2 +-
 .../supplierinvoiceRequestMain/index.vue      |  2 +-
 .../supplierinvoiceRequestMain.data.ts        | 18 ++++++++++--
 7 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index c10f1bcc4..11ecd8cc3 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -114,17 +114,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'packingNumber') {
+        let itemCodes = []
         val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['packingNumber'] = item['packingNumber']
-          newRow['containerNumber'] = item['containerNumber']
-          newRow['batch'] = item['batch']
-          newRow['uom'] = item['uom']
-          newRow['inventoryStatus'] = item['inventoryStatus']
-          newRow['fromLocationCode'] = item['locationCode']
-          newRow['itemCode'] = item['itemCode']
-          tableData.value.push(newRow)
+          const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) 
+          if(findIndex == -1){
+            const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+            newRow['packingNumber'] = item['packingNumber']
+            newRow['containerNumber'] = item['containerNumber']
+            newRow['batch'] = item['batch']
+            newRow['uom'] = item['uom']
+            newRow['inventoryStatus'] = item['inventoryStatus']
+            newRow['fromLocationCode'] = item['locationCode']
+            newRow['itemCode'] = item['itemCode']
+            tableData.value.push(newRow)
+          }else{
+            itemCodes.push(item['packingNumber'])
+          }
         })
+        if(itemCodes.length>0){
+          message.warning(`${t('ts.包装号')}${itemCodes.join(',')}${t('ts.已经存在')}`);
+        }
+
       } else {
         row[formField] = val[0][searchField]
       }
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 1d3630a91..dd15cd5ef 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -619,8 +619,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      // isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index a066d3239..cc0ccf7cf 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -236,6 +236,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow[formField] = item[searchField]
           tableData.value.push(newRow)
         })
+      }else{
+        row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 23823cded..0894abf29 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -667,7 +667,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sort: 'custom',
     table: {
       width: 150
@@ -943,7 +943,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1156,6 +1156,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sortTableDefault:1000,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  }
 ]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
index d8edcb341..750b54375 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
@@ -981,7 +981,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 850ed72db..b1990ebc4 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -115,7 +115,7 @@
   
   <template #searchTableSelectionsActions="{selections}">
     <div style="text-align: left;margin-right:10px">
-      系统未税金额:{{selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)}}
+      系统未税金额:{{Number(selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
     </div>
   </template>
   <!-- <template #foorter>
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 90e359762..1eafe9afa 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -765,7 +765,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     table: {
       width: 150
     },
@@ -1219,7 +1219,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
   {
     label: '采购价格审批人',
-    field: 'procurementCreator',
+    field: 'procurementCreatorName',
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
@@ -1432,6 +1432,20 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    sortTableDefault:1000,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+
 ]))
 const singlePriceFormart = (row, column, cellValue) => {
   cellValue= Number(cellValue).toFixed(2)