From 8a1294c82d6b2188baeeea803495faad29fb3ae5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 14 Oct 2024 17:10:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtableForm=20bug,=E6=A8=A1?=
 =?UTF-8?q?=E5=85=B7=E5=88=86=E6=91=8A=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue    |  2 +-
 .../customerStatementMain.data.ts             | 16 +++++++-------
 .../customerStatement/index.vue               | 22 ++++++++++++++-----
 .../inventorymoveRequestMainMOVE/index.vue    |  1 -
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 4cb4f8d1c..61bcb3632 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -86,7 +86,7 @@
         >
           <!-- 字符串输入框 -->
           <el-form-item
-            v-if="!getFormItemType(row,headerItem)&&(!headerItem.tableForm.type || headerItem.tableForm.type == 'InputString')"
+            v-if="!getFormItemType(row,headerItem)&&(!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString')"
             :prop="headerItem.field"
             style="display: flex; align-items: center"
           >
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
index 5c6f89abe..73dca29a8 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
@@ -283,25 +283,25 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '验收日期',
-    field: 'checkTime',
+    field: 'acceptCheckTime',
     sort: 'custom',
     isForm: false,
   },
   {
     label: '订单号',
-    field: 'qty',
+    field: 'releaseNumber',
     sort: 'custom',
     isForm: false,
   },
   {
     label: '数量-INTEX',
-    field: 'price',
+    field: 'tftmQuantity',
     sort: 'custom',
     isForm: false,
   },
   {
     label: '数量-TFTM',
-    field: 'amount',
+    field: 'qty',
     sort: 'custom',
   },
   {
@@ -311,22 +311,22 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '单价-INTEX',
-    field: 'amount',
+    field: 'intexPrice',
     sort: 'custom',
   },
   {
     label: '单价-TFTM',
-    field: 'amount',
+    field: 'price',
     sort: 'custom',
   },
   {
     label: '单价差异',
-    field: 'amount',
+    field: 'priceVariance',
     sort: 'priceVariance',
   },
   {
     label: '金额-INTEX',
-    field: 'amount',
+    field: 'intexAmount',
     sort: 'custom',
   },
   {
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index 668cd83b3..ed07882ab 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -63,6 +63,13 @@
     <template #qty="{row}" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <span :style="{color:row.qty>0?'red':row.qty<0?'#409eff':'#000'}">{{ row.qty }}</span>
     </template>
+    <template #quantityVariance="{row}" v-if="tabCurrent.prop == 'Reconciliation'">
+      <span :style="{color:row.quantityVariance>0?'#409eff':row.quantityVariance<0?'red':'#000'}">{{ row.quantityVariance }}</span>
+    </template>
+    <template #amountVariance="{row}" v-if="tabCurrent.prop == 'Reconciliation'">
+      <span :style="{color:row.amountVariance>0?'#409eff':row.amountVariance<0?'red':'#000'}">{{ row.amountVariance }}</span>
+    </template>
+    
     <template #amount="{row}" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <div style="display: flex;align-items: center;">
         <span style="margin-right:6px">{{ row.amount }}</span>
@@ -463,7 +470,7 @@ const changeTabs = async (item) => {
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
-        name: 'exportReconciliation',
+        name: 'export',
         hide: false,
         type: 'success',
         icon: 'ep:download',
@@ -500,7 +507,7 @@ const changeTabs = async (item) => {
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
-        name: 'exportConfirmShareMoney',
+        name: 'export',
         hide: false,
         type: 'success',
         icon: 'ep:download',
@@ -524,21 +531,24 @@ const changeTabs = async (item) => {
   }
 }
 // 点击子表按钮事件
-const detailButtonBaseClick = (val, item,detailTableObject) => {
+const detailButtonBaseClick = (val, item, detailTableObject) => {
+  console.log(val, item, detailTableObject)
   if (val == 'export') {
     // 子表导出明细
     if (tabCurrent.value.prop == 'Detail') {
       handleExportDetail(detailTableObject)
     } else if (tabCurrent.value.prop == 'Reconciliation') {
-       // 子表导出对账差异
+      // 子表导出对账差异
       handleExportReconciliation(detailTableObject)
-    } {
-     
+    } else if (tabCurrent.value.prop == 'ShareReconciliation') {
+      // 子表导出模具分摊对账单
     }
   }else if (val == 'againContrast') {
     // 重新对比
+    tapRematch(chooseRow.value.id)
   }else if (val == 'confirmResults') {
     // 确认对比结果
+    tapConfirmationContrast(chooseRow.value.id)
   }else if (val == 'exportConfirmShareMoney') {
     //  子表导出模具分摊对账单
   }else if (val == 'confirmShareMoney') {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index d12d63457..35c787d9b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -347,7 +347,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         } else {
           row['fromBatchFormItemType'] = ''
           row['disabled_fromBatch'] = true
-          row['fromBatch'] =''
         }
       } else {
         row[formField] = val[0][searchField]