From adcb7151e9171dfb05900377ff6c657748ed8e29 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Wed, 30 Aug 2023 09:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E5=B0=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=B2=A1=E6=9C=89=E7=9B=AE=E7=9A=84=E5=9C=B0=EF=BC=8C?=
 =?UTF-8?q?input=E6=A1=86=E4=B8=8D=E5=8F=AF=E5=A1=AB=E5=86=99=E7=9A=84?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/workOrderDetail.vue |  4 ++--
 src/views/workOrder/accounting.vue  | 33 +++++++++++++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/index/workOrderDetail.vue b/src/views/index/workOrderDetail.vue
index c78f8f47..f60a7db5 100644
--- a/src/views/index/workOrderDetail.vue
+++ b/src/views/index/workOrderDetail.vue
@@ -50,10 +50,10 @@
           <span class="leftTitle fontColor">事发地补充:</span><span class="rightContent vehicleRemark" >{{orderDetailInfo.vehiclePointRemark}}
       </span>
         </div>
-        <div class="item"  style="align-items: baseline">
+        <div v-show="orderDetailInfo.taskFlowId === 2" class="item"  style="align-items: baseline" >
           <span class="leftTitle fontColor">目的地:</span><span class="rightContent" style="flex: 1">{{ orderDetailInfo.destinationAddress }}</span>
         </div>
-        <div class="item"  style="align-items: baseline">
+        <div v-show="orderDetailInfo.taskFlowId === 2" class="item"  style="align-items: baseline">
           <span class="leftTitle fontColor">目的地补充:</span><span class="rightContent vehicleRemark">{{orderDetailInfo.destinationRemark}}</span>
         </div>
         <div class="item">
diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue
index 1af5ca7f..86e36473 100644
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@@ -102,20 +102,20 @@
             <div>收取客户金额:</div>
             <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierCustomerAmount"/>元</div>
         </div>
-        <div  class="flex-between" >
+        <div  class="flex-between bgDisable" >
           <div>基本费用:</div>
-          <div class="halfOpcity inputContent "  ><input  :class="basePriceDisabled ? 'disable' : ''" type="number" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/><span :class="basePriceDisabled ? 'disable' : ''">元</span></div>
+          <div class="halfOpcity inputContent "  ><input  class="disable" type="number" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/><span >元</span></div>
         </div>
-        <div  class="flex-between" >
+        <div  class="flex-between bgDisable" >
           <div>额外费用总计:</div>
-          <div class="halfOpcity inputContent" ><input class="disable" type="number"  :readonly="true" v-model="form.supplierExtraPrice"/><span class="disable">元</span></div>
+          <div class="halfOpcity inputContent " ><input class="disable" type="number"  :readonly="true" v-model="form.supplierExtraPrice"/><span>元</span></div>
         </div>
-        <div  class="flex-between">
+        <div  class="flex-between bgDisable ">
             <div>费用总计: </div>
-          <div class="halfOpcity inputContent" ><input class="disable" type="number" :readonly="true" v-model="form.supplierSettleAmount"/><span class="disable">元</span></div>
+          <div class="halfOpcity inputContent " ><input class="disable" type="number" :readonly="true" v-model="form.supplierSettleAmount"/><span >元</span></div>
         </div>
         <div  class="flex-between">
-          <div> </div>
+          <div> &nbsp;</div>
           <div class="btnComputed" @click="compute">计算</div>
         </div>
         <div>备注说明:</div>
@@ -172,11 +172,11 @@
       </tr>
       <tr>
         <td class="col1">基本费用:{{orderInfo.basePrice +'元'}}</td>
-        <td  class="col2 halfOpc"  :style="{ opacity: basePriceDisabled ? '1' : '0.5' }"><input   :class="basePriceDisabled ? 'disable' : ''" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/></td>
+        <td  class="col2 halfOpc"  :style="{ opacity: basePriceDisabled ? '1' : '0.5' }"><input   :class="basePriceDisabled ? 'supplierdisable' : ''" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/></td>
       </tr>
       <tr>
         <td class="col1">额外费用总计:{{orderInfo.extraPrice +'元'}}</td>
-        <td  class="col2 halfOpc" style="opacity: 1;"><input  class="disable"  :readonly="true" v-model="form.supplierExtraPrice"/></td>
+        <td  class="col2 halfOpc" style="opacity: 1;"><input  class="supplierdisable"  :readonly="true" v-model="form.supplierExtraPrice"/></td>
       </tr>
       <tr>
         <td class="col1">收取客户:{{orderInfo.customerAmount +'元'}}</td>
@@ -185,7 +185,7 @@
       <tr>
         <td class="col1">费用总计:{{orderInfo.settleAmount +'元'}}</td>
         <td  class="col2" style="width: 100%;display: flex;justify-content: center;box-sizing: border-box">
-          <input   class="disable"  :readonly="true" v-model="form.supplierSettleAmount"/>
+          <input   class="supplierdisable"  :readonly="true" v-model="form.supplierSettleAmount"/>
           <button class="btnCom" @click="compute">计算</button>
         </td>
       </tr>
@@ -584,7 +584,17 @@ export default {
   overflow-y: auto;
 }
 .disable{
+  background-color: transparent;
+  border: none;
+  opacity: 1 !important;
+}
+.supplierdisable{
   color:  #999999;;
+  border: none;
+  opacity: 1 !important;
+}
+.bgDisable{
+  background: rgba(204, 204, 204, .3);
 }
 .navBar{
   margin-bottom: 46px;
@@ -641,7 +651,8 @@ img{
       @include fontWeightSize(bold,13px);
     }
     .flex-between{
-        @include flexColBet
+      width: 100%;
+        @include flexBetCen
     }
     .halfOpcity{
       opacity: .5;