From 8048998638e09b264d8d7f185af42450705058f7 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 9 Feb 2023 18:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=98=BE=E7=A4=BA,=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=B2=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/form/ProcessMaterialBorrowingForm.vue    | 2 +-
 src/views/activiti/form/ProcessMaterialWarehousingForm.vue  | 4 ++--
 src/views/activiti/form/ProcessMaterialsAllotForm.vue       | 4 ++--
 src/views/activiti/form/ProcessMaterialsDeliveryForm.vue    | 2 +-
 src/views/activiti/form/ProcessMaterialsReturnForm.vue      | 2 +-
 .../activiti/form/ProcessPermissionAuthorizationForm.vue    | 2 +-
 src/views/activiti/form/ProcessSmaterialsScrapForm.vue      | 2 +-
 src/views/activiti/form/ProcessSpecialMaterialsForm.vue     | 2 +-
 src/views/activiti/form/ProcessUdgetPlanForm.vue            | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index de49020..a7fa191 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 046ef92..f540cbb 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -86,7 +86,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -457,7 +457,7 @@
               {
                 rowKey: record.row.id,
                 values: {
-                  'materialAmount': record.row.materialPrice * record.row.materialQuantity
+                  'materialAmount': parseFloat((record.row.materialPrice * record.row.materialQuantity).toFixed(1)),
                 }
               }
             ]
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index a203d96..496fef4 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="8
 ">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -586,7 +586,7 @@
                   // 'materialPrice': res.price,
                   // 'number': res.number,
                   'allotNumber': res.allotNumber,
-                  'materialAmount': res.materialPrice * parseInt(res.allotNumber)
+                  'materialAmount':   parseFloat((res.materialPrice * parseInt(res.allotNumber)).toFixed(1)),
                 }
               }
             ]
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 8d7bdb0..010d9ef 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -61,7 +61,7 @@
             </a-form-item>
           </a-col>-->
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
index a570bc4..6014578 100644
--- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index bf752b6..aabe826 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -69,7 +69,7 @@
 <!--            </a-form-item>-->
 <!--          </a-col>-->
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 1d1e2d0..5779dfa 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -42,7 +42,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index bf63137..576ee1c 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 4b455f3..6ab9fdc 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1,7 +1,7 @@
 <template>
 
   <a-spin :spinning="confirmLoading" style="height: 680px;padding-top: 10px">
-    <j-form-container :disabled="formDisabled" style="background-color: #efefef;padding-top: 10px">
+    <j-form-container :disabled="formDisabled" style="background-color: #efefef;padding-top: 10px" >
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
@@ -92,7 +92,7 @@
           </a-col>
 
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -1033,7 +1033,7 @@
                   'materialSeries': record.row.materialSeries,
                   'materialName': record.row.materialName,
                   'materialUnit': record.row.materialUnit,
-                  'materialAmount': record.row.materialQuantity * record.row.materialPrice,
+                  'materialAmount': parseFloat((record.row.materialQuantity * record.row.materialPrice).toFixed(1)),
                   'materialType': this.data.materialType
                 }
               }