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

src/views/representative/externalCostApproval.vue

@@ -12,6 +12,9 @@
       <SearchForm :fields="fields" :formInline="formInline" :onSearch="agreementQuery" :onReset="resetForm" />
       <ComplexTable :tableData="tableData" :columns="columns" :showIndex="false" :columnwidth="200" :showSelect="true"
         :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange">
+         <template #agreementAbbreviation="{ data, bodyCell }">
+        <div class="whitespace-normal">{{ data.agreementAbbreviation }}-{{ data.contactPerson || '' }}</div>
+      </template>
         <template v-slot:table-title-btn>
           <el-dropdown placement="bottom-start">
             <el-button> 批量管理<el-icon>
@@ -147,7 +150,7 @@ const fields = ref([
   {
     label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
     props: {
-      label: (item: any) => `${item.agreementTitle}`,
+      label: (item: any) => `${item.agreementAbbreviation}`,
       value: 'id'
     }, filterable: true
   },
@@ -218,10 +221,8 @@ function findpage(status: any) {
 
 const columns = [
   {
-    prop: "agreementTitle", label: "协议信息", width: '350',
-    formatter: (row: any) => {
-      return `${row.agreementTitle}--${row.contactPerson || ''}`
-    }
+    prop: "agreementAbbreviation", label: "协议信息", width: '350',
+    component: 'customSlot',
   },
   { prop: "productName", label: "险种", width: '120', },
   {

src/views/representative/quoteApproval.vue

@@ -13,6 +13,9 @@
     <ComplexTable :tableData="companylist" :columns="columns" :showIndex="false" :columnwidth="200" :showSelect="true"
       :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange" uniqueIdName="costId"
       highlight-current-row>
+      <template #agreementAbbreviation="{ data, bodyCell }">
+        <div class="whitespace-normal">{{ data.agreementAbbreviation }}-{{ data.dockingPerson || '' }}</div>
+      </template>
       <template #ruleDescription="{ data, bodyCell }">
         <div class="whitespace-normal">{{ data.ruleDescription }}</div>
       </template>
@@ -183,7 +186,7 @@ const fields = ref([
   {
     label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
     props: {
-      label: (item: any) => `${item.agreementTitle}--${item.dockingPerson || ''}`,
+      label: (item: any) => `${item.agreementAbbreviation}--${item.dockingPerson || ''}`,
       value: 'id'
     }, filterable: true
   },
@@ -312,9 +315,7 @@ const getAgreement = () => {
 const columns = [
   {
     prop: "agreementAbbreviation", label: "协议信息", width: '250',
-    formatter: (row: any) => {
-      return `${row.agreementTitle}--${row.dockingPerson || ''}`
-    }
+    component: 'customSlot',
   },
   { prop: "effectiveTime", label: "生效时间", width: '200' },
   { prop: "failureTime", label: "失效时间", width: '200' },