From f336cc9c3777e23e23e7d11ecf49e3f9a2d4083d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 19 Jul 2024 14:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B74=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      | 10 +++++-----
 .../supplierinvoiceRequestMain.data.ts        | 19 +++----------------
 .../index.vue                                 |  4 ++--
 ...pplierinvoiceRequestMainDifference.data.ts | 10 +++++-----
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index d828ff12d..d35930ccd 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #differencePrice="{row}">
-        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(2) }}</span>
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(4) }}</span>
       </template>
       <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
@@ -115,7 +115,7 @@
   
   <template #selectionsActionspoLine="{selections}">
     <div style="text-align: left;margin-right:10px">
-      系统未税金额:{{Number(selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
+      系统未税金额:{{Number(selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(4))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
     </div>
   </template>
   <!-- <template #foorter>
@@ -124,7 +124,7 @@
     </div>
   </template> -->
     <template v-slot="{row}">
-      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(2)"/>
+      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(4)"/>
     </template>
   </BasicForm>
 
@@ -200,7 +200,7 @@
     :sumFormDataByForm ="(formRef,formModel)=>{
       const {singlePrice=0,purchasePrice=0} = formModel
       formRef.value.setValues({
-        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2))
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(4))
       })
     }"
     :isBasic="false" 
@@ -1032,7 +1032,7 @@ const handleImport = () => {
   const submitForm = async (formType, submitData) => {
     let data = {...submitData}
     tableData.value.forEach((item) => {
-      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(2))
+      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(4))
     })
     data.subList = tableData.value // 拼接子表数据参数
     console.log('data',data)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 17fe92209..97fe1b754 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1473,19 +1473,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   },
 
 ]))
-const priceFormart = (row, column, cellValue) => {
-  cellValue= Number(cellValue).toFixed(2)
-  cellValue = cellValue + '' || ''
-
-  let x = cellValue.split('.')
-  let x1 = x[0]
-  let x2  = x.length > 1 ? '.' + x[1] : ''
-  const reg = /(\d+)(\d{3})/
-  while(reg.test(x1)){
-    x1 = x1.replace(reg, '$1,$2')
-  }
-  return x1+x2
-}
 
 const singlePriceFormart = (row, column, cellValue) => {
   cellValue= Number(cellValue).toFixed(4)
@@ -1743,7 +1730,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '单价差额',
     field: 'differencePrice',
-    formatter: priceFormart,
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },
@@ -1751,14 +1738,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 2,
+        precision: 4,
       }
     },
     tableForm:{
       type: 'slot',
       disabled: true,
       min: 0,
-      precision: 2,
+      precision: 4,
     }
   },
   {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 1bc166d4d..55ff58230 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #differencePrice="{row}">
-        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(2) }}</span>
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(4) }}</span>
       </template>
     </Table>
   </ContentWrap>
@@ -98,7 +98,7 @@
     :sumFormDataByForm ="(formRef,formModel)=>{
       const {singlePrice=0,purchasePrice=0} = formModel
       formRef.value.setValues({
-        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(2))
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(4))
       })
     }"
     :isBasic="false" 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 4317d424b..bba1657b1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1497,7 +1497,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
 
 ]))
 const singlePriceFormart = (row, column, cellValue) => {
-  cellValue= Number(cellValue).toFixed(2)
+  cellValue= Number(cellValue).toFixed(4)
   cellValue = cellValue + '' || ''
 
   let x = cellValue.split('.')
@@ -1739,14 +1739,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 2,
+        precision: 4,
       }
     },
     tableForm:{
       type: 'InputNumber',
       disabled: true,
       min: 0,
-      precision: 2,
+      precision: 4,
     }
   },
   {
@@ -1760,14 +1760,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 2,
+        precision: 4,
       }
     },
     tableForm:{
       type: 'slot',
       disabled: true,
       min: 0,
-      precision: 2,
+      precision: 4,
     }
   },
   {