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

config/dev.env.js

@@ -17,8 +17,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http://192.168.0.250:8080/"',//
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
-  // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
-  BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
+  BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
+  // BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址

src/http/moudules/task.js

@@ -1841,3 +1841,13 @@ export const findOrderCompanyList = () => {
   })
 }
 
+//增加类型导入
+export const addTypeImportExcel = (data) => {
+  return axios({
+    url: "/fnc/plyFee/importDataAddType",
+    method: "post",
+    data
+  })
+}
+
+

src/http/moudules/user.js

@@ -1,3 +1,4 @@
+import { param } from 'jquery'
 import axios from '../axios'
 
 /*
@@ -170,6 +171,15 @@ export const deleteFlag = (data) => {
   })
 }
 
+// 查询修改历史  人员管理通用
+export const queryHistory = (params) => {
+  return axios({
+    url: '/user/getUserModificationRecords',
+    method: 'get',
+    params
+  })
+}
+
 
 
 // 查找用户的菜单权限标识集合

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/OptionalsolutionConfig.vue

@@ -33,7 +33,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item label="投保指引">
-                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="100"
+                  <el-input type="textarea" v-model="CustomPlanData.description" placeholder="输入投保指引" maxlength="200"
                     show-word-limit></el-input>
                 </el-form-item>
               </el-col>

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

@@ -434,6 +434,23 @@
         >
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="importVisible" title="批量导入" width="25%">
+      <el-upload
+        style="margin-bottom: 10px"
+        action="#"
+        class="upload-demo"
+        :limit="1"
+        :auto-upload="false"
+        :on-change="drivinguploadExcel"
+        ref="upload3"
+        :file-list="excelFileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-button size="small" type="primary" @click="templateDownload(1)"
+        >模板下载</el-button
+      >
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -676,6 +693,12 @@ export default {
             return this.handExport();
           },
         },
+        {
+          name: "增加类型导入",
+          click: (row, index) => {
+            return this.addTypeImport();
+          },
+        },
       ],
       tableData: [],
       pageData: {
@@ -965,6 +988,8 @@ export default {
         isPaginationShow: true,
       },
       addTypeList: [],
+      importVisible: false,
+      excelFileList: [],
     };
   },
   created() {
@@ -1023,6 +1048,37 @@ export default {
     });
   },
   methods: {
+    drivinguploadExcel(file, fileList) {
+      this.progressPercent = 0;
+      const params = new FormData(); // 声明formData数据类型
+
+      params.append("file", file.raw);
+      params.append("type", "2");
+
+      this.$api.task.addTypeImportExcel(params).then((res) => {
+        if (res.code == "200") {
+          this.excelFileList = fileList;
+          this.progressPercent = 100;
+          this.findPage();
+          this.importVisible = false;
+        } else {
+          this.excelFileList = [];
+          this.progressPercent = 0;
+          this.$message.error(res.msg);
+          this.findPage();
+        }
+      });
+    },
+    //增加类型批量导入
+    addTypeImport() {
+      this.importVisible = true;
+      this.excelFileList = [];
+    },
+    templateDownload() {
+      let a = document.createElement("a");
+      a.href = `${process.env.BASE_URL}/template/js/cxgd.xls`;
+      a.click();
+    },
     haldDelete(row) {
       this.$confirm("是否确认删除?", "提示", {
         confirmButtonText: "确定",
@@ -1509,6 +1565,9 @@ export default {
 </script>
 
 <style scoped>
+.upload-demo {
+  /* display: inline-block; */
+}
 .avatar {
   border: 1px dashed #d9d9d9;
   padding: 5px;

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

@@ -467,6 +467,23 @@
       >
       </el-progress>
     </el-dialog>
+    <el-dialog :visible.sync="importVisible" title="批量导入" width="25%">
+      <el-upload
+        style="margin-bottom: 10px"
+        action="#"
+        class="upload-demo"
+        :limit="1"
+        :auto-upload="false"
+        :on-change="drivinguploadExcel"
+        ref="upload4"
+        :file-list="excelFileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-button size="small" type="primary" @click="templateDownload(1)"
+        >模板下载</el-button
+      >
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -485,6 +502,7 @@ export default {
   },
   data() {
     return {
+      excelFileList: [],
       confirmDisabled: false,
       riskcodeList: [],
       formListbatch: [
@@ -997,7 +1015,14 @@ export default {
             return this.handExport();
           },
         },
+        {
+          name: "增加类型导入",
+          click: (row, index) => {
+            return this.addTypeImport();
+          },
+        },
       ],
+      importVisible: false,
       tableData: [],
       dialogVisible: false,
       pageData: {
@@ -1082,6 +1107,32 @@ export default {
     });
   },
   methods: {
+    drivinguploadExcel(file, fileList) {
+      this.progressPercent = 0;
+      const params = new FormData(); // 声明formData数据类型
+
+      params.append("file", file.raw);
+      params.append("type", "1");
+
+      this.$api.task.addTypeImportExcel(params).then((res) => {
+        if (res.code == "200") {
+          this.excelFileList = fileList;
+          this.progressPercent = 100;
+          this.findPage();
+          this.importVisible = false;
+        } else {
+          this.excelFileList = [];
+          this.progressPercent = 0;
+          this.$message.error(res.msg);
+          this.findPage();
+        }
+      });
+    },
+    //增加类型批量导入
+    addTypeImport() {
+      this.importVisible = true;
+      this.excelFileList = [];
+    },
     agrmentlist() {
       this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
@@ -1519,10 +1570,16 @@ export default {
     handleSearchListbatch(data) {
       this.findPagegbatch(data);
     },
-    templateDownload() {
-      let a = document.createElement("a");
-      a.href = `${process.env.BASE_URL}/template/handlingFeeTemplate.xlsx`;
-      a.click();
+    templateDownload(type) {
+      if (type != 1) {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/handlingFeeTemplate.xlsx`;
+        a.click();
+      } else {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/js/cxsxf.xls`;
+        a.click();
+      }
     },
     haldUpload(row) {
       this.formDataId = row.id;
@@ -1560,6 +1617,9 @@ export default {
 </script>
 
 <style scoped>
+.upload-demo {
+  /* display: inline-block; */
+}
 .customStyle {
   margin-bottom: 20px;
   font-size: 14px;

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

@@ -398,6 +398,23 @@
         >
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="importVisible" title="批量导入" width="25%">
+      <el-upload
+        style="margin-bottom: 10px"
+        action="#"
+        class="upload-demo"
+        :limit="1"
+        :auto-upload="false"
+        :on-change="drivinguploadExcel"
+        ref="upload3"
+        :file-list="excelFileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-button size="small" type="primary" @click="templateDownload(1)"
+        >模板下载</el-button
+      >
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -638,7 +655,14 @@ export default {
             return this.handExport();
           },
         },
+        {
+          name: "增加类型导入",
+          click: (row, index) => {
+            return this.addTypeImport();
+          },
+        },
       ],
+      importVisible: false,
       tableData: [],
       pageData: {
         pageNum: 1,
@@ -880,6 +904,7 @@ export default {
         },
       ],
       addTypeList: [],
+      excelFileList: [],
     };
   },
   created() {
@@ -929,6 +954,37 @@ export default {
     });
   },
   methods: {
+    drivinguploadExcel(file, fileList) {
+      this.progressPercent = 0;
+      const params = new FormData(); // 声明formData数据类型
+
+      params.append("file", file.raw);
+      params.append("type", "4");
+
+      this.$api.task.addTypeImportExcel(params).then((res) => {
+        if (res.code == "200") {
+          this.excelFileList = fileList;
+          this.progressPercent = 100;
+          this.findPage();
+          this.importVisible = false;
+        } else {
+          this.excelFileList = [];
+          this.progressPercent = 0;
+          this.$message.error(res.msg);
+          this.findPage();
+        }
+      });
+    },
+    //增加类型批量导入
+    addTypeImport() {
+      this.importVisible = true;
+      this.excelFileList = [];
+    },
+    templateDownload() {
+      let a = document.createElement("a");
+      a.href = `${process.env.BASE_URL}/template/js/fcgd.xls`;
+      a.click();
+    },
     haldDelete(row) {
       this.$confirm("是否确认删除?", "提示", {
         confirmButtonText: "确定",
@@ -1392,6 +1448,9 @@ export default {
 </script>
 
 <style scoped>
+.upload-demo {
+  /* display: inline-block; */
+}
 .avatar {
   border: 1px dashed #d9d9d9;
   padding: 5px;

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

@@ -441,6 +441,23 @@
         >
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="importVisible" title="批量导入" width="25%">
+      <el-upload
+        style="margin-bottom: 10px"
+        action="#"
+        class="upload-demo"
+        :limit="1"
+        :auto-upload="false"
+        :on-change="drivinguploadExcel"
+        ref="upload4"
+        :file-list="excelFileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-button size="small" type="primary" @click="templateDownload(1)"
+        >模板下载</el-button
+      >
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -458,6 +475,7 @@ export default {
   },
   data() {
     return {
+      excelFileList: [],
       confirmDisabled: false,
       rulesAdd: {
         agreeId: [
@@ -907,7 +925,15 @@ export default {
             return this.handExport();
           },
         },
+        {
+          name: "增加类型导入",
+          click: (row, index) => {
+            return this.addTypeImport();
+          },
+        },
       ],
+      importVisible: false,
+
       tableData: [],
       selectionList: [],
       dialogVisible: false,
@@ -988,6 +1014,32 @@ export default {
     this.agrmentlist();
   },
   methods: {
+    drivinguploadExcel(file, fileList) {
+      this.progressPercent = 0;
+      const params = new FormData(); // 声明formData数据类型
+
+      params.append("file", file.raw);
+      params.append("type", "3");
+
+      this.$api.task.addTypeImportExcel(params).then((res) => {
+        if (res.code == "200") {
+          this.excelFileList = fileList;
+          this.progressPercent = 100;
+          this.findPage();
+          this.importVisible = false;
+        } else {
+          this.excelFileList = [];
+          this.progressPercent = 0;
+          this.$message.error(res.msg);
+          this.findPage();
+        }
+      });
+    },
+    //增加类型批量导入
+    addTypeImport() {
+      this.importVisible = true;
+      this.excelFileList = [];
+    },
     // 编辑
     editBtn(row) {
       this.formDataEdit = {
@@ -1277,10 +1329,16 @@ export default {
         createTimeEnd,
       });
     },
-    templateDownload() {
-      let a = document.createElement("a");
-      a.href = `${process.env.BASE_URL}/template/noHandlingFeeTemplate.xlsx`;
-      a.click();
+    templateDownload(type) {
+      if (type != 1) {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/noHandlingFeeTemplate.xlsx`;
+        a.click();
+      } else {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/js/fcsxf.xls`;
+        a.click();
+      }
     },
     //列表数据
     findPage(data) {
@@ -1429,6 +1487,9 @@ export default {
 </script>
 
 <style scoped>
+.upload-demo {
+  /* display: inline-block; */
+}
 .customStyle {
   margin-bottom: 20px;
   font-size: 14px;

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

@@ -881,6 +881,23 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+    <el-dialog :visible.sync="importVisible" title="批量导入" width="25%">
+      <el-upload
+        style="margin-bottom: 10px"
+        action="#"
+        class="upload-demo"
+        :limit="1"
+        :auto-upload="false"
+        :on-change="drivinguploadExcel"
+        ref="upload3"
+        :file-list="excelFileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+      </el-upload>
+      <el-button size="small" type="primary" @click="templateDownload(1)"
+        >模板下载</el-button
+      >
+    </el-dialog>
   </div>
 </template>
   <script>
@@ -900,6 +917,7 @@ export default {
   },
   data() {
     return {
+      excelFileList: [],
       dialogVisibleradio: false,
       tableDataRadio: {},
       fileListRadio: [],
@@ -1066,6 +1084,12 @@ export default {
             return this.handExport();
           },
         },
+        {
+          name: "增加类型导入",
+          click: (row, index) => {
+            return this.addTypeImport();
+          },
+        },
       ],
       tableConfig: {
         columns: [
@@ -1451,6 +1475,7 @@ export default {
         ],
       },
       addTypeList: [],
+      importVisible: false,
     };
   },
 
@@ -1505,6 +1530,32 @@ export default {
   },
 
   methods: {
+    drivinguploadExcel(file, fileList) {
+      this.progressPercent = 0;
+      const params = new FormData(); // 声明formData数据类型
+
+      params.append("file", file.raw);
+      params.append("type", "5");
+
+      this.$api.task.addTypeImportExcel(params).then((res) => {
+        if (res.code == "200") {
+          this.excelFileList = fileList;
+          this.progressPercent = 100;
+          this.findPage();
+          this.importVisible = false;
+        } else {
+          this.excelFileList = [];
+          this.progressPercent = 0;
+          this.$message.error(res.msg);
+          this.findPage();
+        }
+      });
+    },
+    //增加类型批量导入
+    addTypeImport() {
+      this.importVisible = true;
+      this.excelFileList = [];
+    },
     //重置表单查询信息
     handleResetForm() {
       this.formData = {};
@@ -1658,10 +1709,17 @@ export default {
           }
         });
     },
-    templateDownload() {
-      let a = document.createElement("a");
-      a.href = `${process.env.BASE_URL}/template/SettlementTemplate.xlsx`;
-      a.click();
+
+    templateDownload(type) {
+      if (type != 1) {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/SettlementTemplate.xlsx`;
+        a.click();
+      } else {
+        let a = document.createElement("a");
+        a.href = `${process.env.BASE_URL}/template/js/ptjs.xls`;
+        a.click();
+      }
     },
     selectionChange(row) {
       this.selectionList = [];
@@ -1986,7 +2044,7 @@ export default {
   display: none;
 }
 .upload-demo {
-  display: inline-block;
+  // display: inline-block;
 }
 .inputType {
   width: 180px;

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

@@ -137,6 +137,27 @@
           >
         </template>
       </el-table-column>
+      <el-table-column
+        prop="checkType"
+        label="审核方式"
+        align="center"
+        width="100"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            v-if="scope.row.checkType == '2'"
+            type="success"
+            size="small"
+            >自动审核</el-tag
+          >
+          <el-tag
+            v-if="scope.row.checkType == '1'"
+            type="warning"
+            size="small"
+            >人工审核</el-tag
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         prop="auditUser"
         label="审核人"
@@ -483,6 +504,29 @@ export default {
           type: 'input',
           Retained: true,
         },
+        {
+          name: 'checkType',
+          label: '审核方式',
+          type: "select",
+          optionsIabel: "label",
+          optionsValue: "value",
+          options: [
+            {
+              label: "人工审核",
+              value: "1",
+            },
+            {
+              label: "自动审核",
+              value: "2",
+            },
+          ],
+        },
+        {
+          name: 'checkUser',
+          label: '审核人',
+          type: 'input',
+          Retained: true,
+        },
       ],
       orderInfo: {
         //选中的订单

src/views/Login.vue

@@ -159,18 +159,18 @@ import { login } from "@/api/user";
 import CryptoJS from "crypto-js";
 // import { getSysList } from "../http/moudules/sys";
 
-import { sendWebsocket,closeWebsocket  } from '@/utils/websocket.js'
+import { sendWebsocket, closeWebsocket } from "@/utils/websocket.js";
 import {
   getUserIP,
   getUserLocation,
-  getAddressLocation
+  getAddressLocation,
 } from "@/utils/ipAndAddress.js";
 export default {
   name: "Login",
   inject: ["reload"],
   components: {
     ThemePicker,
-    LangSelector
+    LangSelector,
   },
   data() {
     return {
@@ -182,12 +182,12 @@ export default {
         account: "",
         password: "",
         captcha: "",
-        src: ""
+        src: "",
       },
       fieldRules: {
         account: [{ required: true, message: "请输入账号", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }]
+        captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }],
       },
       checked: true,
       toggleQrCode: false,
@@ -197,7 +197,7 @@ export default {
       optionList: [],
       sysId: null,
       systemType: "1", //系统类型
-      addressInfo: {} //当前登录信息
+      addressInfo: {}, //当前登录信息
     };
   },
   created() {
@@ -213,7 +213,7 @@ export default {
   },
   methods: {
     getSysList() {
-      this.$api.sys.sysDictList().then(res => {
+      this.$api.sys.sysDictList().then((res) => {
         if (res.code === 200) {
           this.optionList = [...res.data];
           this.sysId = res.data && res.data.length > 0 && res.data[0].id;
@@ -222,7 +222,7 @@ export default {
     },
     enterEvent() {
       if (this.$route.name === "登录") {
-        document.onkeydown = e => {
+        document.onkeydown = (e) => {
           const url = e.target.baseURI.match(/login/);
           if (e.keyCode == 13 && url.includes("login")) {
             this.login();
@@ -231,7 +231,6 @@ export default {
       }
     },
     login(formName) {
-      
       // let token = CryptoJS.AES.encrypt(
       //   "2856c49f-7b34-4e83-b3c8-2c37dba7cb3b",
       //   "token"
@@ -239,7 +238,7 @@ export default {
       // console.log(token);
       // window.location.href =
       //   "http://localhost:8080/#/form/agreement?token=" + token;
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.loading = true;
           let userInfo = {
@@ -247,7 +246,7 @@ export default {
             password: this.loginForm.password,
             captcha: this.loginForm.captcha.toLowerCase(),
             captchaId: this.loginForm.captchaId,
-            sysId: this.sysId
+            sysId: this.sysId,
             // systemType: this.systemType
           };
 
@@ -275,12 +274,12 @@ export default {
 
           this.$api.login
             .login2(userInfo)
-            .then(res => {
+            .then((res) => {
               if (res.code != 200) {
                 this.$message({
                   message: res.msg,
                   type: "error",
-                  duration: 2000
+                  duration: 2000,
                 });
                 if (res.code == 500 && res.msg == "验证码不正确") {
                   this.refreshCaptcha();
@@ -290,7 +289,7 @@ export default {
                   //是否保存密码
                   Cookies.set("accountInfo", {
                     account: this.loginForm.account,
-                    password: this.loginForm.password
+                    password: this.loginForm.password,
                   });
                 } else {
                   Cookies.remove("accountInfo");
@@ -302,36 +301,35 @@ export default {
                   ).toString();
 
                   window.location.href =
-                    process.env.CONSOLE_BASE_URL +
-                    "/#/agreement/index?token=" +
-                    token;
+                    process.env.CONSOLE_BASE_URL + "/#/index?token=" + token;
                   // alert(res.data);
                 } else {
                   this.getUser();
                   Cookies.set("token", res.data); // 放置token到Cookie
                   // this.submitLocation();
                   this.getDictItems();
-                  setTimeout(()=>{
-                    let userId=sessionStorage.getItem("user")
-                    let data={
-                    ...this.addressInfo,
-                    userId,
-                    systemType:this.systemType
-                  }
-                  sendWebsocket(`${process.env.SOCKET_Url}/pcWebsocket/${userId}`,data)
-                  // sendWebsocket(`/pcWebsocket/${userId}`,data)
-                  },1000)
-                  
-
+                  setTimeout(() => {
+                    let userId = sessionStorage.getItem("user");
+                    let data = {
+                      ...this.addressInfo,
+                      userId,
+                      systemType: this.systemType,
+                    };
+                    sendWebsocket(
+                      `${process.env.SOCKET_Url}/pcWebsocket/${userId}`,
+                      data
+                    );
+                    // sendWebsocket(`/pcWebsocket/${userId}`,data)
+                  }, 1000);
                 }
               }
               this.loading = false;
             })
-            .catch(res => {
+            .catch((res) => {
               this.$message({
                 message: res.message,
                 type: "error",
-                duration: 2000
+                duration: 2000,
               });
             });
         } else {
@@ -343,13 +341,13 @@ export default {
     submitLocation() {
       let location = {
         systemType: this.systemType,
-        ...this.addressInfo
+        ...this.addressInfo,
       };
-      this.$api.login.uploadLocationInfo(location).then(res => {
+      this.$api.login.uploadLocationInfo(location).then((res) => {
         if (res.code !== 200) {
           this.$message({
             message: res.msg,
-            type: "error"
+            type: "error",
           });
         }
       });
@@ -358,11 +356,11 @@ export default {
     getDictItems() {
       //--数据字典--
       // 性别
-      this.$api.dict.findByLableName("sex").then(response => {
+      this.$api.dict.findByLableName("sex").then((response) => {
         localStorage.setItem("sexOptions", JSON.stringify(response.data)); // 保存用户到本地会话
       });
       // 状态
-      this.$api.dict.findByLableName("user_status").then(response => {
+      this.$api.dict.findByLableName("user_status").then((response) => {
         localStorage.setItem(
           "user_statusoptions",
           JSON.stringify(response.data)
@@ -371,7 +369,7 @@ export default {
     },
     // 用户信息
     getUser() {
-      this.$api.user.getLoginUser().then(response => {
+      this.$api.user.getLoginUser().then((response) => {
         if (response.code == 200) {
           //头像地址拼接
           if (
@@ -394,7 +392,7 @@ export default {
           this.$message.error(response.msg);
         }
       });
-      this.$api.role.findAll().then(res => {
+      this.$api.role.findAll().then((res) => {
         localStorage.setItem("find_all", JSON.stringify(res.data));
       });
     },
@@ -412,7 +410,7 @@ export default {
       this.$refs.loginForm.resetFields();
     },
     // 切换主题
-    onThemeChange: function(themeColor) {
+    onThemeChange: function (themeColor) {
       this.$store.commit("setThemeColor", themeColor);
     },
     switchLogin() {
@@ -429,14 +427,14 @@ export default {
       let url = process.env.BASE_URL + "/scanQrCode?uuid=" + uuid;
       this.$nextTick(() => {
         this.creatQrCode(url);
-        this.$api.login.getQRCode(uuid).then(res => {
+        this.$api.login.getQRCode(uuid).then((res) => {
           this.uuid = res.data.uuid;
           this.startPolling();
         });
       });
     },
     checkScanStatus() {
-      this.$api.login.QrCodeStatusQuery(this.uuid).then(res => {
+      this.$api.login.QrCodeStatusQuery(this.uuid).then((res) => {
         if (res.data.statusCode == 20000) {
           this.tipVisibility = true;
           this.loadingCode = true;
@@ -477,10 +475,10 @@ export default {
           height: 200,
           colorDark: "#000000",
           colorLight: "#ffffff",
-          correctLevel: QRCode.CorrectLevel.H
+          correctLevel: QRCode.CorrectLevel.H,
         });
       }
-    }
+    },
   },
 
   beforeDestroy() {
@@ -490,22 +488,22 @@ export default {
   mounted() {
     this.refreshCaptcha();
     /**获取当前登录的ip地址 */
-    getUserIP(ip => {
-      getAddressLocation(ip, info => {
-        console.log(info,22222222222);
+    getUserIP((ip) => {
+      getAddressLocation(ip, (info) => {
+        console.log(info, 22222222222);
         this.addressInfo = info;
       });
     });
   },
   computed: {
     ...mapState({
-      themeColor: state => state.app.themeColor
-    })
+      themeColor: (state) => state.app.themeColor,
+    }),
   },
   //销毁函数
   destroyed() {
     document.onkeydown = null;
-  }
+  },
 };
 </script>
 

src/views/PeopleManage/UserMap.vue

@@ -323,7 +323,7 @@ export default {
               this.positionType = res.data.positionRecordList[0].type
             _this.positionData = res.data.positionRecordList.map(item => ({
               userName: item.userName,
-                  id: item.id,
+                  id: item.userId,
                   address: item.address,
                   onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
                   // status: item.status ? "在线" : "离线",

src/views/Task/daikeComponents/KtLetter1.vue

@@ -1129,7 +1129,7 @@
                             <div class="table-list-line" style="border-right: none; padding-left: 0;" v-show="reslistitem.programme.description != '单交'">
                               <span style="margin-left: 0; font-size: 10px;">商业险</span>
                             </div>
-                            <div class="table-list-line table-list-line-last" style="border-right: none; padding-left: 0;" v-show="reslistitem.result.noExportFee">
+                            <div class="table-list-line table-list-line-last" style="border-right: none; padding-left: 0;" v-show="reslistitem.result.jyPremium">
                               <span style="margin-left: 0; font-size: 10px;">驾意险</span>
                             </div>
                           </div>
@@ -1140,7 +1140,7 @@
                             <div class="table-list-line" style="border-right: none;" v-show="reslistitem.programme.description != '单交'">
                               <span style="margin-left: 0;">{{ reslistitem.result.syExportFee ? reslistitem.result.syExportRadio : '无' }}</span>
                             </div>
-                            <div class="table-list-line table-list-line-last" style="border-right: none;"  v-show="reslistitem.result.noExportFee">
+                            <div class="table-list-line table-list-line-last" style="border-right: none;"  v-show="reslistitem.result.jyPremium">
                               <span style="margin-left: 0;">{{ reslistitem.result.noExportRadio }}</span>
                             </div>
                           </div>
@@ -1151,7 +1151,7 @@
                             <div class="table-list-line"  v-show="reslistitem.programme.description != '单交'">
                               <span style="margin-left: 0;">{{ reslistitem.result.syExportFee ? reslistitem.result.syExportFee : '无' }}</span>
                             </div>
-                            <div class="table-list-line table-list-line-last" v-show="reslistitem.result.noExportFee">
+                            <div class="table-list-line table-list-line-last" v-show="reslistitem.result.jyPremium">
                               <span style="margin-left: 0;">{{ reslistitem.result.noExportFee ? reslistitem.result.noExportFee : '无' }}</span>
                             </div>
                           </div>
@@ -1176,7 +1176,7 @@
                             <div class="table-list-line" style="border-right: none; padding-left: 0;" v-show="reslistitem.programme.description != '单交'">
                               <span style="margin-left: 0; font-size: 10px;">商业险</span>
                             </div>
-                            <div class="table-list-line table-list-line-last" style="border-right: none; padding-left: 0;" v-show="reslistitem.result.noExportFee">
+                            <div class="table-list-line table-list-line-last" style="border-right: none; padding-left: 0;" v-show="reslistitem.result.jyPremium">
                               <span style="margin-left: 0; font-size: 10px;">驾意险</span>
                             </div>
                           </div>
@@ -1376,7 +1376,7 @@
                         " v-show="reslistitem.quoteCode == '200' &&
                         !('editStatus' in reslistitem.result)
                         " type="text" size="small" style="color: #2d4d89; font-size: 14px"
-                        @click="hbsubmitdialog(reslistitem)">下单</el-button>
+                        @click="hbsubmitdialog(reslistitem, reslistindex)">下单</el-button>
                       <el-button v-show="reslistitem.quoteCode == '200'" type="text" size="small"
                         style="color: #2d4d89; font-size: 14px"
                         @click="qoutedetail(reslistitem.result.companyId)">查看详情</el-button>
@@ -3615,7 +3615,7 @@
                       </el-select>
                     </el-col>
                   </el-row>
-                  <el-table v-if="item.tableData" :data="item.tableData" border style="width: 100%; margin-top: 20px;" stripe
+                  <el-table v-if="item.tableData && item.tableData.length" :data="item.tableData" border style="width: 100%; margin-top: 20px;" stripe
                     header-cell-class-name="table-header">
                     <el-table-column prop="name" label="保险责任" align="center">
                       <template slot-scope="scope">
@@ -3730,7 +3730,7 @@
     </el-dialog>
 
     <!-- 驾意险 -->
-    <el-dialog title="调整险种" :visible.sync="addYiwaiDialogVisible" width="60%" top="5vh"
+    <el-dialog title="驾意险" :visible.sync="addYiwaiDialogVisible" width="60%" top="5vh"
     :before-close="handleCloseAddYiwai" class="addyiwai">
       <div class="typedialog-style">
         <el-card>
@@ -5984,6 +5984,7 @@ export default {
       })
       this.totalCompanyList[this.typeDialogIndex].zxProgramme.drivingList = arr;
       this.totalCompanyList[this.typeDialogIndex].programme.drivingList = arr
+      console.log(arr, 'arr')
       this.handleCloseAddYiwai()
     },
     // 驾意输入框按钮
@@ -6010,12 +6011,11 @@ export default {
     },
     // 选中驾意
     handleChangeSelect(index) {
-      console.log(index)
       if (this.totalCompanyList[this.typeDialogIndex].cnName == 'zijin') {
         this.checkList[index].tableData = []
         this.checkList[index].detail.forEach((val) => {
           this.checkList[index].selectList.forEach((value) => {
-            if (val.projectName == value) {
+            if (val.alias == value) {
               this.checkList[index].tableData.push(val)
               this.$forceUpdate()
             }
@@ -7555,7 +7555,22 @@ export default {
     //紫金特约选择
     zijinengageChange(select, row) {
       this.zijinengageList = [];
-      this.totalCompanyList[this.typeDialogIndex].zxProgramme.teyue = []
+      if (!this.totalCompanyList[this.typeDialogIndex].zxProgramme) {
+        this.totalCompanyList[this.typeDialogIndex].zxProgramme = {       // 自选方案详情
+          description: '',
+          drivingList: [],
+          jqx: {
+            name: '交通事故强制责任险'
+          },
+          kinds: {
+            additional: [],
+            main: [],
+            service: []
+          },
+          teyue: [],
+        }
+      }
+      // this.totalCompanyList[this.typeDialogIndex].programme = {}
       this.totalCompanyList[this.typeDialogIndex].programme.teyue = []
       select.map((val) => {
         this.zijinengageList.push({
@@ -10315,8 +10330,9 @@ export default {
         }
       });
     },
-
-    hbsubmitdialog(data) {
+  
+    hbsubmitdialog(data, index) {
+      this.typeDialogIndex = index     // 当前的公司index
       if (this.imageList1.length == 0 && this.imageList2.length == 0) {
         this.$message({ message: "影像不全，先上传影像", type: "error" });
         return;
@@ -10593,6 +10609,7 @@ export default {
                           companyId: this.companyId,
                           engageList: this.zijinengageList,
                         })
+                        
                         .then((res) => {
                           if (res.code == "200") {
                             loading.close();
@@ -12131,7 +12148,7 @@ export default {
       this.syendDate = this.jqendDate;
     },
     add() {
-      this.obtainProtocol();
+      // this.obtainProtocol();
       if (this.isLetter == "1") {
         this.$router.push({ path: "/letter/letter" });
       }
@@ -12164,35 +12181,35 @@ export default {
         this.bbtbcarShow = true //被保人同投保人
         // this.$refs.imageDialog.emptyList()
         this.imageList1 = [];
-            this.imageList2 = [];
-            this.imageList3 = [];
-            this.imageList4 = [];
-            this.imageList5 = [];
-            this.imageList6 = [];
-            this.imgList1 = [];
-            this.imgList2 = [];
-            this.imgList3 = [];
-            this.imgList4 = [];
-            this.imgList5 = [];
-            this.imgList6 = [];
-            this.imgList7 = [];
-            this.imgList8 = [];
-            this.imgList9 = [];
-            this.imgList10 = [];
-            this.imgList11 = [];
-            this.imgList12 = [];
-            this.imgList13 = [];
-            this.imgList14 = [];
-            this.imgList15 = [];
-            this.imgList16 = [];
-            this.imgList17 = [];
-            this.imgList18 = [];
-            this.imgList19 = [];
-            this.imgList20 = [];
-            this.imgList21 = [];
-            this.imgList22 = [];
-            this.imgList23 = [];
-            this.imgList24 = [];
+        this.imageList2 = [];
+        this.imageList3 = [];
+        this.imageList4 = [];
+        this.imageList5 = [];
+        this.imageList6 = [];
+        this.imgList1 = [];
+        this.imgList2 = [];
+        this.imgList3 = [];
+        this.imgList4 = [];
+        this.imgList5 = [];
+        this.imgList6 = [];
+        this.imgList7 = [];
+        this.imgList8 = [];
+        this.imgList9 = [];
+        this.imgList10 = [];
+        this.imgList11 = [];
+        this.imgList12 = [];
+        this.imgList13 = [];
+        this.imgList14 = [];
+        this.imgList15 = [];
+        this.imgList16 = [];
+        this.imgList17 = [];
+        this.imgList18 = [];
+        this.imgList19 = [];
+        this.imgList20 = [];
+        this.imgList21 = [];
+        this.imgList22 = [];
+        this.imgList23 = [];
+        this.imgList24 = [];
       // 清空保险公司选中的意外险
       this.zijintemplateSelection = "";
       this.zhongantemplateSelection = "";
@@ -12209,7 +12226,7 @@ export default {
         allQuantity: "1",
         quantity: "1",
       };
-
+      this.productId = ''
       this.hengbangaccidentalDrivingVo = {};
       this.huanongaccidentalDrivingVo = {};
       this.taipingaccidentalDrivingVo = {};

src/views/Task/daikeComponents/KtOrder.vue

@@ -1294,16 +1294,29 @@ export default {
     },
     // 撤销二维码
     revokeCode(id) {
-      this.$api.letter.getRevokeQrCode(id).then((res) => {
-        if (res.code == 200) {
-          this.$message({
-            message: res.msg,
-            type: "success",
+      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.quotationhistorydialogVisible ? this.RadioHistoryChange() : "";
+              this.findPage();
+            }
           });
-          this.quotationhistorydialogVisible ? this.RadioHistoryChange() : "";
-          this.findPage();
-        }
-      });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消撤销二维码'
+          });          
+        });
+
+      
     },
     bjdpreview(companyId, userId) {
       let params = {