Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/components/Form/retrievalForm.vue

@@ -43,8 +43,9 @@
           </template>
           <template v-else-if="field.type === 'date'">
             <el-date-picker
-              type="daterange"
-              value-format="yyyy-MM-dd"
+              :type="field.list == 'payList' ? 'datetimerange' : 'daterange'"
+              :format="field.list == 'payList' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
+              :value-format="field.list == 'payList' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"

src/http/moudules/insCompany.js

@@ -593,14 +593,31 @@ export const deleteDrivingInsurance = (data) => {
     data
   })
 }
-//批量修改
-export const endDateBatch = (data) => {
+//批量修改  弃用
+export const endDateBatch = (data) => { 
   return axios({
     url: '/plt/new/agreement/costs/endDateBatch',
     method: "post",
     data
   })
 }
+//批量修改 新接口
+export const bulkOperation = (data) => {
+  return axios({
+    url: '/plt/new/agreement/costs/costsBatch',
+    method: "post",
+    data
+  })
+}
+
+// 批量修改起止时间
+export const costsDateBatch = (data) => {
+  return axios({
+    url: '/plt/new/agreement/costs/costsDateBatch',
+    method: "post",
+    data
+  })
+}
 //批量删除
 export const deleteBatch = (data) => {
   return axios({

src/http/moudules/sys.js

@@ -409,3 +409,12 @@ export const sysChannelCost = (data) => {
         data
     })
 }
+
+//财务管理-加投结算-加投汇总
+export const queryStaticPage = (data) => {
+    return axios({
+        url: '/sysChannelCost/queryStaticPage',
+        method: 'post',
+        data
+    })
+}

src/http/moudules/task.js

@@ -1851,3 +1851,18 @@ export const addTypeImportExcel = (data) => {
 }
 
 
+// 全选
+export const addOrUpdateAll = (data) => {
+  return axios({
+    url: '/sysUserLinkPtlAgreement/addOrUpdateAll/'+data,
+    method: 'post'
+  })
+}
+
+//任务管理查询报价的保司机构
+export const queryPartnerCompaniesList = (status) => {
+  return axios({
+    url: "/fnc/importAsync/queryPartnerCompaniesList?status="+status,
+    method: "get",
+  })
+}

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -99,7 +99,13 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="对接人">
+              <el-input :size="overSize" clearable v-model.trim="queryForm.dockingPerson" placeholder="请输入对接人"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div style="font-weight: bold;font-size: 15px;color: #242833;" class="p-1 flex j-s a-c">
@@ -153,6 +159,13 @@
         <el-table-column prop="endDate" label="协议失效日期" align="center"></el-table-column>
         <el-table-column prop="matchType" label="匹配日期类型" align="center" :formatter="matchtypeFormatter"></el-table-column>
         <el-table-column prop="moneyTime" label="结算周期" align="center" :formatter="moneytimeFormatter"></el-table-column>
+        <el-table-column prop="validStatus" label="是否启用" align="center">
+          <template slot-scope="scope">
+            <span
+              :style="{ background: scope.row.validStatus == '1' ? 'linear-gradient( 180deg, #66CDBB 0%, #33A08D 100%)' : '#A6A6A6', borderRadius: '4px', padding: '4px 10px', color: '#fff' }">{{
+                scope.row.validStatus == 1 ? "启用" : "禁用" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="validStatus" label="审核方式" align="center" width="100">
           <template slot-scope="scope">
             <span
@@ -175,20 +188,13 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="updateTime" label="修改时间" align="center" :formatter="updatetimeFormatter"></el-table-column>
-        <el-table-column prop="validStatus" label="是否启用" align="center">
-          <template slot-scope="scope">
-            <span
-              :style="{ background: scope.row.validStatus == '1' ? 'linear-gradient( 180deg, #66CDBB 0%, #33A08D 100%)' : '#A6A6A6', borderRadius: '4px', padding: '4px 10px', color: '#fff' }">{{
-                scope.row.validStatus == 1 ? "启用" : "禁用" }}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="modifiedName" label="修改人" align="center" width="130"></el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <kt-button label="复制协议" :size="overSize" type="text" perms="agreement:input:update"
-              @click="agreementCopy(scope.$index, scope.row)" style="color: #2D4D89 !important " />
             <kt-button label="编辑" :size="overSize" type="text" perms="agreement:input:update"
               @click="uplatequery(scope.$index, scope.row)" style="color: #2D4D89 !important " />
+            <kt-button label="复制协议" :size="overSize" type="text" perms="agreement:input:update"
+              @click="agreementCopy(scope.$index, scope.row)" style="color: #2D4D89 !important " />
             <kt-button label="删除" :size="overSize" type="text" perms="agreement:input:delete"
               @click="deletequery(scope.$index, scope.row)" style="color: #D42426 !important " />
               <kt-button label="协议轨迹" :size="overSize" type="text" perms="agreement:input:update"

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -81,8 +81,9 @@
       :data="productPageResult" :columns="productColumns" @findPage="productCostFindPage" button2Name="编辑"
       button2Type="text" button3Type="text" button5Type="text" :button2style="{ color: '#2D4D89' }"
       :button3style="{ color: '#D42426' }" :button5style="{ color: '#2D4D89' }" permsButton2="agreement:input:productCost"
-      @handleButton2="productUpdate" deleteName="批量修改" @handleDelete="batchUpdate" @customTool="batchDelete"
-      customToolName="批量删除" button3Name="删除" permsButton3="agreement:input:productCost" @handleButton3="productDelete"
+      @handleButton2="productUpdate" deleteName="批量修改费用" @handleDelete="batchUpdate" @customTool="batchDelete"
+      @customTool1="customTool1" customToolName1="批量修改起止时间"
+      customToolName="批量删除" button3Name="删除"  permsButton3="agreement:input:productCost" @handleButton3="productDelete"
       button5Name="轨迹" @handleButton5="trajectory" button3Icon="">
     </kt-common-table>
     <el-dialog :title="productCostAddDialogTitle" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
@@ -384,19 +385,157 @@
       </div>
 
     </el-dialog>
-    <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
+    <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="50%">
       <div class="tab-panestyle">
-        <el-form :inline="true" :model="batchUpdateForm" class="demo-form-inline  tab-panecent" style="padding: 20px;">
-          <el-form-item label="费用起期：">
-            <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="datetime"
-              placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="费用止期：">
-            <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsEndDate" type="datetime"
-              placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
-            </el-date-picker>
-          </el-form-item>
+        <el-form :inline="true" :model="batchUpdateForm" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
+          <!-- <el-row>
+            <el-col :span="8">
+              <el-form-item label="费用起期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm.costsStartDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="费用止期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm.costsEndDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <el-row>
+            <div class="title">交强险费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="jqCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.jqCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例一级" prop="jqExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例二级" prop="jqExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例三级" prop="jqExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例四级" prop="jqExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例五级" prop="jqExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="title">商业险费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="syCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.syCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例一级	" prop="syExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例二级	" prop="syExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例三级	" prop="syExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例四级	" prop="syExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例五级	" prop="syExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="title">非车费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="noCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.noCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例一级	" prop="noCarExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例二级	" prop="noCarExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例三级	" prop="noCarExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例四级	" prop="noCarExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例五级	" prop="noCarExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -456,6 +595,35 @@
           over-size="small" @cancelForm="productHistoryDetailsDialogVisible = false" :disabled="true"></Product-Cost-Form>
       </div>
     </el-dialog>
+
+    
+    <el-dialog title="批量修改起止时间" :visible.sync="showUpdate1" width="30%" top="6vh">
+      <div class="tab-panestyle">
+        <el-form :inline="true" :model="batchUpdateForm1" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="费用起期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm1.costsStartDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="费用止期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm1.costsEndDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="showUpdate1 = false">取 消</el-button>
+        <el-button size="small" style="background: #2D4D89;color: #fff;border-color: #2D4D89;" type="primary"
+          @click="batchCostsubmit1">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -1047,6 +1215,8 @@ export default {
         productName: "",
       },
       permissions: null,
+      showUpdate1: false,
+      batchUpdateForm1: {},
     }
   },
   // 生命周期函数
@@ -1268,8 +1438,27 @@ export default {
         }
       }
     },
+    // 批量修改起止时间
+    batchCostsubmit1() {
+      this.$api.insCompany.costsDateBatch(this.batchUpdateForm1).then((res) => {
+        if (res.code == '200') {
+          this.showUpdate1 = false;
+          this.productCostFindPage();
+          this.$message({
+            type: 'success',
+            message: res.msg,
+          });
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     batchCostsubmit() {
-      this.$api.insCompany.endDateBatch(this.batchUpdateForm).then((res) => {
+      console.log(this.batchUpdateForm);
+      this.$api.insCompany.bulkOperation(this.batchUpdateForm).then((res) => {
         if (res.code == '200') {
           this.batchdialogVisible = false;
           this.productCostFindPage();
@@ -1386,7 +1575,6 @@ export default {
       this.productcopyItemPageRequest.agreementId = "";
       this.productcopyItemPageRequest.productCode = [];
       this.productcopyItemResult = [];
-
     },
     //产品删除
     productDelete({ row, column }) {
@@ -1469,9 +1657,19 @@ export default {
         }
       }
     },
+    // 批量修改起止时间
+    customTool1(data) {
+      this.batchUpdateForm1 = {
+        ids: data
+      }
+      // costsDateBatch
+      this.showUpdate1 = true
+    },
     //产品批量编辑
     batchUpdate(data) {
-      this.batchUpdateForm.ids = data;
+      this.batchUpdateForm = {
+        ids: data, 
+      };
       this.batchdialogVisible = true;
     },
     //产品编辑
@@ -1952,5 +2150,40 @@ export default {
   background: #f2f7fc;
   border-color: #fff;
 }
+// 批量操作弹窗样式
+#bulkOperation{
+  .title{
+    color: #333;
+    font-size: 16px;
+    font-weight: 500;
+    padding-bottom: 20px;
+  }
+  .el-form-item{
+    margin-bottom: 20px;
+    >>>.el-form-item__content{
+      width: 100%;
+      line-height: normal;
+      .el-date-editor.el-input, .el-date-editor.el-input__inner{
+        width: 100%;
+      }
+    }
+    >>>.el-form-item__label{
+      height: 22px;
+      line-height: 22px;
+      margin-bottom: 10px;
+    }
+    >>>.el-input-number{
+      width: 100%;
+      .el-input__inner{
+        color: #333;
+        text-align: left;
+        &:focus{
+          color: #333;
+        }
+      }
+    }
+  }
+}
+
 </style>
 

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -160,6 +160,7 @@ export default {
       },
       areanumberplateList: [],
       dynamicFormArray: [],
+      licenseAreaList: [],
     }
   },
   // 生命周期函数
@@ -192,6 +193,9 @@ export default {
             if (val.attrCode == 'LicenseNo') {
               val.dictLabal = this.areanumberplateList;
             }
+            if (val.attrCode == 'LicenseArea') {
+              val.dictLabal = this.licenseAreaList;
+            }
             return val;
           })
           this.$nextTick(() => {
@@ -240,6 +244,9 @@ export default {
             if (val.attrCode == 'LicenseNo') {
               val.dictLabal = this.areanumberplateList;
             }
+            if (val.attrCode == 'LicenseArea') {
+              val.dictLabal = this.licenseAreaList;
+            }
             return val;
           })
           this.$nextTick(() => {
@@ -418,6 +425,17 @@ export default {
         })
         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;
+      });
     },
     //-- formatter begin--
     operatorTypeFormatter(row, column) {

src/views/AgreementManage/CarInsurance/BacklineAllocation.vue

@@ -200,6 +200,9 @@
           >
           </el-option>
         </el-select>
+        <el-button size="small" type="primary" @click="selectAll"
+          >全 选</el-button
+        >
       </div>
       <el-table
         @selection-change="handleSelectionChange"
@@ -338,6 +341,35 @@ export default {
   },
   watch: {},
   methods: {
+    //全选
+    selectAll() {
+      let userId = this.userId
+      this.$confirm("确定选择全部？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.task.addOrUpdateAll(this.userId).then((res) => {
+           if(res.code==200){
+            this.productDialogVisible = false
+             this.$message({
+              type: "success",
+              message: "操作成功",
+            });
+           }
+           else{
+            this.$message.error(res.msg);
+           }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消全选",
+          });
+        });
+    },
     handleDelete(val) {
       this.handleTableDelete(val);
     },
@@ -487,7 +519,6 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      console.log(this.pageRequest);
       let insuranceCompany = Array.isArray(this.pageRequest.insuranceCompany)
         ? this.pageRequest.insuranceCompany[0]
         : "";

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="协议选择">
-        <el-select size="small" clearable filterable v-model="productpageRequest.agreementId" :placeholder="'请输入'">
+        <el-select size="small" multiple clearable collapse-tags filterable v-model="productpageRequest.agreementIdList" :placeholder="'请输入'">
           <el-option v-for="(s, i) in agreementList" :key="i" :label="s.agreementName" :value="s.id"></el-option>
         </el-select>
       </el-form-item>
@@ -278,7 +278,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         companyId: "",
-        agreementId: "",
+        agreementIdList: [],
         costsDescription: [],
         productCode: [],
       },

src/views/AgreementManage/ChannelCost.vue

@@ -1531,13 +1531,5 @@ export default {
   width: 100%;
   text-align: right;
 }
-// ::v-deep {
-//   .el-tree-node {
-//     .el-checkbox__input.is-disabled {
-//       display: none;
-//     }
-//   }
-// }
-
 </style>
   

src/views/Core/KtCommonTable.vue

@@ -439,6 +439,17 @@
         style="float: left"
         v-if="showBatchDelete & showOperation"
       />
+
+      <kt-button
+        :label="customToolName1"
+        :perms="permscustomTool"
+        :size="size"
+        type="danger"
+        @click="customToolMethod1()"
+        :disabled="selections.length === 0"
+        style="float: left"
+        v-if="customToolseletted"
+      />
       <kt-button
         :label="settledName"
         :perms="permsSettled"
@@ -506,6 +517,9 @@ export default {
     customToolName: {
       type: String,
     },
+    customToolName1: {
+      type: String,
+    },
     permscustomTool: {
       type: String,
     },
@@ -1022,6 +1036,14 @@ export default {
       this.selections.map((item) => idlist.push(item.id));
       this.$emit("customTool", idlist);
     },
+    
+    //自定义批量操作按钮1
+    customToolMethod1() {
+      let idlist = [];
+      this.selections.map((item) => idlist.push(item.id));
+      this.$emit("customTool1", idlist);
+    },
+
     // 删除操作
     delete: function (ids) {
       var _keyName = "id";

src/views/FinancialManagement/AddIanvestment/Addedsummary.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <templateTable
+      :formList="formList"
+      :searchData.sync="searchData"
+      :tableConfig="tableConfig"
+      :data="tableData"
+      @getList="getList"
+      :btnGroup="btnGroup"
+      @handleSearchList="handleSearchList"
+      :pagination="page"
+    >
+    </templateTable>
+  </div>
+</template>
+
+<script>
+import templateTable from "@/components/TemplateTable/index.vue";
+export default {
+  components: { templateTable },
+  data() {
+    return {
+      formList: [
+        {
+          label: "渠道名称",
+          prop: "userName",
+          type: "input",
+        },
+      ],
+      searchData: {},
+      tableConfig: {
+        columns: [
+          {
+            prop: "userName",
+            label: "渠道名称",
+            type: "text",
+          },
+          {
+            prop: "totalPrice",
+            label: "总金额",
+            type: "text",
+          },
+          {
+            prop: "settledAmount",
+            label: "已结算金额",
+            type: "text",
+          },
+          {
+            prop: "unsettledAmount",
+            label: "未结算金额",
+            type: "text",
+          },
+        ],
+        loading: true,
+        isPaginationShow: true,
+        operationWidth: 300,
+        isCheckBox: true,
+      },
+      tableData: [],
+      btnGroup: [],
+      page: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //列表数据
+    getList(data) {
+      this.tableConfig.loading = true;
+      this.$api.sys.queryStaticPage({...data, ...this.page }).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.content;
+          this.page.pageNum = res.data.pageNum;
+          this.page.pageSize = res.data.pageSize;
+          this.page.totalSize = res.data.totalSize;
+          this.tableConfig.loading = false;
+        } else {
+          this.tableData = [];
+          this.$message.error(res.msg);
+          this.page.totalSize = 0;
+          this.tableConfig.loading = false;
+        }
+      });
+    },
+    handleSearchList(data) {
+      this.getList(data);
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/FinancialManagement/AddInvestment.vue → src/views/FinancialManagement/AddIanvestment/Stmentindex.vue

@@ -71,7 +71,7 @@
         ref="uploadBulk"
         v-if="isBulk"
       >
-        <img v-if="bulkImage" :src="bulkImage" class="avatar" />
+        <img v-if="!bulkImage == ''" :src="bulkImage" class="avatar" />
         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         <div slot="tip" class="el-upload__tip">请上传凭证</div>
       </el-upload>
@@ -612,14 +612,19 @@ export default {
     },
     //批量导入结算
     bulkExport() {
+      this.bulkImage = '';
+      this.bulkiamgeFile = ''
       this.isBulk = true;
     },
     //批量导入结算上传
     drivinguploadExcel(file, fileList) {
+      console.log(this.bulkiamgeFile);
+      
       if (this.bulkiamgeFile == "") {
         this.$message.error("请先上传凭证");
         return;
       } else {
+        
         //   this.progressPercent = 0;
         const params = new FormData(); // 声明formData数据类型
 

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -411,9 +411,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -468,6 +470,19 @@ export default {
   },
   data() {
     return {
+      formListbatch: [
+        {
+          label: "上传时间",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
+      ],
       process: process.env.BASE_URL,
       dockingPersonOption: [],
       rulesAdd: {
@@ -1016,7 +1031,7 @@ export default {
     this.areaqueryList(1, 99, "provinceId");
     this.companyqueryList(0, "allPartnerCompaniesId");
     this.agrmentlist();
-
+    this.getCompanyList();
     this.findPage();
     let params = {
       classname: "",
@@ -1048,6 +1063,12 @@ export default {
     });
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("2").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1106,7 +1127,8 @@ export default {
         });
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
+      this.$api.task.findPtlAgreementListNew( { type: "" }).then((res) => {
+      //this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },
@@ -1224,10 +1246,13 @@ export default {
       this.dialogVisibleBatch = true;
       this.findPagegbatch();
     },
-    findPagegbatch() {
+    handleSearchListbatch(data) {
+      this.findPagegbatch(data);
+    },
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true;
       this.$api.task
-        .importAsyncQuery({ ...this.pageDataPro, handStatus: 2 })
+        .importAsyncQuery({ ...this.pageDataPro, handStatus: 2, ...data})
         .then((res) => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false;

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -180,7 +180,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleBatch"
-      width="45%"
+      width="50%"
       :before-close="handleCloseBatch"
     >
       <el-form
@@ -212,7 +212,9 @@
               <el-input v-model="InvoicingData.taxPoints"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="InvoicingData.invoicingMethod == '1'">
+          </el-row> 
+          <el-row>
+          <el-col :span="10" v-if="InvoicingData.invoicingMethod == '1'">
             <el-form-item label="开票号：" prop="invoicId">
               <el-input v-model="InvoicingData.invoicId"></el-input>
             </el-form-item>
@@ -502,6 +504,7 @@ export default {
   },
   data() {
     return {
+      companyList : [], //保司机构列表
       excelFileList: [],
       confirmDisabled: false,
       riskcodeList: [],
@@ -511,6 +514,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       rulesAdd: {
         agreeId: [
@@ -944,11 +953,6 @@ export default {
             label: "任务id",
             type: "text",
           },
-          {
-            prop: "partnerCompaniesName",
-            label: "保司名称",
-            type: "text",
-          },
           {
             prop: "partnerCompaniesName",
             label: "保司名称 ",
@@ -1107,6 +1111,12 @@ export default {
     });
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("0").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1134,7 +1144,8 @@ export default {
       this.excelFileList = [];
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "" }).then((res) => {
+      //this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },
@@ -1529,6 +1540,7 @@ export default {
       }
     },
     balanceFunPro() {
+      this.getCompanyList();
       // this.assembly('batchInvoicing',2)
       this.batchData = [];
       this.InvoicingData = {};

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -190,6 +190,12 @@
         >
       </span>
     </el-dialog>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :z-index="9999"
+      :url-list="[ProViewImg]"
+    />
   </div>
 </template>
 <script>
@@ -199,7 +205,12 @@ import yearMonthYay from "../../PlatformSettlement/yearMonthYay.vue";
 import { Decimal } from "decimal.js";
 export default {
   name: "InvoicingUnsettled",
-  components: { templateTable, yearMonthYay },
+  components: {
+    templateTable,
+    yearMonthYay,
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   created() {},
   computed: {
     ...mapState({
@@ -209,6 +220,8 @@ export default {
   data() {
     return {
       // 记录 明细
+      ProViewImg: "",
+      showViewer: false,
       dialogVisiblerecord: false,
       dialogVisiblerecordDetail: false,
       formTableDatarecord: [],
@@ -542,6 +555,10 @@ export default {
     },
   },
   methods: {
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false;
+    },
     //改变事件
     amountChange(row) {
       if (

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -375,9 +375,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -432,6 +434,19 @@ export default {
   },
   data() {
     return {
+      formListbatch: [
+        {
+          label: "上传时间",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
+      ],
       process: process.env.BASE_URL,
       dockingPersonOption: [],
       riskcodeList: [],
@@ -952,8 +967,15 @@ export default {
         this.InsCompanyList = res.data;
       }
     });
+    this.getCompanyList();
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("3").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1012,7 +1034,8 @@ export default {
         });
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "" }).then((res) => {
+      //this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },
@@ -1126,10 +1149,13 @@ export default {
       this.dialogVisibleBatch = true;
       this.findPagegbatch();
     },
-    findPagegbatch() {
+    handleSearchListbatch(data) {
+      this.findPagegbatch(data);
+    },
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true;
       this.$api.task
-        .importAsyncQuery({ ...this.pageDataPro, handStatus: 3 })
+        .importAsyncQuery({ ...this.pageDataPro, handStatus: 3,...data })
         .then((res) => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false;

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -510,6 +510,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       ztreeNodes: [],
       productsTypeoptions: [],
@@ -968,6 +974,7 @@ export default {
     };
   },
   created() {
+    
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
@@ -1012,8 +1019,15 @@ export default {
       }
     });
     this.agrmentlist();
+    this.getCompanyList();
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("1").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1091,7 +1105,8 @@ export default {
         });
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "" }).then((res) => {
+      //this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -191,6 +191,12 @@
         >
       </span>
     </el-dialog>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :z-index="9999"
+      :url-list="[ProViewImg]"
+    />
   </div>
 </template>
 <script>
@@ -200,7 +206,12 @@ import yearMonthYay from "../../PlatformSettlement/yearMonthYay.vue";
 import { Decimal } from "decimal.js";
 export default {
   name: "baosi",
-  components: { templateTable, yearMonthYay },
+  components: {
+    templateTable,
+    yearMonthYay,
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   created() {},
   computed: {
     ...mapState({
@@ -209,6 +220,8 @@ export default {
   },
   data() {
     return {
+      ProViewImg: "",
+      showViewer: false,
       // 记录 明细
       dialogVisiblerecord: false,
       dialogVisiblerecordDetail: false,
@@ -515,6 +528,10 @@ export default {
     },
   },
   methods: {
+    // 关闭查看器
+    closeViewer() {
+      this.showViewer = false;
+    },
     //改变事件
     amountChange(row) {
       if (

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -1664,7 +1664,8 @@ export default {
     },
 
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew({ type: "1" }).then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "" }).then((res) => {
+      //this.$api.task.findPtlAgreementListNew({ type: "1" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalancestatus.vue

@@ -45,30 +45,36 @@
       width="40%"
       :before-close="handleCloserecord"
     >
-      <templateTable
-        ref="templateTable1"
-        :pagination="pageDatarecord"
-        @getList="getListrecord"
-        :tableConfig="tableConfigDetailrecord"
-        :data="formTableDatarecord"
-        @findPage="findPageDetailrecord"
-      >
-        <template slot="imageUrl" slot-scope="scope" v-if="scope.row.imageUrl">
-          <div style="border: 2px solid #f2f2f2; box-sizing: border-box">
-            <el-image
-              style="width: 100px; height: 30px"
-              :src="`${process + scope.row.imageUrl}`"
-              :preview-src-list="[`${process + scope.row.imageUrl}`]"
-            ></el-image>
-          </div>
-          <!-- <img
+      <div class="table-overflow">
+        <templateTable
+          ref="templateTable1"
+          :pagination="pageDatarecord"
+          @getList="getListrecord"
+          :tableConfig="tableConfigDetailrecord"
+          :data="formTableDatarecord"
+          @findPage="findPageDetailrecord"
+        >
+          <template
+            slot="imageUrl"
+            slot-scope="scope"
+            v-if="scope.row.imageUrl"
+          >
+            <div style="border: 2px solid #f2f2f2; box-sizing: border-box">
+              <el-image
+                style="width: 100px; height: 30px"
+                :src="`${process + scope.row.imageUrl}`"
+                :preview-src-list="[`${process + scope.row.imageUrl}`]"
+              ></el-image>
+            </div>
+            <!-- <img
             
             :src="`${process + scope.row.imageUrl}`"
             :preview-src-list="[tixianDetails.bankReceipt]"
             class="imageclass"
           /> -->
-        </template>
-      </templateTable>
+          </template>
+        </templateTable>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisiblerecord = false"
           >取消</el-button
@@ -103,16 +109,17 @@
       :visible.sync="dialogVisibleRecordDetail"
       width="50%"
       :before-close="handleCloseRecordDetail"
-    >
-      <templateTable
-        ref="templateTable2"
-        :pagination="pageDataRecordDetail"
-        @getList="getListRecordDetail"
-        :tableConfig="tableConfigDetailDetail"
-        :data="formTableDatarecordDetail"
-        @findPage="findPageRecordDetail"
-      >
-      </templateTable>
+      ><div class="table-overflow">
+        <templateTable
+          ref="templateTable2"
+          :pagination="pageDataRecordDetail"
+          @getList="getListRecordDetail"
+          :tableConfig="tableConfigDetailDetail"
+          :data="formTableDatarecordDetail"
+          @findPage="findPageRecordDetail"
+        >
+        </templateTable>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleRecordDetail = false"
           >取消</el-button

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -103,7 +103,7 @@
       ></el-table-column>
       <el-table-column
         prop="insuredname"
-        label="投保人姓名"
+        label="被保险人"
         align="center"
         width="150"
       ></el-table-column>
@@ -427,23 +427,23 @@ export default {
             },
           ],
         },
-        {
-          name: "problemOrder",
-          label: "疑问订单",
-          type: "select",
-          optionsIabel: "label",
-          optionsValue: "value",
-          options: [
-            {
-              label: "是",
-              value: "1",
-            },
-            {
-              label: "否",
-              value: "0",
-            },
-          ],
-        },
+        // {
+        //   name: "problemOrder",
+        //   label: "疑问订单",
+        //   type: "select",
+        //   optionsIabel: "label",
+        //   optionsValue: "value",
+        //   options: [
+        //     {
+        //       label: "是",
+        //       value: "1",
+        //     },
+        //     {
+        //       label: "否",
+        //       value: "0",
+        //     },
+        //   ],
+        // },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],
           label: "报价时间",

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -776,7 +776,7 @@ export default {
 
     },
     tableRowClassName(row) {
-      if (row.row.isExternal === 1) {
+      if (row.row.problemOrder === 1) {
         return "flagRow";
       }
       else {

src/views/FinancialManagement/ExpenseManagement/TransferRecord.vue

@@ -35,12 +35,15 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="交易时间" label-width="95px" prop="createTime">
+        <el-form-item label="交易时间" label-width="95px" prop="dateRange">
           <el-date-picker
-            v-model="pageRequest.createTime"
-            type="date"
+            v-model="pageRequest.dateRange"
+            type="daterange"
             value-format="yyyy-MM-dd"
-            placeholder="选择日期">
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="dateChange">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="金额" label-width="95px" prop="applyAmount">
@@ -97,6 +100,7 @@ export default {
         company: "",
         fundUse: "",
         revenueOutlay: "",
+        dateRange: []
       },
       columns: [
         // 数据列
@@ -236,11 +240,20 @@ export default {
         this.dictionariesData = res.data;
       });
     },
+    dateChange(event, filed) {
+      if (event) {
+        this.pageRequest.createTimeStart = event[0];
+        this.pageRequest.createTimeEnd = event[1];
+      } else {
+        this.pageRequest.createTimeStart = "";
+        this.pageRequest.createTimeEnd = "";
+      }
+    },
   },
 };
 </script>
 
-    <style scoped>
+<style scoped>
 .operation {
   margin-left: 14px !important;
   margin-top: 15px !important ;

src/views/Sys/ChannelGrouping.vue

@@ -77,31 +77,6 @@
           </div>
         </el-col>
         <el-col :span="11" :offset="1" style="height: 500px">
-          <div>
-            <span>工号：</span>
-            <el-input
-              clearable
-              style="width: 220px"
-              placeholder="请输入已选机构工号"
-              size="small"
-              v-model="selectId"
-            >
-            </el-input>
-          </div>
-          <div style="margin: 10px 0">
-            <span>名称：</span
-            ><el-input
-              clearable
-              style="width: 220px"
-              size="small"
-              placeholder="请输入已选机构名称"
-              v-model="selectName"
-            >
-            </el-input>
-            <el-button type="primary" size="small" @click="seachSelect"
-              >搜索</el-button
-            >
-          </div>
           <h4>已选中机构名称</h4>
           <div style="height: 460px; overflow-y: auto">
             <div
@@ -153,8 +128,6 @@ export default {
   data() {
     return {
       selectParent: "",
-      selectId: "",
-      selectName: "",
       treedatatransfer: [],
       dept: [],
       name: "",
@@ -232,6 +205,9 @@ export default {
         //自定义参数
         children: "children",
         label: "name",
+        disabled:()=>{
+          return true
+        }
       },
       treekeys: [],
       expandshow: false,
@@ -243,26 +219,17 @@ export default {
     this.getList();
   },
   methods: {
-    seachSelect() {
-      let data = {};
-      data.gradeId = this.rowId;
-      data.name = this.selectName;
-      data.id = this.selectId;
-      this.$api.sys.queryRelation(data).then((res) => {
-        if (res.code == 200 && res.data.length > 0) {
-          this.dialogVisible = true;
-          setTimeout(() => {
-            this.treedatatransfer = res.data;
-          
-            this.$refs.tree.setCheckedKeys(res.data);
-          }, 500);
-        } else if (res.code == 200 && res.data.length == 0) {
-          this.$message.error("暂无数据");
-          this.dialogVisible = true;
-        } else {
-          this.$message.error(res.msg);
+    eventDisposalRangeChange(event){
+      console.log(event);
+      if(event.length>0){
+        this.defaultProps = {
+          children: "children",
+        label: "name",
+        disabled:()=>{
+          return false
         }
-      });
+        }
+      }
     },
     //删除右侧已选项
     deleteDept(dept, index) {
@@ -306,8 +273,6 @@ export default {
     uthorizedAgency(row) {
       this.treekeys = []
       this.treedatatransfer = [];
-      this.selectId = "";
-      this.selectName = "";
       this.treeListFun({
         id: "",
         name: "",

src/views/Task/daikeComponents/KtLetter1.vue

@@ -979,6 +979,9 @@
                       </el-col>
                       </el-popover>
                     </div>
+                    <div v-show="reslistitem.checkedProgramme == 99" style="margin-right: 20px;" class="juse-style">
+                      <span @click="showTypeDialog(reslistitem, reslistindex)">调整险种</span>
+                    </div>
                     <!-- <el-popover placement="top-start" width="450" style="margin-right: 20px;" trigger="hover">
                       <Ktletter1Popover></Ktletter1Popover>
                       <el-col class="gray-style" slot="reference">服务方案</el-col>
@@ -5792,7 +5795,6 @@ export default {
       }
       let starttime = new Date(this.carInfo.registerDate);
       let endtime = new Date(this.carInfo.issueDate);
-      // this.policyHolderInfovalidate();
       if (endtime < starttime) {
         this.$message({ message: "发证日期早于初登日期", type: "error" });
         return;
@@ -5817,8 +5819,6 @@ export default {
                 return
               }
               let res = {};
-              // res = await this.$api.letter.getAllAgreement();
-              // this.$api.letter.getAllAgreement().then((res) => {
               let param = {
                 productId: this.productId,
                 carInfo: this.carInfo,
@@ -5834,6 +5834,7 @@ export default {
               }
               console.log('校验成功，获取列表')
               this.showLoading = true
+              // this.$api.letter.getAllAgreement().then((res) => {
               this.$api.letter.ruleFilterCompany(param).then((res) => {
                 if (res.code == 200) {
                   res.data.map((ele) => {
@@ -5903,8 +5904,10 @@ export default {
                   });
                   return obj.agreement.length > 0; // 返回true保留，返回false移除该保险公司
                 });
-                  res.data.forEach((e) => {
-                  e.agreement.forEach((el) => (el.disabled = false));
+                res.data.forEach((e) => {
+                  if (e.agreement) {
+                    e.agreement.forEach((el) => (el.disabled = false));
+                  }
                 });
                 }
                 this.totalCompanyList = res.data;
@@ -11419,14 +11422,25 @@ export default {
     },
     // 撤销二维码
     revokeCode(id) {
-      this.$api.letter.getRevokeQrCode(id).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            message: res.msg,
-            type: "success",
-          });
-          this.QuotationHistory();
-        }
+      this.$confirm('确定撤销二维码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$api.letter.getRevokeQrCode(id).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+            this.QuotationHistory();
+          }
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤销二维码'
+        });
       });
     },
     //品牌型号查询
@@ -12249,7 +12263,7 @@ export default {
           this.inscompany = res.data.inscompany; //保险公司
           this.sumpremium = res.data.sumpremium; //总价
           this.licenseNo = res.data.cPlateNo; //车牌号
-          this.applyName = res.data.cInsuredNme; //车主
+          this.applyName = res.data.cApplyNme; //车主
           this.jqpremium = res.data.jqpremium; //交强
           this.sypremium = res.data.sypremium; //商业
           this.taxamount = res.data.taxamount; //车船税
@@ -13293,7 +13307,6 @@ export default {
       }
 
     }
-
     .card-mingxi {
       border: 1px solid #FD9A25;
       flex: 1;
@@ -13426,6 +13439,13 @@ export default {
         opacity: 1;
       }
     }
+    
+    .juse-style {
+      color: #FFF;
+      background: linear-gradient( 90deg, #FF981F 0%, #FF5C00 100%);
+      padding: 4px 8px;
+      border-radius: 2px;
+    }
     .blue-style {
       // background: #2D4D89;
       background: linear-gradient( 270deg, #0052FF 0%, #6899FF 100%);

src/views/Task/daikeComponents/KtOrder.vue

@@ -1709,7 +1709,7 @@ export default {
           this.inscompany = res.data.inscompany; //保险公司
           this.sumpremium = res.data.sumpremium; //总价
           this.licenseNo = res.data.cPlateNo; //车牌号
-          this.applyName = res.data.cInsuredNme; //车主
+          this.applyName = res.data.cApplyNme; //车主
           this.jqpremium = res.data.jqpremium; //交强
           this.sypremium = res.data.sypremium; //商业
           this.taxamount = res.data.taxamount; //车船税