From a4ab5eb55cdd82d995adb98c4404f7b3eb95704b Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Thu, 24 Aug 2023 09:44:31 +0800
Subject: [PATCH] =?UTF-8?q?ios=E8=A1=A5=E8=AE=A1=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/reporting.vue        | 7 ++++---
 src/views/index/supplySettlement.vue | 5 +++--
 src/views/workOrder/accounting.vue   | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/index/reporting.vue b/src/views/index/reporting.vue
index 85fd69c0..4bc8b05f 100644
--- a/src/views/index/reporting.vue
+++ b/src/views/index/reporting.vue
@@ -64,6 +64,7 @@ export default {
     this.queryType = urlParams.get('queryType');
     this.userOrderId = urlParams.get('userOrderId');
     this.orderCode = urlParams.get('orderCode')
+    this.$toast('queryType' + this.queryType)
   },
   computed:{
     isRadio(){
@@ -82,9 +83,9 @@ export default {
     },
     async goReporting(){
       console.log("1111")
-      if(this.isRadio || this.isTxt){
+      if(this.isRadio && this.isTxt){
         let result = await orderReporting({
-          queryType:this.queryType,
+          queryType:Number(this.queryType),
           userOrderId:this.userOrderId,
           orderCode:this.orderCode,
           reportingItem:this.radio ? this.radio : "",
@@ -97,7 +98,7 @@ export default {
           },2000)
         // }
       }else{
-        this.$toast("报备事项和报备描述必填一项")
+        this.$toast("报备事项和报备描述必选")
       }
     }
   },
diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue
index 25da80bf..544bd6ef 100644
--- a/src/views/index/supplySettlement.vue
+++ b/src/views/index/supplySettlement.vue
@@ -141,7 +141,8 @@ export default {
   margin-bottom: 10px;
 }
 .otherFee {
-  @include wh(100%, 198px)
+  @include wh(100%, 198px);
+  margin-bottom: 20px;
 }
 .title {
   @include fontWeightSize(bold, 14px);
@@ -198,7 +199,7 @@ export default {
 }
 /* 如果需要调整按钮在底部容器内的位置，可以使用更具体的选择器进行样式调整 */
 .fixed-bottom .btn {
-  margin-top: 20px;
+
   position: absolute; /* 将按钮设置为绝对定位 */
   bottom: 30px; /* 可根据需要调整按钮距离底部的距离 */
   left: 50%; /* 可根据需要调整按钮在容器中的水平位置 */
diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue
index cce271df..dc05a884 100644
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@@ -104,15 +104,15 @@
         </div>
         <div  class="flex-between" >
           <div>基本费用:</div>
-          <div class="halfOpcity inputContent" ><input type="number" :disabled="basePriceDisabled" v-model="form.supplierBasePrice"/>元</div>
+          <div class="halfOpcity inputContent"  ><input  type="number" :disabled="basePriceDisabled" v-model="form.supplierBasePrice"/>元</div>
         </div>
         <div  class="flex-between" >
           <div>额外费用总计:</div>
-          <div class="halfOpcity inputContent"><input type="number" :disabled="true" v-model="form.supplierExtraPrice"/>元</div>
+          <div class="halfOpcity inputContent" ><input type="number"  :disabled="true" v-model="form.supplierExtraPrice"/>元</div>
         </div>
         <div  class="flex-between">
             <div>费用总计: </div>
-          <div class="halfOpcity inputContent"><input type="number" :disabled="true" v-model="form.supplierSettleAmount"/>元</div>
+          <div class="halfOpcity inputContent" ><input type="number" :disabled="true" v-model="form.supplierSettleAmount"/>元</div>
         </div>
         <div  class="flex-between">
           <div> </div>
@@ -184,7 +184,7 @@
       </tr>
       <tr>
         <td class="col1">费用总计:{{orderInfo.settleAmount +'元'}}</td>
-        <td  class="col2" >
+        <td  class="col2" style="width: 100%;display: flex;justify-content: center;box-sizing: border-box">
           <input   :disabled="true" v-model="form.supplierSettleAmount"/>
           <button class="btnCom" @click="compute">计算</button>
         </td>