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

src/components/complexTable/index.vue

@@ -56,7 +56,7 @@
         <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop" :label="column.label"
           :sortable="column.sortable ? 'custom' : false" :width="column.width" :filters="column.filters"
           :filter-method="column.filters ? (value, row) => row[column.prop] === value : undefined"
-          :filtered-value="column.filteredValue ? column.filteredValue : undefined"
+          :filtered-value="column.filteredValue ? column.filteredValue : undefined" :fixed="column.fixed || false"
           :align="column.align ? column.align : 'center'" show-overflow-tooltip>
           <template #header>
             <slot name="search" :slotData="column"></slot>

src/views/representative/quoteApproval.vue

@@ -8,7 +8,7 @@
       <el-tab-pane :label="`审核不通过（${reviewRejectedlength}）`" name="reviewRejected">
       </el-tab-pane>
     </el-tabs>
-    <SearchForm :fields="visibleFields" :formInline="formInline" :onSearch="agreementQuery" :onReset="resetForm" />
+    <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">
       <template #ruleDescription="{ data, bodyCell }">
@@ -294,7 +294,7 @@ const getAgreement = () => {
 }
 const columns = [
   {
-    prop: "agreementAbbreviation", label: "协议信息", width: '300',
+    prop: "agreementAbbreviation", label: "协议信息", width: '300', fixed: 'left',
     formatter: (row: any) => {
       return `${row.agreementCode}\n${row.agreementAbbreviation}`
     }
@@ -302,7 +302,7 @@ const columns = [
   { prop: "effectiveTime", label: "生效时间", width: '200' },
   { prop: "failureTime", label: "失效时间", width: '200' },
   {
-    prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '500'
+    prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '800'
   },
   { prop: "productName", label: "险种", width: '120', },
   { prop: "costDescribe", label: "费用描述", width: '500', },
@@ -566,6 +566,7 @@ const resetForm = () => {
   formInline.validState = "";
   formInline.effectiveTime = [];
   formInline.failureTime = [];
+  formInline.companyId = '';//保险公司id
   if (activeName.value == 'pendingReview') {
     findpage("0");
   } else if (activeName.value == 'pass') {