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

src/views/externalAgreement/agreement/agreementDetails.vue

@@ -481,7 +481,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "交强险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '交强险');
       if (info) {
-        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n一级：${info.level1.toFixed(2)}% 五级：${info.level5.toFixed(2)}%`
+        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 留点：${info.keepPointRatio.toFixed(2)}%`
       }else {
         return '-'
       }
@@ -491,7 +491,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "商业险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '商业险');
       if (info) {
-        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n一级：${info.level1.toFixed(2)}% 五级：${info.level5.toFixed(2)}%`
+        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 留点：${info.keepPointRatio.toFixed(2)}%`
       }else {
         return '-'
       }
@@ -501,7 +501,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "驾意险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '驾意险');
       if (info) {
-        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n一级：${info.level1.toFixed(2)}% 五级：${info.level5.toFixed(2)}%`
+        return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 留点：${info.keepPointRatio.toFixed(2)}%`
       }else {
         return '-'
       }

src/views/externalAgreement/agreement/agreementIndex.vue

@@ -201,7 +201,8 @@ function findpage() {
   });
 }
 const columns = [
-  { prop: "agreementCode", label: "协议编号", width: '200', },
+  { prop: "agreementCode", label: "协议编号", width: '200', component: "RouterLink",
+  formatter: (row: any) => ({ name: 'AgreementDetails', query: { id: row.id} }) },
   {
     prop: "agreementTitle", label: "协议名称", width: '200',
   },

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -583,6 +583,8 @@ const columns = [
       let info = row.ptlAgreementCostTypeList.find((val: any) => val.costType == '交强险');
       if (info) {
         return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 手续费：${info.commission.toFixed(2)}%`
+      }else{
+        return '-'
       }
     }
   },
@@ -591,6 +593,8 @@ const columns = [
       let info = row.ptlAgreementCostTypeList.find((val: any) => val.costType == '商业险');
       if (info) {
         return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 手续费：${info.commission.toFixed(2)}%`
+      }else{
+        return '-'
       }
     }
   },
@@ -599,6 +603,8 @@ const columns = [
       let info = row.ptlAgreementCostTypeList.find((val: any) => val.costType == '驾意险');
       if (info) {
         return `入口：${info.inlet.toFixed(2)}% 出口：${info.export.toFixed(2)}%\n加投：${info.addThrow.toFixed(2)}% 手续费：${info.commission.toFixed(2)}%`
+      }else{
+        return '-'
       }
     }
   },