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

src/components/complexTable/index.vue

@@ -2,7 +2,9 @@
   <div class="containerTable">
     <div class="table_box">
       <div class="table-title-btn" v-if="$slots['table-title-btn']">
+        <div class="flex a-c ">
         <slot name="table-title-btn"></slot>
+        </div>
       </div>
       <!-- <OverlayScrollbarsComponent defer :options="{
         scrollbars: {

src/views/insurancePolicy/order/order.vue

@@ -146,8 +146,8 @@
             <el-button link type="primary" v-if="scope.row.orderStatus === '4'"
               @click="updateOrderStatus(scope.row.orderNo)">更新订单</el-button>
             <!-- 模拟接口，正式上线后，删除 -->
-            <el-button link type="primary" :loading="scope.row.loading" v-if="scope.row.orderStatus === '4'"
-              @click="mockUnderwited(scope.row)">模拟承保</el-button>
+            <!-- <el-button link type="primary" :loading="scope.row.loading" v-if="scope.row.orderStatus === '4'"
+              @click="mockUnderwited(scope.row)">模拟承保</el-button> -->
             <el-button link type="primary" v-if="scope.row.orderStatus === '3'"
               @click="updateOrderStatus(scope.row.orderNo)">同步订单</el-button>
             <el-button link type="primary" v-if="scope.row.orderStatus === '6'"

src/views/representative/quoteApproval.vue

@@ -8,9 +8,11 @@
       <el-tab-pane :label="`审核不通过（${reviewRejectedlength}）`" name="reviewRejected">
       </el-tab-pane>
     </el-tabs>
-    <SearchForm :fields="visibleFields" :formInline="formInline" :onSearch="agreementQuery" :onReset="resetForm" :span="6" />
+    <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" highlight-current-row>
+      :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange" uniqueIdName="costId"
+      highlight-current-row>
       <template #ruleDescription="{ data, bodyCell }">
         <div class="whitespace-normal">{{ data.ruleDescription }}</div>
       </template>
@@ -33,6 +35,9 @@
             </el-dropdown-menu>
           </template>
         </el-dropdown>
+        <span class="col-108 ">
+          已选: <span class="text-red">{{ sysUpAndDownList.length }}</span> 条
+        </span>
       </template>
       <template v-slot:operation="scope">
         <el-button v-if="scope.operationData.approved == '0'" type="primary" link
@@ -312,7 +317,7 @@ const columns = [
     prop: "ruleDescription", label: "承保规则", component: 'customSlot', width: '800'
   },
   { prop: "productName", label: "险种", width: '120', },
-  { prop: "costDescribe", label: "费用描述", width: '500',component: 'customSlot', },
+  { prop: "costDescribe", label: "费用描述", width: '500', component: 'customSlot', },
   {
     prop: "costRules", label: "费用规则", component: 'customSlot', width: '500',
   },
@@ -670,6 +675,7 @@ const handleClick = (pane: any) => {
     }
   }
 }
+
 /* 自定义表格点击高亮颜色 */
 :deep(.el-table__body tr.current-row > td) {
   background-color: #c1e8fa !important;