去掉方案配置复选框、承保规则复制添加分页、修改承保规则详情只有一条数据默认展开、取消该处表格右侧冻结、修改补录订单车主、投保人以及被投保人信息同步问题

config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"', //凯森
@@ -17,14 +17,14 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
   //  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
-  BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
+  // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
   // BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
+  // BASE_URL: '"http://192.168.0.59:8080"', // 徐强
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
-  CONSOLE_KHGX_URL: '"http://192.168.0.103:8081/login"', //跳转客户服务平台地址
-  // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
+  // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"', //控制台正式服务器
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址
-  SOCKET_Url: '"ws://192.168.0.52:8080/"',
-  // SOCKET_Url: '"wss://sxzgkj.baoxianzhanggui.com/web-api/"',
+  // SOCKET_Url: '"ws://192.168.0.52:8080/"',
+  SOCKET_Url: '"wss://sxzgkj.baoxianzhanggui.com/web-api/"',
 
 
 })

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -18,7 +18,7 @@
       :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="">
+      button3Background="#F56C6C" @handleButton3="underwritingRulesDelete" button3Icon="" isNotFixed :isCopyExpandAll="isCopyExpandAll">
     </kt-common-table>
     <el-dialog :append-to-body="true" :title="underwritingRulesAddDialogTitle" :visible.sync="underwritingRulesAddVehicleFactorVisible"
       :close-on-click-modal="false" width="80%" top="6vh" @close="underwritingRulescloseDialog">
@@ -104,6 +104,15 @@
           <el-table-column prop="ruleDescription" label="规则描述" align="center" />
           <el-table-column prop="desc" label="规则因子描述" align="center" width="450" />
         </el-table>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="copyTableDataPagination.pageNum"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="copyTableDataPagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="copyTableDataPagination.total">
+        </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" style="background: #EAEDF1;color: #2D4D89;"
@@ -133,6 +142,7 @@ export default {
   },
   data() {
     return {
+      isCopyExpandAll: false,
       underwritingRulesHistoryOperatorTime: "",
       underwritingRulesHistoryRecordResult: [],
       underwritingRulesHistoryDetailsDialogVisible:false,
@@ -205,6 +215,12 @@ export default {
       copyTableDataList: [],
       selectionList: [],
       carClassList: [],
+      // 协议承保规则复制分页数据
+      copyTableDataPagination: {
+        pageSize: 10,
+        pageNum: 1,
+        total: 0
+      }
     }
   },
   // 生命周期函数
@@ -222,6 +238,17 @@ export default {
 
   // 方法函数
   methods: {
+    // 协议承保规则复制每页条数改变钩子函数
+    handleSizeChange(e) {
+      this.copyTableDataPagination.pageSize = e
+      this.copyTableDataPagination.pageNum = 1
+      this.copyAgreementIdChange()
+    },
+    // 协议承保规则复制页数改变钩子函数
+    handleCurrentChange(e) {
+      this.copyTableDataPagination.pageNum = e
+      this.copyAgreementIdChange()
+    },
     getDicType(type) {
       this.$api.insCompany.dicType(type).then((res) => {
         if (res.code == 200) {
@@ -276,9 +303,12 @@ export default {
     },
     copyAgreementIdChange() {
       this.$api.insCompany.rulesList({
-        agreementId: this.copyAgreementId
+        agreementId: this.copyAgreementId,
+        pageNum: this.copyTableDataPagination.pageNum,
+        pageSize: this.copyTableDataPagination.pageSize
       }).then((res) => {
         this.copyTableDataList = res.content || []
+        this.copyTableDataPagination.total = res.totalSize
       })
     },
     // 复制按钮
@@ -450,6 +480,9 @@ export default {
         .getUndwrtRulesQuery(this.pageRequest)
         .then((res) => {
           this.underwritingRulesResult = res;
+          if(this.underwritingRulesResult&&this.underwritingRulesResult.content.length == 1) {
+            this.isCopyExpandAll = true
+          }
         });
     },
     underwritingAddSubmit() {

src/views/Core/KtCommonTable.vue

@@ -25,6 +25,8 @@
       style="width: 100%"
       :row-class-name="tableRowClassName"
       @expand-change="handleExpandChange"
+      :expand-row-keys="expandRows"
+      row-key="id"
     >
 
       <el-table-column
@@ -32,7 +34,7 @@
         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>
+          <Product-Cost-Form ref="ProductRef" :form="dynamicFormArray" :operator="operatorlist" over-size="small" :underwritingRulesForm="underwritingRulesForm"></Product-Cost-Form>
         </div>
       </el-table-column>
 
@@ -292,7 +294,7 @@
       <el-table-column
         :label="$t('action.operation')"
         :width="operationWidth"
-        fixed="right"
+        :fixed="isNotFixed? false: 'right'"
         v-if="showOperation"
         header-align="center"
         align="center"
@@ -524,6 +526,11 @@ export default {
       type: Number,
       default: 200,
     },
+    // 是否需要固定列（指操作那一列）
+    isNotFixed: {
+      type: Boolean,
+      default: false
+    },
     showBatchSettled: {
       //显示批量结算
       type: Boolean,
@@ -806,6 +813,7 @@ export default {
         areanumberplateList: [],
         licenseAreaList: [],
       },
+      expandRows: []
     };
   },
   created() {
@@ -816,10 +824,9 @@ export default {
     tableList(val, old) {
       if(val.length> 0) {
         let obj = val[0]
-        console.log(11111, obj)
-        this.underwritingRulesHistoryDetails(obj)
+        this.underwritingRulesHistoryDetails(obj, val)
       }
-    }
+    },
   },
   methods: {
     // 点击展开行
@@ -872,13 +879,16 @@ export default {
       });
     },
     // 承保规则历史记录详情
-    underwritingRulesHistoryDetails(row) {
+    underwritingRulesHistoryDetails(row, value) {
       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') {
+          if(value&&value.length == 1) {
+            this.expandRows.push(value[0].id)
+          }
           let obj = Object.assign({}, res.data);
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
@@ -910,7 +920,6 @@ export default {
             rulesEndDate: obj.rulesEndDate,
             rulesAttrList: [],//规则属性
           };
-          that.underwritingRulesAddVehicleFactorVisible = true
         } else {
           that.$message({
             type: 'error',

src/views/Task/DaikeLetter.vue

@@ -120,8 +120,9 @@
               <el-input v-model="salespersonForm.identity" placeholder="身份证号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="4">
             <el-form-item>
+              <el-button size="small" @click="handelReset()">重置</el-button>
               <el-button type="primary" size="small" @click="toChooseName()">查询</el-button>
             </el-form-item>
           </el-col>

src/views/Task/daikeComponents/KtLetter1.vue

@@ -215,7 +215,7 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="发证日期" prop="issueDate" class="red-btn" @blur="getCompanyList">
               <el-date-picker v-dateFormat v-model="carInfo.issueDate" :picker-options="issueDateOptions" type="date"
-                placeholder="选择发证日期" value-format="yyyy-MM-dd" placement="bottom-start"></el-date-picker>
+                placeholder="选择发证日期" value-format="yyyy-MM-dd" placement="bottom-start" @change="dateChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="transferDateShow">
@@ -3599,7 +3599,7 @@
                 <div class="zhuxian" v-if="insureitem.grouping == 'additional'">附加险</div>
                 <div class="zhuxian" v-if="insureitem.grouping == 'service'">增值服务</div>
                 <span>
-                  <el-checkbox v-model="insureitem.checked" :disabled="insureitem.Required">
+                  <!--<el-checkbox v-model="insureitem.checked" :disabled="insureitem.Required">-->
                   <!-- <span :class="insureitem.grouping != 'additional' ? 'opacity1' : 'opacity0'">{{ insureitem.kindName }}</span> -->
                   <span class="opacity1">{{ insureitem.kindName }}</span>
                   <el-input v-show="insureitem.kindCode == 'D4' ||
@@ -5691,6 +5691,25 @@ export default {
       },
       deep: true,
     },
+    ownerInfo: {
+      handler(val) {
+        if(this.tbczcarShow) {
+          this.policyHolderInfo = {...val}
+        }
+        if(this.bbczcarShow) {
+          this.insuredPersonInfo = {...val}
+        }
+      },
+      deep: true
+    },
+    policyHolderInfo: {
+      handler(val) {
+        if(this.bbtbcarShow) {
+          this.insuredPersonInfo = {...val}
+        }
+      },
+      deep: true
+    }
   },
   props: {
     isdisabled: {
@@ -5813,6 +5832,9 @@ export default {
     },
   },
   methods: {
+    dateChange() {
+      console.log('日期', this.carInfo.issueDate)
+    },
     deleteJiaYi(reslistindex, drivingIndex) {
       this.totalCompanyList[reslistindex].programme.drivingList.splice(drivingIndex, 1)
       this.$forceUpdate()
@@ -5847,7 +5869,6 @@ export default {
         return;
       }
       this.policyHolderInfovalidate()
-      console.log(this.policyHolderInfo, 'policyHolderInfo')
       this.$refs["carInfo"].validate((valid) => {
         if (valid) {
           _this.$refs["ownerInfo"].validate(async (valid1) => {
@@ -5879,7 +5900,6 @@ export default {
               } else {
                 this.oldData = JSON.stringify(param)
               }
-              console.log('校验成功，获取列表')
               this.showLoading = true
               // this.$api.letter.getAllAgreement().then((res) => {
               this.$api.letter.ruleFilterCompany(param).then((res) => {
@@ -6001,9 +6021,7 @@ export default {
     },
     // 选择方案
     checkedPopover(reslistindex, index, item) {
-      console.log(reslistindex, index, item, 'reslistindex, index, item')
       if (index == 99) {
-        console.log(this.totalCompanyList[reslistindex].programme99,this.totalCompanyList[reslistindex].programme99.schemeId, 'this.totalCompanyList[reslistindex].programme99')
         if (this.totalCompanyList[reslistindex].programme99 && !this.totalCompanyList[reslistindex].programme99.schemeId) {
           return
         }
@@ -6032,7 +6050,6 @@ export default {
             this.totalCompanyList[reslistindex].programme.description = val.desc
           }
         })
-      console.log('当前选中方案', this.totalCompanyList[reslistindex].programme)
       this.$forceUpdate()
     },
     // 获取方案信息
@@ -6082,7 +6099,6 @@ export default {
     // 确认驾意
     handleAddYiWai() {
       let arr = []
-      console.log(this.checkList,"驾意险")
       this.checkList.forEach((val) => {
         if (this.totalCompanyList[this.typeDialogIndex].cnName == 'zijin') {
           if(val.tableData ) arr.push(...val.tableData)
@@ -6095,7 +6111,6 @@ export default {
       })
       this.totalCompanyList[this.typeDialogIndex].zxProgramme.drivingList = arr;
       this.totalCompanyList[this.typeDialogIndex].programme.drivingList = arr
-      console.log(arr, 'arr')
       this.handleCloseAddYiwai()
     },
     // 驾意输入框按钮
@@ -6169,7 +6184,6 @@ export default {
       }
     },
     handleChangeJiayi(listItem, listIndex) {
-      console.log(listItem, listIndex, this.jiayiDialogData, 'listItem, listIndex')
       if (this.checkList.length) {
         this.checkList.forEach((val) => {
           this.$api.letter.getDriving({
@@ -7714,8 +7728,6 @@ export default {
         companyId: this.totalCompanyList[index].id,
         quoteInfoVo: data
       }).then((res) => {
-        console.log('11111111.');
-      console.log(res);
         this.contributingLoading = false;
         if (res.data) {
           // res.data.forEach((val) => {
@@ -7829,12 +7841,10 @@ export default {
     //勾选保险公司
     initchange(e, code, name, index) {
       if (e) {
-        console.log(this.totalCompanyList[index], 'this.totalCompanyList[index]')
         this.totalCompanyList[index].checked = e;
         this.getCompanyProgramme(e, code, name, index)
         this.kindListFun();
         let ins = this.totalCompanyList[index].namesimple;
-        console.log(ins)
         this.totalCompanyList[index].underwritingDescription =
           this.totalCompanyList[index].agreement[0].underwritingDescription;
         if (this.$route.path != "/task/external/externalOrders")
@@ -8443,7 +8453,6 @@ export default {
           vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
         };
         this.$api.letter.generateOrder(param).then((res) => {
-          debugger
           if (res.code == "200") {
             //上传图片
             const mergedArray = [
@@ -8521,7 +8530,6 @@ export default {
         this.myQrCode.clear()
       }
       this.$nextTick(() => {
-        console.log('二维码', this.myQrCode)
         this.myQrCode = new QrCode(this.$refs.myQrcode, {
           // text 需要转二维码的内容 可以是文本也可以是一个链接 是链接会直接跳走
           text: this.vehicleInspectionUrl,
@@ -8594,9 +8602,7 @@ export default {
                       kindName: value.kindName
                     })
                   })
-                console.log(_this.totalCompanyList[index].kindList, '_this.totalCompanyList[index].kindList')
                 if (_this.jqchecked) {
-                  console.log('这里是什么啊？')
                   //交强
                   _this.jqstartDate = this.transformTime(_this.jqstartDate);
                   _this.jqendDate = this.transformTime(_this.jqendDate);
@@ -8610,7 +8616,6 @@ export default {
                   });
                 }
                 if (_this.sychecked) {
-                  console.log('这里又是什么呀？')
                   _this.systartDate = this.transformTime(_this.systartDate);
                   _this.syendDate = this.transformTime(_this.syendDate);
                   //商业
@@ -8706,6 +8711,7 @@ export default {
       });
     },
     quote1() {
+      console.log('最后的信息')
       let starttime = new Date(this.carInfo.registerDate);
       let endtime = new Date(this.carInfo.issueDate);
       if (endtime < starttime) {
@@ -8959,7 +8965,6 @@ export default {
     },
     //订单生成前数据处理事件
     OrderStageProcessing(index) {
-      console.log('订单生成前数据处理')
       if (this.tbczcarShow && this.imageList2.length > 0) {
         //投保人同车主
         this.imageList3 = JSON.parse(JSON.stringify(this.imageList2));
@@ -9069,7 +9074,9 @@ export default {
         vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
         productId: this.productId
       };
-      console.log('this.apiInterfaceName', this.apiInterfaceName)
+      console.log('车主信息', this.ownerInfo)
+      console.log('投保人信息', this.policyHolderInfo)
+      console.log('被投保人信息', this.insuredPersonInfo)
       this.$api.letter[this.apiInterfaceName](param).then((res) => {
         if (res.code == "200") {
           //上传图片
@@ -9096,7 +9103,6 @@ export default {
           this.orderno = res.data.orderno;
           if (index >= 0) {
             this.totalCompanyList[index].quoteCode = 1
-            console.log('方法是干啥的', this.totalCompanyList[index].cnName)
             this.ToolClickFun(this.totalCompanyList[index].cnName, index, this.totalCompanyList[index].id, this.totalCompanyList[index].namesimple);
           } else {
             this.totalCompanyList.map((ele, index) => {
@@ -10148,7 +10154,6 @@ export default {
 
     // 爬虫对接
     quoteInsurance(num, id, namesimple, apiType) {
-      console.log(apiType, 'apiType')
       let api = apiType == 2 ? "pythonquote" : "";
       if (namesimple ==  '诚泰财险') {
         api = "pythonquote"
@@ -11347,7 +11352,6 @@ export default {
                   this.apiType == 2
                     ? "pythonsubmitImage"
                     : "anshengsubmitImage";
-                console.log(hengbangapi, "hengbangapi");
                 await this.$api.letter[hengbangapi]({
                   subOrderNo: this.companyId,
                 }).then((res) => {
@@ -11356,7 +11360,6 @@ export default {
                     let hengbangapi1 = "";
                     hengbangapi1 =
                       this.apiType == 2 ? "pythonaudit" : "anshengaudit";
-                    console.log(hengbangapi1, "hengbangapi1");
                     _this.$api.letter[hengbangapi1]({
                       subOrderNo: this.companyId,
                     }).then((res) => {