瀏覽代碼

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

祁鹏飞 6 天之前
父節點
當前提交
075d3d40e9

+ 1 - 0
src/views/receivable/documentary/documentaryReport.vue

@@ -60,6 +60,7 @@
         <el-table height="500px" :data="recordData" row-key="id"
         <el-table height="500px" :data="recordData" row-key="id"
           :summary-method="val => getSummaries(val, ['totalSettlementAmount'])" show-summary>
           :summary-method="val => getSummaries(val, ['totalSettlementAmount'])" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
+          <el-table-column prop="partnerCompanySimplyName" label="支公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="跟单费金额"></el-table-column>
           <el-table-column prop="totalReceivable" label="跟单费金额"></el-table-column>
           <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
           <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
           <el-table-column prop="year" label="年"></el-table-column>
           <el-table-column prop="year" label="年"></el-table-column>

+ 2 - 2
src/views/representative/externalCostApproval.vue

@@ -217,8 +217,8 @@ function findpage(status: any) {
 }
 }
 
 
 const columns = [
 const columns = [
- {
-    prop: "agreementTitle", label: "协议信息", width: '350', fixed: 'left',
+  {
+    prop: "agreementTitle", label: "协议信息", width: '350',
     formatter: (row: any) => {
     formatter: (row: any) => {
       return `${row.agreementTitle}--${row.contactPerson || ''}`
       return `${row.agreementTitle}--${row.contactPerson || ''}`
     }
     }

+ 4 - 4
src/views/representative/quoteApproval.vue

@@ -306,7 +306,7 @@ const getAgreement = () => {
 }
 }
 const columns = [
 const columns = [
   {
   {
-    prop: "agreementAbbreviation", label: "协议信息", width: '300', fixed: 'left',
+    prop: "agreementAbbreviation", label: "协议信息", width: '250',
     formatter: (row: any) => {
     formatter: (row: any) => {
       return `${row.agreementTitle}--${row.dockingPerson || ''}`
       return `${row.agreementTitle}--${row.dockingPerson || ''}`
     }
     }
@@ -314,12 +314,12 @@ const columns = [
   { prop: "effectiveTime", label: "生效时间", width: '200' },
   { prop: "effectiveTime", label: "生效时间", width: '200' },
   { prop: "failureTime", label: "失效时间", width: '200' },
   { prop: "failureTime", label: "失效时间", width: '200' },
   {
   {
-    prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '800'
+    prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '600'
   },
   },
   { prop: "productName", label: "险种", width: '120', },
   { prop: "productName", label: "险种", width: '120', },
-  { prop: "costDescribe", label: "费用描述", width: '500', component: 'customSlot', },
+  { prop: "costDescribe", label: "费用描述", width: '400', component: 'customSlot', },
   {
   {
-    prop: "costRules", label: "费用规则", component: 'customSlot', width: '500',
+    prop: "costRules", label: "费用规则", component: 'customSlot', width: '700',
   },
   },
   { prop: "priorityLevel", label: "优先级", width: '120', },
   { prop: "priorityLevel", label: "优先级", width: '120', },
   {
   {