1、提现增加是否签约校验

2、【协议费用审核】- 列表UI调整，按钮样式
3、【协议费用审核】- 协议名称高亮可点击并展示“承保规则”列表弹窗
4、[协议录入]批量操作选中提示已选数量

src/components/Form/ProductCostForm.vue

@@ -754,6 +754,9 @@ export default {
     };
   },
   created() {
+    console.log('form表单数据', this.form)
+    console.log('underwritingRulesForm表单数据', this.form)
+    console.log('operator', this.form)
   },
   computed: {
     CarAttr() {

src/http/axios.js

@@ -21,7 +21,10 @@ export default function $axios(options) {
 		if((config.url.indexOf('/excel/v1/**')>=0) || (config.url.indexOf('excel/findOfflineExcel')>=0) ){
 			config.responseType='arraybuffer';
 		}
-        
+    // if(config.url.indexOf('/plt/agreement/updateFeeFile')>=0) {
+    //   config.headers['Content-type'] = 'multipart/form-data'
+    // }
+
         let token = Cookies.get('token')
         // 1. 请求开始的时候可以结合 vuex 开启全屏 loading 动画
         // console.log(store.state.loading)

src/http/moudules/letter.js

@@ -1440,3 +1440,21 @@ export const queryBySuborderDetails = (suborder) => {
      data
     })
    }
+
+// 验证签约状态
+export const signResult = (data) => {
+  return axios({
+    url: '/ttqf/queryPressing',
+    method: 'post',
+    data
+  })
+}
+
+// 获取第三方签约链接
+export const getSignSrc = (data) => {
+  return axios({
+    url: '/ttqf/signingAddress',
+    method: 'post',
+    data
+  })
+}

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -139,8 +139,8 @@
             @click="nonVehicleConfigButton1" />
         </div>
       </div>
-      <el-table :size="overSize" ref="table" :data="pageResult" height="580" border v-loading="loading"
-        @selection-change="agreementSelectionChange" @current-change="agreementCurrentChange" highlight-current-row stripe
+      <el-table :size="overSize" ref="multipleTable" :data="pageResult" height="580" border v-loading="loading"
+        @selection-change="agreementSelectionChange" @select="handleSelectChange" @current-change="agreementCurrentChange" highlight-current-row stripe
         :header-cell-style="{
           background: '#F2F7FC',
           fontWeight: '700',
@@ -247,10 +247,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" background @current-change="handleCurrentChange"
-        :current-page="pageNum" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper" :total="totalSize" style="float: right;margin-top: 5px; ">
-      </el-pagination>
+      <div class="paginationCustom">
+        <span class="selected">已选{{ selectedLength }}条 /</span>
+        <el-pagination @size-change="handleSizeChange" background @current-change="handleCurrentChange"
+                       :current-page="pageNum" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
+                       layout="total, sizes, prev, pager, next, jumper" :total="totalSize" style="float: right;margin-top: 5px; ">
+        </el-pagination>
+      </div>
     </el-main>
     <!-- 新增协议的对话框 -->
     <el-dialog :title="dialogTitle" v-dialogDrag :visible.sync="agreementdialogVisible" width="60%" top="6vh"
@@ -2440,6 +2443,10 @@ export default {
       custodianIdData: '',
       custodianIdTree: '',
       custodianList: [],
+      selectedLength: 0, // 已选择的条数
+      selectedLengthList: [], // 保存每页已选择的的数据的条数，用与selectedLength计算
+      hasSelectedList: [], // 保存每页已选择的数据，用与回显
+      hadSelectedList: [], // 保存每页已选择的数据，用与回显（因切换分页时已选中的数据会清零，所以要单独再保存一次）
     };
   },
   computed: {
@@ -2625,6 +2632,18 @@ export default {
       });
       this.agreementSelectionList = list;
     },
+    handleSelectChange(rows) {
+      if(rows.length>0) {
+        this.$set(this.hasSelectedList, this.pageNum-1, rows)
+        this.hadSelectedList = [...this.hasSelectedList]
+        if(this.hadSelectedList.length> 0) {
+          this.selectedLength = 0
+          this.hadSelectedList.forEach(item => {
+            this.selectedLength += item.length
+          })
+        }
+      }
+    },
     agreementCurrentChange(val) {
       this.agreementActiveInfo = val;
     },
@@ -3875,6 +3894,20 @@ export default {
           this.pageNum = res.data.pageNum;
           this.pageSize = res.data.pageSize;
           this.totalSize = res.data.totalSize;
+          this.$nextTick(() => {
+            if(this.hadSelectedList[this.pageNum-1]) {
+              this.hadSelectedList[this.pageNum-1].forEach(item => {
+                let row = this.pageResult.find(sub => item.id === sub.id)
+                this.$refs.multipleTable.toggleRowSelection(row)
+              })
+              if(this.hadSelectedList.length> 0) {
+                this.selectedLength = 0
+                this.hadSelectedList.forEach(item => {
+                  this.selectedLength += item.length
+                })
+              }
+            }
+          })
         } else {
           this.$message.error(res.msg);
         }
@@ -4312,9 +4345,9 @@ export default {
     border-color: #2D4D89 !important;
   }
 
-  .el-button:hover {
-    color: #fff;
-  }
+  //.el-button:hover {
+  //  color: #fff;
+  //}
 
   .queryForm .el-form-item {
     width: 100%;
@@ -4427,4 +4460,14 @@ export default {
   padding: 4px 20px;
   font-weight: 400;
 }
+.paginationCustom{
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  .selected{
+    font-size: 13px;
+    margin-top: 5px;
+    color: #606266;
+  }
+}
 </style>

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -13,9 +13,9 @@
           @click="underwritingRulesHistory">历史记录</el-button>
       </div>
     </div>
-    <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
+    <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true" :agreementUnderwritingRuleShow="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="underwritingRulesResult"
-      :columns="underwritingRulesColumns" @findPage="underwritingRulesFindPage" button2Name="编辑"  button2Type="text"  button3Type="text" :button2style="{ color: '#2D4D89' }"
+      :columns="underwritingRulesColumns" @findPage="underwritingRulesFindPage" button2Name="编辑"  button2Type="text"  button3Type="text" :button2style="{ color: '#2D4D89' }" :tableList="underwritingRulesResult.content"
       permsButton2="agreement:input:underwritingRules" permsButton3="agreement:input:underwritingRules"
       button2Background="#E6A23C" @handleButton2="underwritingRulesUpdate" button2Icon="" button3Name="删除"
       button3Background="#F56C6C" @handleButton3="underwritingRulesDelete" button3Icon="">
@@ -175,7 +175,7 @@ export default {
         { prop: "ruleDescription", label: "规则描述", minWidth: 160 },
         { prop: "desc", label: "规则因子描述", minWidth: 660 },
       ],
-      underwritingRulesResult: [], //承保规则集合
+      underwritingRulesResult: {}, //承保规则集合
       underwritingRulesHistoryCostFindForm: {},//规则历史记录检索数据
       insuranceCompanyId: "",
       underwritingRulesForm: {

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -260,6 +260,48 @@
       <Product-Cost-Form v-if="productCostFactorDialogVisible" :form="dynamicFormArray" :operator="operatorlist"
         :disabled="true" over-size="small" @cancelForm="cancel"></Product-Cost-Form>
     </el-dialog>
+    <!--    -->
+    <el-dialog
+      title="承保规则"
+      :visible.sync="agreementListShow"
+      width="50%">
+      <el-table
+        :data="underwritingRulesResult"
+        style="width: 100%">
+        <el-table-column
+          prop="validInd"
+          label="是否启用"
+          width="180">
+          <template slot-scope="scope">
+            <span class="disused" :class="{'used': scope.row.validInd == 1}">{{ scope.row.validInd == 1? '启用':'禁用' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="rulesStartDate"
+          label="规则起期"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="rulesEndDate"
+          label="规则止期"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="ruleDescription"
+          label="规则描述"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="desc"
+          label="规则因子描述"
+          width="180">
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="agreementListShow = false">关闭</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 <!-- 行为区域 -->
@@ -510,6 +552,8 @@ export default {
       batchSizeList: [],
       isBatch: false,
       allAgreementList: [],
+      agreementListShow: false,
+      underwritingRulesResult: [],
     };
   },
   // 生命周期函数
@@ -700,14 +744,13 @@ export default {
     agreementIdFormatter(row, column) {
       let allAgreementItem = this.allAgreementList.find((val) => val.id == row.agreementId)
       if(allAgreementItem) {
-        return allAgreementItem.agreementName;
+        return <a onClick={ this.handleAgreement.bind(null, row) } style={{color: '#409eff', cursor: 'pointer'}}>{ allAgreementItem.agreementName }</a>;
       }
     },
     downloadRender(row) {
       return <a onClick={ this.handleDownloadFile.bind(null, row) } style={{color: '#409eff', cursor: 'pointer'}}>{ row.feeFileName }</a>
     },
     handleDownloadFile(row) {
-      console.log('数据', row)
       let url = process.env.BASE_URL  + row.feeFileUrl.substring(1,row.feeFileUrl.length); // 3.创建一个临时的url指向blob对象
       let link = document.createElement("a");
       link.target = '_blank'
@@ -716,6 +759,19 @@ export default {
       document.body.appendChild(link)
       link.click();
       link.remove();
+    },
+    handleAgreement(row) {
+      let params = {
+        agreementId: row.agreementId,
+        pageNum: 1,
+        pageSize: 20
+      }
+      this.$api.insCompany
+        .getUndwrtRulesQuery(params)
+        .then((res) => {
+          this.underwritingRulesResult = res.content.filter(item => item.validInd == 1);
+          this.agreementListShow = true
+        });
     }
   },
   // 计算属性
@@ -745,6 +801,18 @@ export default {
   padding: 2px;
   font-size: 12px;
 }
+.disused{
+  background: #A6A6A6;
+  borderRadius: 4px;
+  padding: 4px 10px;
+  color: #fff;
+}
+.used{
+  background: linear-gradient( 180deg, #66CDBB 0%, #33A08D 100%);
+  borderRadius: 4px;
+  padding: 4px 10px;
+  color: #fff;
+}
 
 /deep/ {
   .el-button--warning {
@@ -767,5 +835,17 @@ export default {
   .el-link.el-link--default{
     color: #409eff;
   }
+
+  //.el-button--primary:hover {
+  //  color: #fff;
+  //  background-color: var(--themeColor);
+  //  border-color: var(--themeColor);
+  //}
+  //.el-button--danger:focus, .el-button--danger:hover{
+  //  background: #F56C6C;
+  //}
+  //.el-button:hover, .el-button:focus{
+  //  color: #ffffff;
+  //}
 }
 </style>

src/views/Core/KtCommonTable.vue

@@ -24,7 +24,18 @@
       }"
       style="width: 100%"
       :row-class-name="tableRowClassName"
+      @expand-change="handleExpandChange"
     >
+
+      <el-table-column
+        type="expand"
+        v-if="agreementUnderwritingRuleShow"
+      >
+        <div class="tab-panestyle">
+          <Product-Cost-Form ref="ProductRef" v-if="underwritingRulesAddVehicleFactorVisible" :form="dynamicFormArray" :operator="operatorlist" over-size="small" :underwritingRulesForm="underwritingRulesForm"></Product-Cost-Form>
+        </div>
+      </el-table-column>
+
       <el-table-column
         type="expand"
         v-if="showSysUserAccountCardList"
@@ -414,6 +425,7 @@
           </el-button>
         </template>
       </el-table-column>
+
     </el-table>
     <!--分页栏-->
     <!-- 底部分页 -->
@@ -488,12 +500,19 @@
 <script>
 import KtButton from "@/views/Core/KtButton";
 import BigNumber from "bignumber.js";
+import ProductCostForm from '@/components/Form/ProductCostForm.vue';//表单组件
 export default {
   name: "KtCommonTable",
   components: {
     KtButton,
+    ProductCostForm
   },
   props: {
+    // 承保规则expend内容
+    agreementUnderwritingRuleShow: {
+      type: Boolean,
+      default: false
+    },
     select: {
       type: Boolean,
       default: false,
@@ -687,6 +706,12 @@ export default {
       type: Boolean,
       default: true,
     },
+    tableList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     showSummaryFieldList: Array, //自定义合计列配置
     keyName: String, //主键字段名
     columns: Array, // 表格列配置
@@ -764,9 +789,136 @@ export default {
         pageSize: 20,
       },
       taskPool: false,
+
+      underwritingRulesAddVehicleFactorVisible: false,
+      operator: { "pageNum": 1, "pageSize": 10, "columnFilters": { "label": { "name": "label", "value": "agreement_operator" } } },
+      dynamicFormArray: [],
+      operatorlist: [],
+      underwritingRulesForm: {
+        //承保因子表单项
+        agreementId: "", //协议id
+        ruleDescription: "", //规则描述
+        rulesStartDate: "",//规则起期
+        rulesEndDate: "",//规则止期
+        validInd: "1", //是否有效
+        rulesAttrList: [],//规则属性
+        carClassList: [],
+        areanumberplateList: [],
+        licenseAreaList: [],
+      },
     };
   },
+  created() {
+    this.licenseQuery();
+    this.getDicType('trafficManagementVehicleType')   // 车辆列表
+  },
+  watch: {
+    tableList(val, old) {
+      if(val.length> 0) {
+        let obj = val[0]
+        console.log(11111, obj)
+        this.underwritingRulesHistoryDetails(obj)
+      }
+    }
+  },
   methods: {
+    // 点击展开行
+    handleExpandChange(row,rows) {
+      if(rows.length>0) {
+        this.underwritingRulesHistoryDetails(row)
+      }
+    },
+    getDicType(type) {
+      this.$api.insCompany.dicType(type).then((res) => {
+        if (res.code == 200) {
+          if (type == 'trafficManagementVehicleType') {
+            let data = [];
+            res.data.ddList.map(val => {
+              data.push({
+                code: val.dictValue,
+                name: val.dictTag,
+              })
+              return val;
+            })
+            this.carClassList = data;
+          } else {
+            this[type + "options"] = res.data.ddList;
+          }
+        }
+      });
+    },
+    licenseQuery() {
+      this.$api.insCompany.getAreaLicense("14").then((res) => {
+        let data = [];
+        res.data.map(val => {
+          data.push({
+            code: val.areaNumber,
+            name: val.license,
+          })
+          return val;
+        })
+        this.areanumberplateList = data;
+      });
+      this.$api.insCompany.getAreaLicense("0").then((res) => {
+        let data = [];
+        res.data.map(val => {
+          data.push({
+            code: val.areaNumber,
+            name: val.license,
+          })
+          return val;
+        })
+        this.licenseAreaList = data;
+      });
+    },
+    // 承保规则历史记录详情
+    underwritingRulesHistoryDetails(row) {
+      let that = this
+      that.$api.dict.findPage(that.operator).then(res => {
+        that.operatorlist = res.data.content;
+      })
+      that.$api.insCompany.getUndwrtRulesFactorQuery(row.id).then((res) => {
+        if (res.code == '200') {
+          let obj = Object.assign({}, res.data);
+          obj.costsAttrLinks.map(val => {
+            switch (val.attrType) {
+              case 'inputNumber':
+              case 'datetime':
+                if (!val.operator) {
+                  val.operator = '1';
+                }
+                break;
+            }
+            if (val.attrCode == 'LicenseNo') {
+              val.dictLabal = this.areanumberplateList;
+            }
+            if (val.attrCode == 'LicenseArea') {
+              val.dictLabal = this.licenseAreaList;
+            }
+            if (val.attrCode == 'CarClass') {
+              val.dictLabal = this.carClassList
+            }
+            return val;
+          })
+          that.dynamicFormArray = obj.costsAttrLinks;
+          that.underwritingRulesForm = {
+            id: obj.id,
+            agreementId: obj.agreementId, //协议id
+            ruleDescription: obj.ruleDescription, //规则描述
+            validInd: obj.validInd, //是否有效
+            rulesStartDate: obj.rulesStartDate,
+            rulesEndDate: obj.rulesEndDate,
+            rulesAttrList: [],//规则属性
+          };
+          that.underwritingRulesAddVehicleFactorVisible = true
+        } else {
+          that.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     tableRowClassName(row, rowIndex) {
       // if (!!row.fieldName24 && row.fieldName24.indexOf("未") >= 0) {
       //   return "warningRow";

src/views/Letter/Wallet/FundsWallet.vue

@@ -90,7 +90,7 @@ font-weight: 500;">{{ findMyAmountData.withdrawingAmount }}</span> </span>
         <span>￥ <span style="font-size: 36px;font-family: DIN, DIN;
 font-weight: 500;">{{ findMyAmountData.withdrawableAmount }}</span> </span>
       </div>
-      <el-button class="withdrawal-style" type="primary" @click="instantWithdrawal">提现</el-button>
+      <el-button class="withdrawal-style" type="primary" :loading="withdrawLoading" @click="instantWithdrawal">提现</el-button>
     </div>
     <div class="header flex  a-c">
       <div class="flex a-c advance-payment" @click="toBillDetails('autoInsuranceDetails')">
@@ -247,6 +247,7 @@ export default {
       is_out: false,
       is_post: false,
       findMyAmountData: {},
+      withdrawLoading: false  //提现按钮loading
     }
   },
   watch: {
@@ -341,35 +342,67 @@ export default {
       });
     },
     instantWithdrawal() {
-      this.extract = null
-      this.$api.letter.getUserBankList({
-        auditStatus: '1',
-        delFlag: '0'
-      }).then((res) => {
-        if (res.code == '200' && res.data.length) {
-          this.bankList.map(val => {
-            res.data.map(ele => {
-              if (val.bankName == ele.bankAccount) {
-                ele.logo = val.logo;
-                return ele;
+      let userInfo = JSON.parse(localStorage.getItem("user_data"))
+      let that = this
+      that.withdrawLoading = true
+      if(userInfo) {
+        that.$api.letter.signResult({
+          userId: userInfo.id
+        }).then(res => {
+          that.withdrawLoading = false
+          if(res.data.bizCode === '2') {
+            if(res.data.url) {
+              that.$message({
+                type: 'warning',
+                message: res.data.msg,
+              });
+              window.open(res.data.url)
+            }
+          } else if(res.data.bizCode === '1') {
+            that.$api.letter.getSignSrc({
+              userId: userInfo.id
+            }).then(res => {
+              if(res.data.url) {
+                that.$message({
+                  type: 'warning',
+                  message: res.data.msg,
+                });
+                window.open(res.data.url)
               }
             })
-          })
-          this.cardPackList = res.data;
-          let bankinfo = res.data.find(val => val.isDefault == 1)
-          if (bankinfo) {
-            this.bankCardInfo = bankinfo;
-          } else {
-            this.bankCardInfo = res.data[0]
+          } else if(res.data.bizCode === '3' || res.data.bizCode === '0') {
+            that.extract = null
+            that.$api.letter.getUserBankList({
+              auditStatus: '1',
+              delFlag: '0'
+            }).then((res) => {
+              if (res.code == '200' && res.data.length) {
+                this.bankList.map(val => {
+                  res.data.map(ele => {
+                    if (val.bankName == ele.bankAccount) {
+                      ele.logo = val.logo;
+                      return ele;
+                    }
+                  })
+                })
+                this.cardPackList = res.data;
+                let bankinfo = res.data.find(val => val.isDefault == 1)
+                if (bankinfo) {
+                  this.bankCardInfo = bankinfo;
+                } else {
+                  this.bankCardInfo = res.data[0]
+                }
+                this.withdrawalVisible = true;
+              } else {
+                that.$message({
+                  type: 'error',
+                  message: "暂无审核通过的银行卡，不可提现",
+                });
+              }
+            });
           }
-          this.withdrawalVisible = true;
-        } else {
-          this.$message({
-            type: 'error',
-            message: "暂无审核通过的银行卡，不可提现",
-          });
-        }
-      });
+        })
+      }
     },
     toBillDetails(type) {
       this.$router.push({

src/views/OrderMsg/ReadPdf.vue

@@ -69,7 +69,7 @@
         });
       },
       logoFormatter(row) {
-        return <img src={row.logo} alt="logo" style={{ width: "50px", height: "50px" }} />;
+        return <img  src={row.logo} alt="logo" style={{ width: "50px", height: "50px" }} />;
       },
     }
   }
@@ -81,32 +81,32 @@
       font-weight: bold;
       border-bottom: 1px solid #D7DBE7;
     }
-  
+
     .el-dialog__body {
       padding: 0;
     }
-  
+
     .el-tabs__item.is-active {
       color: #fff;
       background: #2D4D89;
     }
-  
+
     .el-tabs--card>.el-tabs__header .el-tabs__nav,
     .el-tabs--card>.el-tabs__header,
     .el-tabs--card>.el-tabs__header .el-tabs__item {
       border: none;
       margin: 0;
     }
-  
+
     .el-tabs--card>.el-tabs__header .el-tabs__nav {
       padding-left: 20px;
     }
-  
+
     .el-dialog__footer {
       padding: 10px 20px 10px 10px;
     }
   }
-  
+
   .tab-panecent {
     background: #fff;
     border-radius: 4px;
@@ -115,11 +115,10 @@
     max-height: 600px;
     overflow-y: auto;
   }
-  
+
   .tab-panestyle {
     padding: 20px;
     background: #F2F2F2;
   }
   </style>
-  
-  
+

src/views/Task/daikeComponents/KtLetter1.vue

@@ -5927,27 +5927,27 @@ export default {
                 ];
                 if (res.data) {
                   res.data = res.data.filter(obj => {
-                  obj.agreement = obj.agreement.filter(agreementObj => {
-                    // 险种配置为空，则过滤掉该协议
-                    if (agreementObj.productsCodes == null) {
-                      return true;
-                    } else {
-                      // 检查是否包含 A 的特殊处理
-                      if (combinedArray.includes('A') && !agreementObj.productsCodes.includes(
-                          'A')) {
-                        return false;
+                    obj.agreement = obj.agreement.filter(agreementObj => {
+                      // 险种配置为空，则过滤掉该协议
+                      if (agreementObj.productsCodes == null) {
+                        return true;
+                      } else {
+                        // 检查是否包含 A 的特殊处理
+                        if (combinedArray.includes('A') && !agreementObj.productsCodes.includes(
+                            'A')) {
+                          return false;
+                        }
+                        return agreementObj.productsCodes.some(item => combinedArray.includes(
+                          item));
                       }
-                      return agreementObj.productsCodes.some(item => combinedArray.includes(
-                        item));
+                    });
+                    return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
+                  });
+                  res.data.forEach((e) => {
+                    if (e.agreement) {
+                      e.agreement.forEach((el) => (el.disabled = false));
                     }
                   });
-                  return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
-                });
-                res.data.forEach((e) => {
-                  if (e.agreement) {
-                    e.agreement.forEach((el) => (el.disabled = false));
-                  }
-                });
                 }
                 this.totalCompanyList = res.data;
                 this.showLoading = false
@@ -10879,7 +10879,7 @@ export default {
                   }
                 });
                 break;
-              
+
               case "华泰财险":
                 let HtApiImage = "";
                 HtApiImage =