增加掌柜币判断

src/views/Core/components/detailsDialog.vue

@@ -89,54 +89,54 @@
             <span slot="title">投保信息</span>
             <div slot="boby">
               <div class="m-btn-10">保险公司：{{ orderInfo.inscompany }}</div>
-              <div class="  quotation-style">
+              <div :class="orderInfo.feeDisplay?'quotation-style':'quotation-style1'">
                 <b>险种</b>
                 <b>起保日期</b>
                 <b>终保日期</b>
                 <b>保费金额</b>
-
-                <b>优惠比例</b>
-                <b>优惠金额</b>
+                <b v-if="orderInfo.feeDisplay">优惠比例</b>
+                <b v-if="orderInfo.feeDisplay">{{orderInfo.feeView?'掌柜科技币':'优惠金额'}}</b>
                 <span>交强险</span>
                 <span>{{ orderInfo.jqstartdate ? orderInfo.jqstartdate : '-' }}</span>
                 <span>{{ orderInfo.jqenddate ? orderInfo.jqenddate : '-' }}</span>
                 <span>{{ orderInfo.jqpremium ? '￥' + orderInfo.jqpremium : '-' }}</span>
 
-                <span>{{ orderInfo.jqpremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.jqpremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
                   orderInfo.feeOrderNewVo.exportFee[0].totalProportion + '%' : '-' }}</span>
-                <span>{{ orderInfo.jqpremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
-                  ? '￥' + orderInfo.feeOrderNewVo.exportFee[0].totalAmount : '-' }}</span>
+
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.jqpremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
+                  ? (orderInfo.feeView ? '&nbsp;' : '￥') + orderInfo.feeOrderNewVo.exportFee[0].totalAmount : '-' }}</span>
                 <span>商业险</span>
                 <span>{{ orderInfo.systartdate ? orderInfo.systartdate : '-' }}</span>
                 <span>{{ orderInfo.syenddate ? orderInfo.syenddate : '-' }}</span>
                 <span>{{ orderInfo.sypremium ? '￥' + orderInfo.sypremium : '-' }}</span>
 
-                <span>{{ orderInfo.sypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.sypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
                   orderInfo.feeOrderNewVo.exportFee[1].totalProportion + '%' : '-' }}</span>
-                <span>{{ orderInfo.sypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
-                  ? '￥' + orderInfo.feeOrderNewVo.exportFee[1].totalAmount : '-' }}</span>
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.sypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
+                  ? (orderInfo.feeView ? '&nbsp;' : '￥') + orderInfo.feeOrderNewVo.exportFee[1].totalAmount : '-' }}</span>
                 <span>车船税</span>
                 <span>-</span>
                 <span>-</span>
                 <span>￥{{ orderInfo.taxamount }}</span>
 
-                <span>-</span>
-                <span>-</span>
+                <span v-if="orderInfo.feeDisplay">-</span>
+                <span v-if="orderInfo.feeDisplay">-</span>
                 <span>驾意险</span>
                 <span>-</span>
                 <span>-</span>
                 <span>{{ orderInfo.jypremium ? '￥' + orderInfo.jypremium : '-' }}</span>
 
-                <span>{{ orderInfo.jypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.jypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee ?
                   orderInfo.feeOrderNewVo.exportFee[2].totalProportion + '%' : '-' }}</span>
-                <span>{{ orderInfo.jypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
-                  ? '￥' + orderInfo.feeOrderNewVo.exportFee[2].totalAmount : '-' }}</span>
+                <span v-if="orderInfo.feeDisplay">{{ orderInfo.jypremium && orderInfo.feeOrderNewVo && orderInfo.feeOrderNewVo.exportFee
+                  ? (orderInfo.feeView ? '&nbsp;' : '￥') + orderInfo.feeOrderNewVo.exportFee[2].totalAmount : '-' }}</span>
                 <span>总计</span>
                 <span>-</span>
                 <span>-</span>
                 <span class="themeColor" style="font-weight: bold;">￥{{ orderInfo.sumpremium }}</span>
-                <span>-</span>
-                <span class="themeColor" style="font-weight: bold;">￥{{ orderInfo.sumFee ? orderInfo.sumFee : 0
+                <span v-if="orderInfo.feeDisplay">-</span>
+                <span v-if="orderInfo.feeDisplay" class="themeColor" style="font-weight: bold;">{{orderInfo.feeView ? '&nbsp;' : '￥'}}{{ orderInfo.sumFee ? orderInfo.sumFee : 0
                 }}</span>
               </div>
             </div>
@@ -1557,7 +1557,25 @@ export default {
     font-size: 14px;
   }
 }
+.quotation-style1 {
+  font-size: 0;
+
+  b {
+    background: #F7F7F9;
+    font-size: 14px;
+  }
 
+  b,
+  span {
+    display: inline-block;
+    box-sizing: border-box;
+    width: 25%;
+    text-align: center;
+    line-height: 40px;
+    border: 1px solid #EEF1F6;
+    font-size: 14px;
+  }
+}
 .premium-style {
   div {
     padding: 5px 0;

src/views/Letter/Wallet/AutoInsuranceDetails.vue

@@ -165,10 +165,11 @@ export default {
         { prop: "insuredName", label: "被保险人", minWidth: 160 },
         { prop: "jqapplyno", label: "交强保单号", minWidth: 160 },
         { prop: "syapplyno", label: "商业保单号", minWidth: 160 },
-        { prop: "amount", label: "交易金额", minWidth: 160 },
+        { prop: "amount", label: "交易金额", minWidth: 160, formatter: this.amountFormatter },
         { prop: "auditTime", label: "审核时间", minWidth: 160 },
         { prop: "auditstatus", label: "审核状态", minWidth: 160 ,formatter: this.validIndFormatter,},
       ],
+      feeView:null,
     }
   },
   // 生命周期函数
@@ -180,6 +181,14 @@ export default {
   },
   // 方法函数
   methods: {
+    amountFormatter(row, column){
+      let amount = row.amount;
+      if(this.feeView){
+        return amount;
+      }else{
+        return "￥"+amount;
+      }
+    },
     validIndFormatter(row, column) {
       let auditstatus = row.auditstatus;
       if (auditstatus == '已审核') {
@@ -294,6 +303,7 @@ export default {
         .findMyInsuranceByUserId({ ...this.pageRequest, ...this.queryForm })
         .then((res) => {
           this.autoInsuranceResult = res.data;
+          this.feeView=res.data.feeView;
         });
     },
     CompanyList() {

src/views/Letter/Wallet/ExpenditureDetails.vue

@@ -85,8 +85,8 @@
 
         <el-table-column prop="amount" label="交易金额" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.transactionType == '3'" style="color: #0052FF;">-{{ scope.row.amount }}</span>
-            <span v-else>+{{ scope.row.amount }}</span>
+            <span v-if="scope.row.transactionType == '3'" style="color: #0052FF;">- {{feeView?'':'￥'}}{{ scope.row.amount }}</span>
+            <span v-else>+ {{feeView?'':'￥'}}{{ scope.row.amount }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="auditingStatus" label="提现状态" align="center">
@@ -302,7 +302,8 @@ export default {
           value: '4',
           label: '六月内'
         },
-      ]
+      ],
+      feeView:null,
     }
   },
 
@@ -541,6 +542,7 @@ export default {
           this.formQuery.pageNum = res.data.pageNum;
           this.formQuery.pageSize = res.data.pageSize;
           this.formQuery.totalSize = res.data.totalSize;
+          this.feeView=res.data.feeView;
           loading.close();
         } else {
           loading.close();

src/views/Task/daikeComponents/KtLetter.vue

@@ -1113,7 +1113,7 @@
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.sumPermium }}
                   </span>
-                  <span style="font-size: 13px; color: #2d4d89" class="m-top-5">优惠：{{ reslistitem.result.sumExportFee
+                  <span style="font-size: 13px; color: #2d4d89" class="m-top-5">{{reslistitem.result.feeView?'总科技币：':'优惠：'}}{{ reslistitem.result.sumExportFee
                   }}</span>
                 </div>
               </el-col>
@@ -1122,7 +1122,7 @@
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.jqPremium }}
                   </span>
-                  <span v-if="reslistitem.result.jqPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">优惠：{{
+                  <span v-if="reslistitem.result.jqPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">{{reslistitem.result.feeView?'掌柜科技币：':'优惠：'}}{{
                     reslistitem.result.jqExportFee }}</span>
                 </div>
               </el-col>
@@ -1136,7 +1136,7 @@
                   <span style="color: #d42426; font-weight: bold">
                     ￥{{ reslistitem.result.syPremium }}
                   </span>
-                  <span v-if="reslistitem.result.syPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">优惠：{{
+                  <span v-if="reslistitem.result.syPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">{{reslistitem.result.feeView?'掌柜科技币：':'优惠：'}}{{
                     reslistitem.result.syExportFee }}</span>
                 </div>
               </el-col>
@@ -1149,7 +1149,7 @@
                       : "无"
                     }}
                   </span>
-                  <span v-if="reslistitem.result.jyPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">优惠：{{
+                  <span v-if="reslistitem.result.jyPremium" style="font-size: 13px; color: #2d4d89" class="m-top-5">{{reslistitem.result.feeView?'掌柜科技币：':'优惠：'}}{{
                     reslistitem.result.noExportFee }}</span>
                 </div>
               </el-col>