From bdca660f1dc6981736ca00acbdea42b29d1fe818 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 30 Jul 2024 09:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A85=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue           |  2 +-
 .../supplierinvoiceRequestMain/index.vue           | 10 +++++-----
 .../supplierinvoiceRequestMain.data.ts             | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index bf8745b77..34afdd4b6 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -212,7 +212,7 @@
   // 登录
   const handleLogin = async (params) => {
     console.log('登录-185')
-    if(getSystermUpdateAlert()=='true'){
+    if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){
       await ElMessageBox.alert(
         '<strong>系统迁移，请移步至</strong>' +
         `<a href=${getSystermUpdateUrl()} target="_blank">${getSystermUpdateUrl()}</a>`,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 61ae6ee6b..73a48ffbe 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(4) }}</span>
+        <span :class="{'red-text':row.differencePrice!=0}">{{ Number(row.differencePrice).toFixed(5) }}</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(4))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
+      系统未税金额:{{Number(selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(5))*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(4)"/>
+      <el-input :disabled="true" :class="{'is-red': row['singlePrice'] - row['purchasePrice'] > 0}" :modelValue="((row['singlePrice']) - (row['purchasePrice'])).toFixed(5)"/>
     </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(4))
+        differencePrice:Number((Number(singlePrice)-Number(purchasePrice)).toFixed(5))
       })
     }"
     :isBasic="false"
@@ -1033,7 +1033,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(4))
+      item.differencePrice = Number((Number(item?.singlePrice)-Number(item?.purchasePrice)).toFixed(5))
     })
     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 0e42b2e6d..96c2e56e7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1472,7 +1472,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
 ]))
 
 const singlePriceFormart = (row, column, cellValue) => {
-  cellValue= Number(cellValue).toFixed(4)
+  cellValue= Number(cellValue).toFixed(5)
   cellValue = cellValue + '' || ''
 
   let x = cellValue.split('.')
@@ -1693,13 +1693,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 4,
+        precision: 5,
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 4,
+      precision: 5,
     }
   },
   {
@@ -1714,14 +1714,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 4,
+        precision: 5,
       }
     },
     tableForm:{
       type: 'InputNumber',
       disabled: true,
       min: 0,
-      precision: 4,
+      precision: 5,
     }
   },
   {
@@ -1735,14 +1735,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         disabled: true,
         min: 0,
-        precision: 4,
+        precision: 5,
       }
     },
     tableForm:{
       type: 'slot',
       disabled: true,
       min: 0,
-      precision: 4,
+      precision: 5,
     }
   },
   {