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

src/views/representative/quoteApproval.vue

@@ -10,7 +10,7 @@
     </el-tabs>
     <SearchForm :fields="visibleFields" :formInline="formInline" :onSearch="agreementQuery" :onReset="resetForm" :span="6" />
     <ComplexTable :tableData="companylist" :columns="columns" :showIndex="false" :columnwidth="200" :showSelect="true"
-      :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange" uniqueIdName="costId">
+      :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange" uniqueIdName="costId" highlight-current-row>
       <template #ruleDescription="{ data, bodyCell }">
         <div class="whitespace-normal">{{ data.ruleDescription }}</div>
       </template>
@@ -178,7 +178,7 @@ const fields = ref([
   {
     label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
     props: {
-      label: (item: any) => `${item.agreementCode}--${item.userAbbr}`,
+      label: (item: any) => `${item.agreementTitle}--${item.userAbbr}`,
       value: 'id'
     }, filterable: true
   },
@@ -303,7 +303,7 @@ const columns = [
   {
     prop: "agreementAbbreviation", label: "协议信息", width: '300', fixed: 'left',
     formatter: (row: any) => {
-      return `${row.agreementCode}\n${row.agreementAbbreviation}`
+      return `${row.agreementTitle}\n${row.userAbbr || ''}`
     }
   },
   { prop: "effectiveTime", label: "生效时间", width: '200' },
@@ -670,4 +670,12 @@ const handleClick = (pane: any) => {
     }
   }
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>