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

src/components/UserDetail/index.vue

@@ -589,7 +589,7 @@ export default {
   },
   created() {
     this.$api.user
-      .selectfindByreferrerId({ deptId: this.formData.deptId })
+      .selectfindByreferrerId({ deptId: '' })
       .then((res) => {
         this.recommenderOptions = res.data || [];
       });

src/http/moudules/insCompany.js

@@ -609,6 +609,15 @@ export const bulkOperation = (data) => {
     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/task.js

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

src/utils/websocket.js

@@ -14,7 +14,7 @@ function websocketonmessage (e) {
  * 发起websocket连接
  * @param {Object} agentData 需要向后台传递的参数数据
  */
-function websocketSend (agentData) {
+export function websocketSend (agentData) {
   // 加延迟是为了尽量让ws连接状态变为OPEN
   setTimeout(() => {
     // 添加状态判断，当为OPEN时，发送消息
@@ -56,7 +56,7 @@ function websocketOpen (e) {
 }
 
 // 初始化weosocket
-function initWebSocket (wsUrl) {
+  function initWebSocket (wsUrl) {
   if (typeof (WebSocket) === 'undefined') {
     Message.error('您的浏览器不支持WebSocket，无法获取数据')
     return false

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"
@@ -387,7 +388,7 @@
     <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="50%">
       <div class="tab-panestyle">
         <el-form :inline="true" :model="batchUpdateForm" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
-          <el-row>
+          <!-- <el-row>
             <el-col :span="8">
               <el-form-item label="费用起期：">
                 <el-date-picker size="small"  v-model="batchUpdateForm.costsStartDate" type="datetime"
@@ -402,7 +403,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row>
             <div class="title">交强险费用</div>
             <el-col :span="8">
@@ -550,7 +551,7 @@
           label-width="80px">
           <el-form-item label="选择协议">
             <el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
-              <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="item.agreementName"
+              <el-option v-for="(item, index) in protocolpageResult" :key="index" :label="`${item.agreementName}-${item.businessDescription}-${item.jobDescription}`"
                 :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -594,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>
 
@@ -1185,6 +1215,8 @@ export default {
         productName: "",
       },
       permissions: null,
+      showUpdate1: false,
+      batchUpdateForm1: {},
     }
   },
   // 生命周期函数
@@ -1209,6 +1241,12 @@ export default {
     this.$api.insCompany.getAllAgreement(this.productpageRequest.agreementId).then((res) => {
       if (res.code == 200) {
         this.protocolpageResult = res.data;
+        this.protocolpageResult.forEach(item => {
+          item.agreementName == null ? item.agreementName='' : item.agreementName,
+          item.businessDescription ==  null ?  item.businessDescription='' : item.businessDescription,
+          item.jobDescription == null ? item.jobDescription=''  : item.jobDescription
+         });
+        console.log(this.protocolpageResult);
       } else {
         this.$message.error(res.msg);
       }
@@ -1406,6 +1444,24 @@ 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() {
       console.log(this.batchUpdateForm);
       this.$api.insCompany.bulkOperation(this.batchUpdateForm).then((res) => {
@@ -1525,7 +1581,6 @@ export default {
       this.productcopyItemPageRequest.agreementId = "";
       this.productcopyItemPageRequest.productCode = [];
       this.productcopyItemResult = [];
-
     },
     //产品删除
     productDelete({ row, column }) {
@@ -1608,6 +1663,14 @@ export default {
         }
       }
     },
+    // 批量修改起止时间
+    customTool1(data) {
+      this.batchUpdateForm1 = {
+        ids: data
+      }
+      // costsDateBatch
+      this.showUpdate1 = true
+    },
     //产品批量编辑
     batchUpdate(data) {
       this.batchUpdateForm = {

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/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/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -68,143 +68,147 @@
       :before-close="handleClose"
     >
       <el-form ref="form" :model="formDataList" label-width="130px">
+        <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="跟单费比例">
-              <el-input
-                v-model="formDataList.otherFeerate"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                size="small"
+                v-model="formDataList.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强跟单比例">
-              <el-input
-                v-model="formDataList.jqOtherCostsProportion"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataList.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业跟单比例">
-              <el-input
-                v-model="formDataList.syOtherCostsProportion"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
+              <el-cascader
+                ref="partnerCompaniesCascader"
+                v-model="formDataList.partnerCompaniesId"
+                size="small"
+                :show-all-levels="false"
+                ize="small"
+                :options="ztreeNodes"
+                @change="partnerCompaniesFun"
+                :props="optionProps"
+                clearable
+                filterable
+              ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
-            <el-form-item label="协议选择">
+            <el-form-item label="保险公司" prop="companyId">
               <el-select
                 size="small"
-                v-model="formDataList.agreementId"
-                placeholder="请选择协议类型"
-                style="width: 100%"
+                clearable
+                v-model="formDataList.companyId"
                 filterable
               >
                 <el-option
-                  v-for="item in agreementTypeoptions"
-                  :key="item.dictValue"
-                  :label="item.agreementName"
-                  :value="item.id"
+                  v-for="(s, i) in InsCompanyList"
+                  :key="i"
+                  :label="s.name"
+                  :value="s.id"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="增加类型" prop="addType">
+            <el-form-item label="险种" prop="riskcode">
               <el-select
+                v-model="formDataList.riskcode"
+                placeholder="选择险种"
                 size="small"
-                clearable
-                v-model="formDataList.addType"
-                filterable
               >
                 <el-option
-                  v-for="(s, i) in addTypeList"
-                  :key="i"
-                  :label="s.label"
-                  :value="s.value"
+                  v-for="item in productsTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取消</el-button>
-        <el-button size="small" type="primary" @click="onSubmit"
-          >保存</el-button
-        >
-      </span>
-    </el-dialog>
-    <el-dialog
-      title="新增"
-      :visible.sync="dialogVisibleAdd"
-      width="55%"
-      :before-close="handleCloseadd"
-    >
-      <el-form
-        ref="formDataAdd"
-        :rules="rulesAdd"
-        :model="formDataAdd"
-        label-width="130px"
-      >
-        <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号" prop="licenseno">
-              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
+            <el-form-item label="协议选择" prop="agreeId">
+              <el-select
+                size="small"
+                v-model="formDataList.agreementId"
+                placeholder="请选择协议类型"
+                style="width: 100%"
+                filterable
+              >
+                <el-option
+                  v-for="item in agreementTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.agreementName"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
+         </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="被保险人" prop="insuredName">
               <el-input
-                v-model="formDataAdd.insuredName"
+                v-model="formDataList.insuredName"
                 size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+         <div class="divider"></div>
+         <div class="info-title">保单(投保信息)</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强保单号" prop="policyno">
-              <el-input v-model="formDataAdd.policyno" size="small"></el-input>
+              <el-input v-model="formDataList.policyno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="商业保单号" prop="syPolicyno">
               <el-input
-                v-model="formDataAdd.syPolicyno"
+                v-model="formDataList.syPolicyno"
                 size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+       
           <el-col :span="8">
             <el-form-item label="交强险保费" prop="jqPremium">
-              <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
+              <el-input v-model="formDataList.jqPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="车船税" prop="taxamount">
-              <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
+              <el-input v-model="formDataList.taxamount" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="商业险保费" prop="syPremium">
-              <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="交强手续费比例" prop="jqSuperviseCostsProportion">
-              <el-input v-model="formDataAdd.jqSuperviseCostsProportion" size="small"></el-input>
+              <el-input v-model="formDataList.syPremium" size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="商业手续费比例" prop="sySuperviseCostsProportion">
-              <el-input v-model="formDataAdd.sySuperviseCostsProportion" size="small"></el-input>
-            </el-form-item>
-          </el-col> -->
+        </el-row>
+        <div class="divider"></div>
+         <div class="info-title">比例及金额</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强跟单比例" prop="jqOtherCostsProportion">
               <el-input
-                v-model="formDataAdd.jqOtherCostsProportion"
+                v-model="formDataList.jqOtherCostsProportion"
                 size="small"
               ></el-input>
             </el-form-item>
@@ -212,7 +216,7 @@
           <el-col :span="8">
             <el-form-item label="商业跟单比例" prop="syOtherCostsProportion">
               <el-input
-                v-model="formDataAdd.syOtherCostsProportion"
+                v-model="formDataList.syOtherCostsProportion"
                 size="small"
               ></el-input>
             </el-form-item>
@@ -220,11 +224,73 @@
           <el-col :span="8">
             <el-form-item label="跟单费金额" prop="otherFeevalue">
               <el-input
-                v-model="formDataAdd.otherFeevalue"
+                v-model="formDataList.otherFeevalue"
                 size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+          </el-row>
+         <div class="divider"></div>
+         <div class="info-title">类型</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit"
+          >保存</el-button
+        >
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="新增"
+      :visible.sync="dialogVisibleAdd"
+      width="55%"
+      :before-close="handleCloseadd"
+    >
+      <el-form
+        ref="formDataAdd"
+        :rules="rulesAdd"
+        :model="formDataAdd"
+        label-width="130px"
+      >
+      <div class="info-title">基本信息</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                size="small"
+                v-model="formDataAdd.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader
@@ -241,6 +307,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -292,18 +360,83 @@
               </el-select>
             </el-form-item>
           </el-col>
+         </el-row>
+         <el-row>
           <el-col :span="8">
-            <el-form-item label="签单日期" prop="signDate">
-              <el-date-picker
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataAdd.insuredName"
                 size="small"
-                v-model="formDataAdd.signDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+         <div class="divider"></div>
+         <div class="info-title">保单(投保信息)</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="交强保单号" prop="policyno">
+              <el-input v-model="formDataAdd.policyno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业保单号" prop="syPolicyno">
+              <el-input
+                v-model="formDataAdd.syPolicyno"
+                size="small"
+              ></el-input>
             </el-form-item>
           </el-col>
+       
+          <el-col :span="8">
+            <el-form-item label="交强险保费" prop="jqPremium">
+              <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="车船税" prop="taxamount">
+              <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业险保费" prop="syPremium">
+              <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+         <div class="info-title">比例及金额</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="交强跟单比例" prop="jqOtherCostsProportion">
+              <el-input
+                v-model="formDataAdd.jqOtherCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业跟单比例" prop="syOtherCostsProportion">
+              <el-input
+                v-model="formDataAdd.syOtherCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="跟单费金额" prop="otherFeevalue">
+              <el-input
+                v-model="formDataAdd.otherFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          </el-row>
+         <div class="divider"></div>
+         <div class="info-title">类型</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -322,6 +455,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="divider"></div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleAdd = false"
@@ -411,9 +545,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -468,6 +604,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 +1165,7 @@ export default {
     this.areaqueryList(1, 99, "provinceId");
     this.companyqueryList(0, "allPartnerCompaniesId");
     this.agrmentlist();
-
+    this.getCompanyList();
     this.findPage();
     let params = {
       classname: "",
@@ -1048,6 +1197,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 +1261,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 +1380,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;
@@ -1423,6 +1582,7 @@ export default {
       this.dialogVisible = true;
       this.$api.task.plyFeeId(row.id).then((res) => {
         if (res.code == 200) {
+          console.log(res.data)
           this.formDataList = res.data;
         } else {
           this.$message.error(res.msg);
@@ -1581,4 +1741,34 @@ export default {
   height: 50px;
   text-align: center;
 }
+.divider{
+  height: 10px;
+  background: #f7f7f7;
+}
+.info-title {
+  position: relative;
+  color: #262626;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
 </style>

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

@@ -93,49 +93,79 @@
       :before-close="handleClose"
     >
       <el-form ref="form" :model="formDataList" label-width="130px">
+        <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="手续费比例">
-              <el-input
-                v-model="formDataList.commissionFeerate"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                size="small"
+                v-model="formDataList.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="交强手续费比例">
-              <el-input
-                v-model="formDataList.jqSuperviseCostsProportion"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataList.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="商业手续费比例">
-              <el-input
-                v-model="formDataList.sySuperviseCostsProportion"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
+              <el-cascader
+                ref="partnerCompaniesCascader"
+                @change="partnerCompaniesFun"
+                v-model="formDataList.partnerCompaniesId"
+                size="small"
+                :show-all-levels="false"
+                ize="small"
+                :options="ztreeNodes"
+                :props="optionProps"
+                clearable
+                filterable
+              ></el-cascader>
             </el-form-item>
           </el-col>
+        </el-row> 
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="手续费金额">
-              <el-input
-                v-model="formDataList.commissionFeevalue"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="保险公司" prop="companyId">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.companyId"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in InsCompanyList"
+                  :key="i"
+                  :label="s.name"
+                  :value="s.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="应收金额">
-              <el-input
-                v-model="formDataList.allFeeValue"
-                class="inputType"
-              ></el-input>
+            <el-form-item label="险种" prop="riskcode">
+              <el-select
+                v-model="formDataList.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in productsTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+                <!-- :value="item.dictValue"></el-option> -->
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议选择">
+            <el-form-item label="协议选择" prop="agreeId">
               <el-select
                 size="small"
                 v-model="formDataList.agreementId"
@@ -152,6 +182,88 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row> 
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataList.insuredName"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="交强保单号" prop="policyno">
+              <el-input v-model="formDataList.policyno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业保单号" prop="syPolicyno">
+              <el-input
+                v-model="formDataList.syPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交强险保费" prop="jqPremium">
+              <el-input v-model="formDataList.jqPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="车船税" prop="taxamount">
+              <el-input v-model="formDataList.taxamount" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业险保费" prop="syPremium">
+              <el-input v-model="formDataList.syPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item
+              label="交强手续费比例"
+              prop="jqSuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataList.jqSuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="商业手续费比例"
+              prop="sySuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataList.sySuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
+              <el-input
+                v-model="formDataList.commissionFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row> 
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -170,6 +282,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="divider"></div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible = false">取消</el-button>
@@ -180,7 +293,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleBatch"
-      width="45%"
+      width="50%"
       :before-close="handleCloseBatch"
     >
       <el-form
@@ -212,7 +325,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>
@@ -262,76 +377,23 @@
         :model="formDataAdd"
         label-width="130px"
       >
+       <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号" prop="licenseno">
-              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="被保险人" prop="insuredName">
-              <el-input
-                v-model="formDataAdd.insuredName"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="交强保单号" prop="policyno">
-              <el-input v-model="formDataAdd.policyno" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商业保单号" prop="syPolicyno">
-              <el-input
-                v-model="formDataAdd.syPolicyno"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="交强险保费" prop="jqPremium">
-              <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="车船税" prop="taxamount">
-              <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="商业险保费" prop="syPremium">
-              <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="交强手续费比例"
-              prop="jqSuperviseCostsProportion"
-            >
-              <el-input
-                v-model="formDataAdd.jqSuperviseCostsProportion"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="商业手续费比例"
-              prop="sySuperviseCostsProportion"
-            >
-              <el-input
-                v-model="formDataAdd.sySuperviseCostsProportion"
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
                 size="small"
-              ></el-input>
+                v-model="formDataAdd.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="手续费金额" prop="commissionFeevalue">
-              <el-input
-                v-model="formDataAdd.commissionFeevalue"
-                size="small"
-              ></el-input>
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -350,6 +412,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+        </el-row> 
+        <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -402,18 +466,88 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row> 
+        <el-row> 
           <el-col :span="8">
-            <el-form-item label="签单日期" prop="signDate">
-              <el-date-picker
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataAdd.insuredName"
                 size="small"
-                v-model="formDataAdd.signDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
+              ></el-input>
             </el-form-item>
           </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="交强保单号" prop="policyno">
+              <el-input v-model="formDataAdd.policyno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业保单号" prop="syPolicyno">
+              <el-input
+                v-model="formDataAdd.syPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交强险保费" prop="jqPremium">
+              <el-input v-model="formDataAdd.jqPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="车船税" prop="taxamount">
+              <el-input v-model="formDataAdd.taxamount" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业险保费" prop="syPremium">
+              <el-input v-model="formDataAdd.syPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item
+              label="交强手续费比例"
+              prop="jqSuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataAdd.jqSuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label="商业手续费比例"
+              prop="sySuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataAdd.sySuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
+              <el-input
+                v-model="formDataAdd.commissionFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+          <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row> 
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -432,6 +566,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="divider"></div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleAdd = false"
@@ -502,6 +637,7 @@ export default {
   },
   data() {
     return {
+      companyList : [], //保司机构列表
       excelFileList: [],
       confirmDisabled: false,
       riskcodeList: [],
@@ -511,6 +647,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       rulesAdd: {
         agreeId: [
@@ -944,11 +1086,6 @@ export default {
             label: "任务id",
             type: "text",
           },
-          {
-            prop: "partnerCompaniesName",
-            label: "保司名称",
-            type: "text",
-          },
           {
             prop: "partnerCompaniesName",
             label: "保司名称 ",
@@ -1107,6 +1244,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 +1277,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 +1673,7 @@ export default {
       }
     },
     balanceFunPro() {
+      this.getCompanyList();
       // this.assembly('batchInvoicing',2)
       this.batchData = [];
       this.InvoicingData = {};
@@ -1628,4 +1773,34 @@ export default {
 .inputType {
   width: 180px;
 }
+.divider{
+  height: 10px;
+  background: #f7f7f7;
+}
+.info-title {
+  position: relative;
+  color: #262626;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
 </style>

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

@@ -82,21 +82,82 @@
     <el-dialog
       title="编辑"
       :visible.sync="dialogVisible"
-      width="25%"
+      width="50%"
       :before-close="handleClose"
     >
       <el-form ref="form" :model="formDataList" label-width="100px">
+        <div class="info-title">基本信息</div>
         <el-row>
-          <el-col :span="20">
-            <el-form-item label="跟单费比例">
-              <el-input
-                v-model="formDataList.otherFeerate"
-                class="inputType"
-              ></el-input>
+          <el-col :span="8">
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                size="small"
+                v-model="formDataList.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item label="协议选择">
+          <el-col :span="8">
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataList.licenseno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
+              <el-cascader
+                v-model="formDataList.partnerCompaniesId"
+                ref="partnerCompaniesCascader"
+                size="small"
+                :show-all-levels="false"
+                ize="small"
+                :options="ztreeNodes"
+                @change="partnerCompaniesFun"
+                :props="optionProps"
+                clearable
+                filterable
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          </el-row>
+          <el-row>
+          <el-col :span="8">
+            <el-form-item label="保险公司" prop="companyId">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.companyId"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in InsCompanyList"
+                  :key="i"
+                  :label="s.name"
+                  :value="s.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="险种" prop="riskcode">
+              <el-select
+                v-model="formDataList.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in productsTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="协议选择" prop="agreeId">
               <el-select
                 size="small"
                 v-model="formDataList.agreementId"
@@ -113,14 +174,64 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataList.insuredName"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+        <div class="info-title">保单(投保信息)</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input
+                v-model="formDataList.noPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保费" prop="noPremium">
+              <el-input v-model="formDataList.noPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+        <div class="divider"></div>
+        <div class="info-title">比例及金额</div>
+          <el-row>
+          <el-col :span="8">
+            <el-form-item label="非车跟单比例" prop="noOtherCostsProportion">
+              <el-input
+                v-model="formDataList.noOtherCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="跟单费金额" prop="otherFeevalue">
+              <el-input
+                v-model="formDataList.otherFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+        <div class="info-title">类型</div>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
                 size="small"
                 clearable
                 v-model="formDataList.addType"
                 filterable
-                style="width: 100%"
               >
                 <el-option
                   v-for="(s, i) in addTypeList"
@@ -152,47 +263,23 @@
         :model="formDataAdd"
         label-width="140px"
       >
+      <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号" prop="licenseno">
-              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="被保险人" prop="insuredName">
-              <el-input
-                v-model="formDataAdd.insuredName"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车保单号" prop="noPolicyno">
-              <el-input
-                v-model="formDataAdd.noPolicyno"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车保费" prop="noPremium">
-              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车跟单比例" prop="noOtherCostsProportion">
-              <el-input
-                v-model="formDataAdd.noOtherCostsProportion"
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
                 size="small"
-              ></el-input>
+                v-model="formDataAdd.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="跟单费金额费金额" prop="otherFeevalue">
-              <el-input
-                v-model="formDataAdd.otherFeevalue"
-                size="small"
-              ></el-input>
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -211,6 +298,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -262,18 +351,57 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="签单日期" prop="signDate">
-              <el-date-picker
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataAdd.insuredName"
                 size="small"
-                v-model="formDataAdd.signDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+        <div class="info-title">保单(投保信息)</div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input
+                v-model="formDataAdd.noPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保费" prop="noPremium">
+              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+        <div class="divider"></div>
+        <div class="info-title">比例及金额</div>
+          <el-row>
+          <el-col :span="8">
+            <el-form-item label="非车跟单比例" prop="noOtherCostsProportion">
+              <el-input
+                v-model="formDataAdd.noOtherCostsProportion"
+                size="small"
+              ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="跟单费金额费金额" prop="otherFeevalue">
+              <el-input
+                v-model="formDataAdd.otherFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+        <div class="info-title">类型</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -375,9 +503,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -432,6 +562,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 +1095,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 +1162,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 +1277,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;
@@ -1464,4 +1618,34 @@ export default {
   height: 50px;
   text-align: center;
 }
+.divider{
+  height: 10px;
+  background: #f7f7f7;
+}
+.info-title {
+  position: relative;
+  color: #262626;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
 </style>

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

@@ -197,50 +197,23 @@
         :model="formDataAdd"
         label-width="130px"
       >
+      <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="车牌号" prop="licenseno">
-              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="被保险人" prop="insuredName">
-              <el-input
-                v-model="formDataAdd.insuredName"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车保单号" prop="noPolicyno">
-              <el-input
-                v-model="formDataAdd.noPolicyno"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="非车保费" prop="noPremium">
-              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="非车手续费比例"
-              prop="noSuperviseCostsProportion"
-            >
-              <el-input
-                v-model="formDataAdd.noSuperviseCostsProportion"
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
                 size="small"
-              ></el-input>
+                v-model="formDataAdd.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="手续费金额" prop="commissionFeevalue">
-              <el-input
-                v-model="formDataAdd.commissionFeevalue"
-                size="small"
-              ></el-input>
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataAdd.licenseno" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -259,6 +232,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -310,18 +285,60 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="签单日期" prop="signDate">
-              <el-date-picker
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataAdd.insuredName"
                 size="small"
-                v-model="formDataAdd.signDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
+              ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input
+                v-model="formDataAdd.noPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保费" prop="noPremium">
+              <el-input v-model="formDataAdd.noPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item
+              label="非车手续费比例"
+              prop="noSuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataAdd.noSuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
+              <el-input
+                v-model="formDataAdd.commissionFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row>  
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -340,6 +357,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="divider"></div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleAdd = false"
@@ -378,25 +396,78 @@
 
     <el-dialog title="编辑" :visible.sync="dialogVisibleEdit" width="50%">
       <el-form ref="formDataEdit" :model="formDataEdit" label-width="130px">
+        <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="非车手续费比例">
-              <el-input
-                v-model="formDataEdit.noSuperviseCostsProportion"
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
                 size="small"
-              ></el-input>
+                v-model="formDataEdit.signDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="非车手续费金额">
-              <el-input
-                v-model="formDataEdit.noSuperviseCostsPremiums"
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input v-model="formDataEdit.licenseno" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保司机构" prop="partnerCompaniesId">
+              <el-cascader
+                ref="partnerCompaniesCascader"
+                v-model="formDataEdit.partnerCompaniesId"
                 size="small"
-              ></el-input>
+                :show-all-levels="false"
+                ize="small"
+                :options="ztreeNodes"
+                @change="partnerCompaniesFun"
+                :props="optionProps"
+                clearable
+                filterable
+              ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
-            <el-form-item label="协议选择">
+            <el-form-item label="保险公司" prop="companyId">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataEdit.companyId"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in InsCompanyList"
+                  :key="i"
+                  :label="s.name"
+                  :value="s.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="险种" prop="riskcode">
+              <el-select
+                v-model="formDataEdit.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in productsTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="协议选择" prop="agreeId">
               <el-select
                 size="small"
                 v-model="formDataEdit.agreementId"
@@ -413,6 +484,60 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="被保险人" prop="insuredName">
+              <el-input
+                v-model="formDataEdit.insuredName"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input
+                v-model="formDataEdit.noPolicyno"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保费" prop="noPremium">
+              <el-input v-model="formDataEdit.noPremium" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row> 
+          <el-col :span="8">
+            <el-form-item
+              label="非车手续费比例"
+              prop="noSuperviseCostsProportion"
+            >
+              <el-input
+                v-model="formDataEdit.noSuperviseCostsProportion"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
+              <el-input
+                v-model="formDataEdit.commissionFeevalue"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row>  
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -431,6 +556,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="divider"></div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisibleEdit = false"
@@ -510,6 +636,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       ztreeNodes: [],
       productsTypeoptions: [],
@@ -968,6 +1100,7 @@ export default {
     };
   },
   created() {
+    
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
@@ -1012,8 +1145,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数据类型
@@ -1049,9 +1189,17 @@ export default {
         agreementId: row.agreementId,
         addType: row.addType,
       };
+      this.$api.task.plyFeeId(row.id).then((res) => {
+        if (res.code == 200) {
+          this.formDataEdit = res.data;
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
       this.dialogVisibleEdit = true;
     },
     onSubmitEdit() {
+      this.formDataEdit.createTime = null;
       this.$api.task.updateNoHand(this.formDataEdit).then((res) => {
         if (res.code == 200) {
           this.$message.success(res.msg);
@@ -1091,7 +1239,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;
       });
     },
@@ -1494,4 +1643,34 @@ export default {
   margin-bottom: 20px;
   font-size: 14px;
 }
+.divider{
+  height: 10px;
+  background: #f7f7f7;
+}
+.info-title {
+  position: relative;
+  color: #262626;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
 </style>

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

@@ -129,6 +129,7 @@
         label-width="130px"
         :rules="rulesAdd"
       >
+      <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
             <el-form-item label="签单日期" prop="signDate">
@@ -151,31 +152,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="被保险人">
-              <el-input
-                v-model="formDataList.insuredName"
-                class="inputType"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="险种">
-              <el-select
-                v-model="formDataList.riskcode"
-                placeholder="选择险种"
-                size="small"
-              >
-                <el-option
-                  v-for="item in riskcodeList"
-                  :key="item.dictValue"
-                  :label="item.dictTag"
-                  :value="item.dictTag"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构">
               <el-cascader
@@ -192,6 +168,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -209,6 +187,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="险种">
+              <el-select
+                v-model="formDataList.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in riskcodeList"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+         
 
           <el-col :span="8">
             <el-form-item label="协议选择">
@@ -228,6 +223,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="被保险人">
+              <el-input
+                v-model="formDataList.insuredName"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
           <el-col :span="8">
             <el-form-item label="交强保单号" prop="policyno">
               <el-input
@@ -255,6 +265,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强保费">
               <el-input
@@ -282,6 +294,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+         </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="非车保费">
               <el-input
@@ -291,6 +305,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强手续费比例">
               <el-input
@@ -318,7 +336,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+        </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="交强跟单比例">
               <el-input
@@ -346,6 +365,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强应收比例">
               <el-input
@@ -373,7 +394,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+         </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="跟单金额" prop="otherFeevalue">
               <el-input
@@ -403,6 +425,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -533,6 +559,7 @@
         label-width="130px"
         :rules="rulesAdd"
       >
+      <div class="info-title">基本信息</div>
         <el-row>
           <el-col :span="8">
             <el-form-item label="签单日期" prop="signDate">
@@ -555,31 +582,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="被保险人">
-              <el-input
-                v-model="formDataListAdd.insuredName"
-                class="inputType"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="险种">
-              <el-select
-                v-model="formDataListAdd.riskcode"
-                placeholder="选择险种"
-                size="small"
-              >
-                <el-option
-                  v-for="item in riskcodeList"
-                  :key="item.dictValue"
-                  :label="item.dictTag"
-                  :value="item.dictTag"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="保司机构">
               <el-cascader
@@ -596,6 +598,8 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          </el-row>
+          <el-row>
           <el-col :span="8">
             <el-form-item label="保险公司" prop="companyId">
               <el-select
@@ -613,6 +617,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="险种">
+              <el-select
+                v-model="formDataListAdd.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in riskcodeList"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+         
 
           <el-col :span="8">
             <el-form-item label="协议选择">
@@ -632,6 +653,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="被保险人">
+              <el-input
+                v-model="formDataListAdd.insuredName"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">保单(投保信息)</div>
+        <el-row> 
           <el-col :span="8">
             <el-form-item label="交强保单号" prop="policyno">
               <el-input
@@ -659,6 +695,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强保费">
               <el-input
@@ -686,6 +724,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+         </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="非车保费">
               <el-input
@@ -695,6 +735,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">比例及金额</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强手续费比例">
               <el-input
@@ -722,7 +766,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+        </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="交强跟单比例">
               <el-input
@@ -750,6 +795,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="交强应收比例">
               <el-input
@@ -777,7 +824,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+         </el-row>
+         <el-row>
           <el-col :span="8">
             <el-form-item label="跟单金额" prop="otherFeevalue">
               <el-input
@@ -807,6 +855,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <div class="divider"></div>
+          <div class="info-title">类型</div>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="增加类型" prop="addType">
               <el-select
@@ -1664,7 +1716,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;
       });
     },
@@ -2049,4 +2102,34 @@ export default {
 .inputType {
   width: 180px;
 }
+.divider{
+  height: 10px;
+  background: #f7f7f7;
+}
+.info-title {
+  position: relative;
+  color: #262626;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
 </style>

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

@@ -16,6 +16,7 @@
       stripe
       @expand-change="handleRowChange"
       ref="expandTable"
+      :row-class-name="tableRowColor"
       :header-cell-style="{
         background: '#F2F7FC',
         fontWeight: '700',
@@ -1859,6 +1860,12 @@ export default {
         this.pageRequest.endDate = e[1];
       }
     },
+    tableRowColor({ row, rowIndex }) {
+      console.log(row.problemOrder);
+      if (row.problemOrder  == 1) {
+        return "blue-row";
+      }
+    },
   },
 };
 </script>
@@ -2385,4 +2392,12 @@ export default {
   height: 20px;
   font-size: 13px;
 }
+/deep/ .el-table .el-table__row.blue-row {
+  background: #409eff;
+  opacity: .8;
+  color: #fff;
+}
+/deep/.el-table .el-table__row.blue-row:hover{
+  color: #000;
+}
 </style>

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

@@ -3,7 +3,7 @@
     <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <el-table size="small" :data="pageResult" height="590" border v-loading="loading" highlight-current-row
-      @expand-change="handleRowChange" ref="expandTable" :row-class-name="tableRowClassName"
+      @expand-change="handleRowChange" ref="expandTable" :row-class-name="tableRowColor"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
       <el-table-column prop="subOrderId" label="订单号" align="center"></el-table-column>
       <el-table-column prop="username" label="业务员工号" align="center">
@@ -1692,6 +1692,12 @@ export default {
       }
 
     },
+    tableRowColor({ row, rowIndex }) {
+      console.log(row.problemOrder);
+      if (row.problemOrder  == 1) {
+        return "blue-row";
+      }
+    },
   }
 }
 </script>
@@ -2224,4 +2230,12 @@ export default {
   height: 20px;
   font-size: 13px;
 }
+/deep/ .el-table .el-table__row.blue-row {
+  background: #409eff;
+  opacity: .8;
+  color: #fff;
+}
+/deep/.el-table .el-table__row.blue-row:hover{
+  color: #000;
+}
 </style>

src/views/Home.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="container">
-      <!-- 导航菜单栏 -->
-      <nav-bar></nav-bar>
-      <!-- 头部区域 -->
-      <head-bar></head-bar>
-      <!-- 主内容区域 -->
-      <main-content></main-content>
+    <!-- 导航菜单栏 -->
+    <nav-bar></nav-bar>
+    <!-- 头部区域 -->
+    <head-bar></head-bar>
+    <!-- 主内容区域 -->
+    <main-content></main-content>
   </div>
 </template>
 
@@ -13,22 +13,55 @@
 import HeadBar from "./HeadBar/HeadBar"
 import NavBar from "./NavBar/NavBar"
 import MainContent from "./MainContent/MainContent"
+import {
+  getUserIP,
+  getUserLocation,
+  getAddressLocation,
+} from "@/utils/ipAndAddress.js";
+import Cookies from "js-cookie";
+import { websocketSend, closeWebsocket } from "@/utils/websocket.js";
 export default {
-  components:{
-        HeadBar,
-        NavBar,
-        MainContent
+  components: {
+    HeadBar,
+    NavBar,
+    MainContent
+  },
+  created() {
+    setInterval(() => {
+      setTimeout(() => {
+        if (Cookies.get("token")) {
+          getUserIP((ip) => {
+            getAddressLocation(ip, (info) => {
+              let data = {
+                ...info,
+                systemType: '1',
+              };
+              websocketSend(
+                data
+              );
+            });
+          })
+        }
+        else {
+          closeWebsocket()
+        }
+      }, 0);
+      // // }, 2 * 60 * 60000); // 两个小时
+      }, 30 * 60000); // 半小时
+    // }, 10000); // 半小时
+
   }
+
 };
 </script>
 
 <style scoped lang="scss">
-  .container {
-    position:absolute;
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    // background: rgba(224, 234, 235, 0.1);
-  }
+.container {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  // background: rgba(224, 234, 235, 0.1);
+}
 </style>  

src/views/PeopleManage/PcLoginRecord.vue

@@ -20,7 +20,7 @@
             :value="option.code"></el-option>
         </el-select>
         <el-button size="small" type="primary" @click="onSearch">搜索</el-button>
-        <el-button size="small" type="primary" @click="deptPeopleVisible=true;getUserDeptTreeFun()">机构人员树</el-button>
+        <el-button size="small" type="primary" @click="getUserDeptTreeFun()">机构人员树</el-button>
         <!-- <el-button size="small" type="primary" @click="onCircular">圆形定位</el-button> -->
         <!-- <el-button size="small" type="primary" @click="map.remove(circle)">删除定位</el-button> -->
       </div>
@@ -49,7 +49,7 @@
       </div>
        <!-- <MobileZoomDiv> -->
         <div v-if="personnelVisible">
-        <vdr title="人员详情" @visiblefun="personnelVisible = false" :width="700" >
+        <vdr title="人员详情" @visiblefun="personnelVisible = false" :width="700" :height="370">
           <el-table :data="personnelData" border style="width: 100%; " :header-cell-style="{
             background: '#F7F7F9',
             fontWeight: '700',
@@ -63,13 +63,13 @@
                 <span v-else style="text-decoration-line: underline;">{{ scope.$index + 1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="userName" label="姓名" width="100">
+            <el-table-column prop="userName" label="姓名">
             </el-table-column>
-            <el-table-column prop="userId" label="工号">
+            <el-table-column prop="userId" label="工号" width="120">
             </el-table-column>
             <el-table-column prop="address" label="地址">
             </el-table-column>
-            <el-table-column prop="operationTime" label="登录时间">
+            <el-table-column prop="operationTime" label="登录时间"> 
             </el-table-column>
             <el-table-column prop="source" label="分类">
               <template slot-scope="scope">
@@ -82,7 +82,7 @@
                   size="small">
                   历史记录
                 </el-button>
-                <el-button style="color:#3865E9 " @click.native.prevent="operatelRecords(scope.row)" type="text"
+                <el-button  @click.native.prevent="operatelRecords(scope.row)" type="text"
                   size="small">
                   操作记录
                 </el-button>
@@ -94,7 +94,7 @@
             </div>
           </el-table>
           <div class="bottomFixed">
-            <el-pagination @current-change="handlePersonnelChange" :current-page="personnelPageNum" :page-size="5"
+            <el-pagination @current-change="handlePersonnelChange" :current-page="personnelPageNum" :page-size="3"
               layout="total, prev, pager, next" :total="personnelTotalSize">
             </el-pagination>
           </div>
@@ -103,7 +103,7 @@
       <!-- </MobileZoomDiv> -->
       <!-- <MobileZoomDivTR> -->
       <div v-if="infoWindowVisible">
-        <vdr title="历史记录" @visiblefun="infoWindowVisible = false"  >
+        <vdr title="历史记录" @visiblefun="infoWindowVisible = false"  :width="600" :height="430">
           <el-table :data="tableData" border style="width: 98%; max-height: 45vh;
             overflow-y: auto; " :cell-style="{ padding: '3px 8px' }" :header-cell-style="{
               background: '#F2F7FC',
@@ -111,13 +111,13 @@
               color: '#606266',
 
             }">
-          <el-table-column prop="userId" label="工号" width="150">
+          <el-table-column prop="userId" label="工号" width="130">
           </el-table-column>
           <el-table-column prop="userName" label="姓名" width="80">
           </el-table-column>
-          <el-table-column prop="address" label="地址">
+          <el-table-column prop="address" label="地址" >
           </el-table-column>
-          <el-table-column prop="operationTime" label="登录时间">
+          <el-table-column prop="operationTime" label="登录时间" width="120">
           </el-table-column>
         </el-table>
         <div class="bottomFixed">
@@ -203,7 +203,7 @@
       </MobileZoomDivR>
      
       <div v-if="operatelVisible">
-        <vdr title="操作记录" @visiblefun="operatelVisible = false">
+        <vdr title="操作记录" @visiblefun="operatelVisible = false"  :width="600"  :height="250">
           <div style="margin-bottom: 10px;">
             <span style="color: #262626;font-weight: 700;font-size: 14px;">时间筛选 </span>
             <el-date-picker v-model="operateDate" type="datetimerange" size="small" @change="operateDateFun"
@@ -396,6 +396,7 @@ export default {
           if (res.code == 200) {
             this.ztreeNodes = res.data.deptList;
             this.ztreeNodeAll = res.data;
+            this.deptPeopleVisible=true;
           }
         });
     },
@@ -570,7 +571,7 @@ export default {
       this.$api.user[api]({
         queryId: this.deptPeopleId,
         type: this.deptPeopleType,
-        lng: this.position[0], lat: this.position[1], source: this.source, pageSize: 5,
+        lng: this.position[0], lat: this.position[1], source: this.source, pageSize: 3,
         pageNum: this.personnelPageNum, ...data
       })
         .then(res => {
@@ -1009,7 +1010,7 @@ export default {
       this.$api.user[api]({
         queryId: this.deptPeopleId,
         type: this.deptPeopleType,
-        lng: e.target._position[0], lat: e.target._position[1], source: this.source, pageSize: 5,
+        lng: e.target._position[0], lat: e.target._position[1], source: this.source, pageSize: 3,
         pageNum: this.personnelPageNum, ...data
       })
         .then(res => {
@@ -1107,6 +1108,7 @@ export default {
   background-color: white;
   padding: 10px;
   width: 500px;
+  height: 250px;
   box-sizing: border-box;
   box-shadow: 0px 5px 10px #ddd;
   // max-height: 57vh;
@@ -1209,7 +1211,7 @@ export default {
     font-size: 14px;
     cursor: pointer;
     color: rgba(0, 0, 0, 0.85);
-    width: 100%;
+    width: 144px;
     height: 100px;
     background-image: url(../../assets/user-map1.png);
     background-size: cover;

src/views/PeopleManage/UserMap.vue

@@ -18,7 +18,7 @@
           :value="option.code"></el-option>
       </el-select>
       <el-button size="small" type="primary" @click="onSearch">搜索</el-button>
-      <el-button size="small" type="primary" @click="deptPeopleVisible=true;getUserDeptTreeFun()">机构人员树</el-button>
+      <el-button size="small" type="primary" @click="getUserDeptTreeFun()">机构人员树</el-button>
     </div>
     <div class="line-window">
       <span><i style=" background: #54B569 ;"></i>在线</span>
@@ -50,7 +50,7 @@
      <!-- <MobileZoomDiv> -->
       <!-- 人员详情 -->
       <div v-if="personnelVisible">
-      <vdr title="人员详情" @visiblefun="personnelVisible = false" :width="770" >
+      <vdr title="人员详情" @visiblefun="personnelVisible = false" :width="900" :height="350">
         <el-table :data="personnelData" border style="width: 100%; " :header-cell-style="{
           background: '#F7F7F9',
           fontWeight: '700',
@@ -64,19 +64,19 @@
               <span v-else style="text-decoration-line: underline;">{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="userName" label="姓名">
+          <el-table-column prop="userName" label="姓名" >
           </el-table-column>
-          <el-table-column prop="id" label="工号">
+          <el-table-column prop="id" label="工号" >
           </el-table-column>
-          <el-table-column prop="deptName" label="所属机构" width="150">
+          <el-table-column prop="deptName" label="所属机构" width="220" >
           </el-table-column>
-          <el-table-column prop="leaderName" label="管理人">
+          <el-table-column prop="leaderName" label="管理人" >
           </el-table-column>
-          <el-table-column prop="address" label="地址">
+          <el-table-column prop="address" label="地址" >
           </el-table-column>
-          <el-table-column prop="createTime" label="登录时间">
+          <el-table-column prop="createTime" label="登录时间" >
           </el-table-column>
-          <el-table-column prop="source" label="分类">
+          <el-table-column prop="source" label="分类" >
             <template slot-scope="scope">
               {{ scope.row.source == '1' ? '渠道' : '代理' }}
             </template>
@@ -87,7 +87,7 @@
                 size="small">
                 历史记录
               </el-button>
-              <el-button st yle="color:#3865E9 " @click.native.prevent="operatelRecords(scope.row)" type="text"
+              <el-button  @click.native.prevent="operatelRecords(scope.row)" type="text"
                 size="small">
                 操作记录
               </el-button>
@@ -108,27 +108,27 @@
     <!-- </MobileZoomDiv> -->
     <!-- <MobileZoomDivTR> -->
     <div v-if="infoWindowVisible">
-      <vdr title="历史记录" @visiblefun="infoWindowVisible = false"  :width="720">
+      <vdr title="历史记录" @visiblefun="infoWindowVisible = false"  :width="800" :height="420">
         <el-table :data="tableData" border style="width: 98%; max-height: 45vh;
-    overflow-y: auto;" :cell-style="{ padding: '3px 8px' }" :header-cell-style="{
-      background: '#F2F7FC',
-      fontWeight: '700',
-      color: '#606266',
-    }">
-          <el-table-column prop="userId" label="工号" width="150">
+          overflow-y: auto;" :cell-style="{ padding: '3px 8px' }" :header-cell-style="{
+            background: '#F2F7FC',
+            fontWeight: '700',
+            color: '#606266',
+          }">
+          <el-table-column prop="userId" label="工号" width="130">
           </el-table-column>
           <el-table-column prop="userName" label="姓名" width="100">
           </el-table-column>
-          <el-table-column prop="deptName" label="所属机构"  width="150">
+          <el-table-column prop="deptName" label="所属机构"  >
           </el-table-column>
-          <el-table-column prop="address" label="地址">
+          <el-table-column prop="address" label="地址"  width="150">
           </el-table-column>
-          <el-table-column prop="createTime" label="登录时间">
+          <el-table-column prop="createTime" label="登录时间" width="120">
           </el-table-column>
         </el-table>
         <div class="bottomFixed">
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
-            :page-sizes="[5, 10, 20, 30, 50, 100]" :page-size="pageSize" layout="total, sizes, prev, pager, next"
+            :page-sizes="[3,5, 10, 20, 30, 50, 100]" :page-size="pageSize" layout="total, sizes, prev, pager, next"
             :total="totalSum">
           </el-pagination>
         </div>
@@ -209,7 +209,7 @@
 
    
     <div v-if="operatelVisible">
-      <vdr title="操作记录" @visiblefun="operatelVisible = false" :width="800">
+      <vdr title="操作记录" @visiblefun="operatelVisible = false" :width="820" :height="300">
         <div style="margin-bottom: 10px;">
           <span style="color: #262626;font-weight: 700;font-size: 14px;">时间筛选 </span>
           <el-date-picker v-model="operateDate" type="datetimerange" size="small" @change="operateDateFun"
@@ -228,7 +228,7 @@
           </el-table-column>
           <el-table-column prop="userName" label="姓名">
           </el-table-column>
-          <el-table-column prop="deptName" label="所属机构" width="150">
+          <el-table-column prop="deptName" label="所属机构"  width="220" >
           </el-table-column>
           <el-table-column prop="carNumber" label="车险录单">
             <template slot-scope="scope">
@@ -303,6 +303,8 @@ import AMapLoader from "@amap/amap-jsapi-loader";
 window._AMapSecurityConfig = {
   securityJsCode: 'd62687dd438cfadd859bbab66d8e41a2',		//安全密钥
 }
+import { websocketSend, closeWebsocket } from "@/utils/websocket.js";
+
 var myChart;
 export default {
   data() {
@@ -314,7 +316,7 @@ export default {
       ztreeNodeAll:{},
       deptPeopleValue:true,
       pageNum: 1, //当前页面
-      pageSize: 5, //每页显示条数
+      pageSize: 3, //每页显示条数
       totalSum: 0, //全部的数据条数
       tableData: [],
       marker: null,
@@ -388,14 +390,6 @@ export default {
     window.personnelclick = () => {
       this.personnelVisible = true;
     };
-    this.$api.user
-        .getUserDeptTree()
-        .then(res => {
-          if (res.code == 200) {
-            this.ztreeNodes = res.data.deptList;
-            this.ztreeNodeAll = res.data;
-          }
-        });
   },
   destroyed() {
     // 销毁地图，并清空地图容器.该方法执行后，地图对象被注销，内存释放，地图容器被清空。
@@ -409,6 +403,7 @@ export default {
           if (res.code == 200) {
             this.ztreeNodes = res.data.deptList;
             this.ztreeNodeAll = res.data;
+            this.deptPeopleVisible=true;
           }
         });
     },
@@ -588,7 +583,7 @@ export default {
         .queryGeographyInfo({
           queryId: this.deptPeopleId,
           type: this.deptPeopleType,
-          lng: this.position[0], lat: this.position[1], pageSize: 5,
+          lng: this.position[0], lat: this.position[1], pageSize: 3,
           pageNum: this.personnelPageNum, ...data
         })
         .then(res => {
@@ -936,7 +931,7 @@ export default {
       this.$api.user[api]({
         queryId: this.deptPeopleId,
         type: this.deptPeopleType,
-        lng: e.target._position[0], lat: e.target._position[1], pageSize: 5,
+        lng: e.target._position[0], lat: e.target._position[1], pageSize: 3,
         pageNum: this.personnelPageNum, ...data
       })
         .then(res => {
@@ -1168,7 +1163,7 @@ export default {
     font-size: 14px;
     cursor: pointer;
     color: rgba(0, 0, 0, 0.85);
-    width: 100%;
+    width: 144px;
     height: 100px;
     background-image: url(../../assets/user-map1.png);
     background-size: cover;

src/views/PeopleManage/vdr.vue

@@ -1,19 +1,20 @@
 <template>
-    <vdr :w="operateWidth" :h="operateHight"    :active="true"
+    <vdr :w="operateWidth"  :min-height="operateHight" :h="operateHight"    :active="true" 
     @resizing="onResize"  :x="operateX" :y="operateY"
-    @dragging="onDrag" style="z-index:999" class-name="my-class"
-        class="infohis-window">
+    @dragging="onDrag" style="z-index:999" class-name="my-class" class="infohis-window"
+        >
         <div class="close flex j-s" style="padding:15px 0" v-if="title">
             <span>{{ title }}</span>
             <div>
-                <span class="el-icon-close" style="color: #c3c3c3;cursor: pointer" @click="visiblefun"></span>
                 <span v-if="isOperate==false" style="color: #c3c3c3;font-size:18px;cursor: pointer"
                     @click="operateWidthFun()" class="el-icon-rank"> </span>
                 <span v-else style="color: #c3c3c3;font-size:18px;cursor: pointer"
                     @click="isOperate=false;operateWidth=width;operateHight=height || 'auto'" class="el-icon-top-left"> </span>
+                <span class="el-icon-close" style="color: #c3c3c3;cursor: pointer" @click="visiblefun"></span>
+
             </div>
         </div>
-        <slot></slot>
+            <slot></slot>
     </vdr>
 </template>  
 <script>
@@ -45,12 +46,17 @@ export default {
  
     methods: {
         onResize(x, y, width, height) {
+            // if(height>this.operateHight){
+
+            // }
             this.operateWidth = Math.min(window.innerWidth - x, width); // 保证宽度不超出容器宽度
             this.operateHight = Math.min(window.innerHeight - y, height); // 保证宽度不超出容器宽度
+            // console.log(height, this.operateHight,11111111);
         },
         onDrag(x, y) {
             this.operateX = x; // 更新x位置
             this.operateY = y; // 更新x位置
+
         },
         visiblefun() {
             this.$emit("visiblefun")
@@ -72,5 +78,6 @@ export default {
     font-size: 16px;
     font-weight: bold;
 }
+
 </style>
   

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; //车船税