Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/additionalOrder/additional/index.vue

@@ -1666,7 +1666,7 @@
                     <div>{{ detailData?.costRatio?.jqExportRatio }}%</div>
                   </th>
                   <th>
-                    <div>￥{{ detailData?.feeOrdersVo?.jqPayablePremium }}</div>
+                    <div>￥{{ detailData?.feeOrdersVo?.jqExportPremium }}</div>
                   </th>
 
                   <th>
@@ -1709,7 +1709,7 @@
                     <div>{{ detailData?.costRatio?.syExportRatio }}%</div>
                   </th>
                   <th>
-                    <div>￥{{ detailData?.feeOrdersVo?.syPayablePremium }}</div>
+                    <div>￥{{ detailData?.feeOrdersVo?.syExportPremium }}</div>
                   </th>
 
                   <th>
@@ -1752,7 +1752,7 @@
                     <div>{{ detailData?.costRatio?.jyExportRatio }}%</div>
                   </th>
                   <th>
-                    <div>￥{{ detailData?.feeOrdersVo?.jyPayablePremium }}</div>
+                    <div>￥{{ detailData?.feeOrdersVo?.jyExportPremium }}</div>
                   </th>
 
                   <th>
@@ -1778,19 +1778,13 @@
                 </tr>
                 <tr>
                   <th colspan="2">
-                    <div>合计：￥{{ (Number(detailData?.feeOrdersVo?.jqPremium) + Number(detailData?.feeOrdersVo?.syPremium)
-                      +
-                      Number(detailData?.feeOrdersVo?.jyPremium)).toFixed(2) }}</div>
+                    <div>合计：￥{{ detailData?.feeOrdersVo?.totalPremium.toFixed(2) }}</div>
                   </th>
                   <th colspan="2">
-                    <div>小计： ￥{{ (Number(detailData?.feeOrdersVo?.jqReceivablePremium) +
-                      Number(detailData?.feeOrdersVo?.syReceivablePremium) +
-                      Number(detailData?.feeOrdersVo?.jyReceivablePremium)).toFixed(5) }}</div>
+                    <div>小计： ￥{{ detailData?.feeOrdersVo?.totalReceivablePremium.toFixed(5) }}</div>
                   </th>
                   <th colspan="2">
-                    <div>小计： ￥{{ (Number(detailData?.feeOrdersVo?.jqPayablePremium) +
-                      Number(detailData?.feeOrdersVo?.syPayablePremium) +
-                      Number(detailData?.feeOrdersVo?.jyPayablePremium)).toFixed(5) }}</div>
+                    <div>小计： ￥{{ detailData?.feeOrdersVo?.totalExportPremium.toFixed(5) }}</div>
                   </th>
                   <th colspan="2">
                     <div>小计： ￥{{ (Number(detailData?.feeOrdersVo?.jqCommissionPremium) +

src/views/externalAgreement/agreement/agreementDetails.vue

@@ -204,7 +204,6 @@ const DrawerSave = (list: any) => {
         message: res.msg,
         plain: true,
       })
-    } else {
     }
   });
 }

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -457,7 +457,6 @@ const DrawerSave = (list: any) => {
 }
 //协议授权机构获取
 const agreementAuth = (deptName: any) => {
-  console.log("🚀 ~ agreementAuth ~ deptName:", deptName)
   let name = typeof deptName === 'string' ? deptName : '';
   api.agreementApi.agreementdeptTree(id.value, name).then((res: any) => {
     if (res.code == 200) {