qymljy vor 2 Jahren
Ursprung
Commit
a9ccb2dc28
1 geänderte Dateien mit 15 neuen und 6 gelöschten Zeilen
  1. 15 6
      src/SDrpManagement/agentOrder/modules/edit.vue

+ 15 - 6
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -9,10 +9,16 @@
     size="80%">
     <div slot="title">
       <div class="flex-align-center">
-        <p class="inline-16"><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
+        <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-        <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+<!--        <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>-->
+      </div>
+      <div class="flex-align-center">
+<!--        <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>-->
+        <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
+        <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
+        <p style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -93,13 +99,15 @@
             <p><small>抬头:&nbsp;</small><span class="inline-16"><b>{{defaultData.fin_info.enterprisename}}</b></span></p>
             <div class="flex-align-center">
               <p class="inline-16"><small>开票地址:&nbsp;</small>{{defaultData.fin_info.address?defaultData.fin_info.address:'--'}}</p>
-              <p><small>开户行:&nbsp;</small> {{defaultData.fin_info.bank}} &emsp;<small>开户账号:&nbsp;</small> {{defaultData.fin_info.bankcardno}}</p>
+
             </div>
+            <p><small>开户行:&nbsp;</small> {{defaultData.fin_info.bank}} &emsp;</p>
+              <p><small>开户账号:&nbsp;</small> {{defaultData.fin_info.bankcardno}}</p>
           </div>
         </div>
         <div style="flex:1;">
           <div class="mt-10">
-            <p class="normal-title inline-16">收货信息</p>
+            <p class="normal-title inline-16" >收货信息</p>
             <el-popover
               placement="bottom"
               title="选择地址"
@@ -139,8 +147,9 @@
             </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
-            <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
+            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span></p>
+              <p><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <p><small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small></p>
           </div>
         </div>