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

config/dev.env.js

@@ -6,8 +6,8 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
 
 
-  ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  ENV_CONFIG: '"dev"',
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
@@ -18,9 +18,12 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // 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.103: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://sxzgkj.baoxianzhanggui.com/console-api"' //控制台正式服务器
+
 })
 
 

config/pre.env.js

@@ -4,7 +4,10 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
-  ENV_CONFIG:'"test"',
+  ENV_CONFIG: '"test"',
   BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL: '"http:///192.168.0.103:8080/web-api"',//测试服务器
+  CONSOLE_BASE_URL: '"https://pre.baoxianzhanggui.com/console-api"' //控制台测试服务器
+
+
 })

config/prod.env.js

@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  ENV_CONFIG:'"prod"',
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',
+  ENV_CONFIG: '"prod"',
+  BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/web-api"',
+  CONSOLE_BASE_URL: '"https://sxzgkj.baoxianzhanggui.com/console-api"' //控制台测试服务器
 }

config/test.env.js

@@ -4,6 +4,8 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
-  ENV_CONFIG:'"test"',
+  ENV_CONFIG: '"test"',
   BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台测试服务器
+
 })

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

@@ -52,6 +52,7 @@
         :tableConfig="tableConfigDetailNew"
         :data="formTableDataNew"
         @findPage="findPageNewDetail"
+        :pagination="detailPageData"
       >
       </templateTable>
       <span slot="footer" class="dialog-footer">
@@ -260,6 +261,7 @@ export default {
         isNotCar: "0",
         isNotDocumentary: "1",
       },
+
       dialogVisible: false,
       formTableData: [],
       tableConfigDetail: {
@@ -407,6 +409,7 @@ export default {
         isShowIndex: true,
         operationWidth: "130",
         tableHeight: "auto",
+        isPaginationShow: true,
         optBtns: [
           {
             type: "primary",
@@ -446,6 +449,14 @@ export default {
       findPageDetailListNew: {},
       // 记录
       dialogVisiblerecord: false,
+      detailPageData: {
+        pageNum: 1,
+        pageSize: 20,
+        agreementType: 2,
+        isNotCar: "0",
+        isNotDocumentary: "1",
+        totalSize: 0,
+      },
       tableConfigDetailrecord: {
         columns: [
           {
@@ -563,11 +574,14 @@ export default {
           completionStatus: data.settlementStatus || "0",
           partnerCompaniesId: data.partnerCompaniesId,
           isNotCar: "0",
+          pageNum: this.detailPageData.pageNum,
+          pageSize: this.detailPageData.pageSize,
         })
         .then((res) => {
           if (res.code == 200) {
-            this.formTableDataNew = res.data.content;
+            this.formTableDataNew = res.data.records;
             this.tableConfigDetailNew.loading = false;
+            this.detailPageData.totalSize = res.data.total;
           } else {
             this.tableConfigDetailNew.loading = false;
             this.$message.error(res.msg);

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

@@ -377,6 +377,7 @@ export default {
       insuredImageList: [], //被保人影像
       carCheckImageList: [], //验车照影像
       oldfileList: [], //电子保单数据
+      insOrderNo: '',   // 子订单号码
     }
   },
   created() {
@@ -614,6 +615,7 @@ export default {
           syCostsProportionStr: this.adjustFeeDescInfo.syAllFeeRate,
           auditStatus: '1',
           updateFlag: this.adjustFeeFlag ? "1" : "0",
+          insOrderNo: this.insOrderNo
         }
         this.$api.task.auditFee(subParam).then((res) => {
           if (res.code == 200) {
@@ -784,6 +786,7 @@ export default {
       let params = {
         orderNo: dy.orderno,
       }
+      this.insOrderNo = dy.orderno
       this.$api.task.feeDetail(params).then((res) => {
         if (res.code == 200) {
           res.data.kindinfo.map((ele, index) => {

src/views/Login.vue

@@ -95,6 +95,19 @@
                       @click="refreshCaptcha"
                     />
                   </el-col>
+                  <el-col :span="14">
+                    <el-form-item prop="captcha" label="">
+                      <el-select v-model="sysId">
+                        <el-option
+                          v-for="item in optionList"
+                          :key="item.id"
+                          :value="item.id"
+                          :label="item.systemName"
+                        >
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                 </el-row>
                 <el-row style="width: 100%; margin-top: 15px">
                   <el-button
@@ -143,7 +156,8 @@ import { md5 } from "@/utils/md5";
 import ThemePicker from "@/components/ThemePicker";
 import LangSelector from "@/components/LangSelector";
 import { login } from "@/api/user";
-// import CryptoJS from "crypto-js";
+import CryptoJS from "crypto-js";
+// import { getSysList } from "../http/moudules/sys";
 export default {
   name: "Login",
   inject: ["reload"],
@@ -173,6 +187,8 @@ export default {
       uuid: "",
       polling: null,
       tipVisibility: false,
+      optionList: [],
+      sysId: "",
     };
   },
   created() {
@@ -184,8 +200,15 @@ export default {
       this.rememberPassword = true;
     }
     this.enterEvent(); //初始化回车事件
+    this.getSysList();
   },
   methods: {
+    getSysList() {
+      this.$api.sys.sysDictList().then((res) => {
+        console.log(res);
+        if (res.code === 200) this.optionList = [...res.data];
+      });
+    },
     enterEvent() {
       if (this.$route.name === "登录") {
         document.onkeydown = (e) => {
@@ -212,6 +235,7 @@ export default {
             password: this.loginForm.password,
             captcha: this.loginForm.captcha.toLowerCase(),
             captchaId: this.loginForm.captchaId,
+            sysId: this.sysId,
           };
 
           // this.$store
@@ -258,9 +282,22 @@ export default {
                 } else {
                   Cookies.remove("accountInfo");
                 }
-                Cookies.set("token", res.data); // 放置token到Cookie
-                this.getDictItems();
-                this.getUser();
+                if (this.sysId === 2) {
+                  let token = CryptoJS.AES.encrypt(
+                    res.data,
+                    "token"
+                  ).toString();
+                  // console.log(token);
+                  window.location.href =
+                    process.env.CONSOLE_BASE_URL +
+                    "/#/form/agreement?token=" +
+                    token;
+                  // alert(res.data);
+                } else {
+                  Cookies.set("token", res.data); // 放置token到Cookie
+                  this.getDictItems();
+                  this.getUser();
+                }
               }
               this.loading = false;
             })

src/views/Sys/Deptall.vue

@@ -787,6 +787,8 @@ export default {
       deptDataForm: {
         deptType: "D",
         orderNum: 0,
+        name: "",
+        address: "",
       },
       deptDataRule: {
         name: [

src/views/Sys/HxOrdersCount.vue

@@ -125,15 +125,17 @@ export default {
     },
     // 导出
     handExport() {
-      // let time = undefined
-      // let createTimeStart = undefined
-      // let createTimeEnd = undefined
-      // if (this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.time) {
-      //   createTimeStart = this.$refs.templateTable.searchDataClone.time[0]
-      //   createTimeEnd = this.$refs.templateTable.searchDataClone.time[1]
-      // }
+      let time = undefined
+      let createTimeStart = undefined
+      let createTimeEnd = undefined
+      if (this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.time) {
+        createTimeStart = this.$refs.templateTable.searchDataClone.time[0]
+        createTimeEnd = this.$refs.templateTable.searchDataClone.time[1]
+      }
       // this.$api.dict.exportHxOrdersCount({...this.$refs.templateTable.searchDataClone, ...this.pageData,createTimeStart, createTimeEnd, time}).then((res) => {
         this.$api.dict.exportHxOrdersCount({
+          createTimeStart,
+          createTimeEnd,
           ids: this.selectionList
         }).then((res) => {
         if (res.code == 200) {

src/views/Task/daikeComponents/KtLetter.vue

@@ -5941,7 +5941,7 @@ export default {
             .getDrivingInsuranceRule({
               agreementId: this.totalCompanyList[index].agreement[0].id,
               seatNum:
-                ins == "永诚财险" || ins == "中煤财险" 
+                ins == "永诚财险" || ins == "中煤财险"
                   ? Number(this.carInfo.seatCount)
                   : "",
               ruleUseNature: this.carInfo.carnature,
@@ -5949,19 +5949,19 @@ export default {
               risk: this.riskList,
               kind: this.kindList,
               ruleThirdPartyInsurance: this.insureList[1].amount,
-              cimodelclass: ins == "平安财险" 
+              cimodelclass: ins == "平安财险"
                   ? this.carInfo.cimodelclass
                   : "",
-              isUseCombine:ins == "平安财险" 
+              isUseCombine:ins == "平安财险"
               ? 'Y'
               : "",
-              tonNumber:ins == "平安财险" 
+              tonNumber:ins == "平安财险"
               ? this.carInfo.limitLoad
               : "",
-              ownAttribute:ins == "平安财险" 
+              ownAttribute:ins == "平安财险"
               ? '03'
               : "",
-              useAttribute: ins == "平安财险" 
+              useAttribute: ins == "平安财险"
                   ? this.carInfo.carnature
                   : "",
             })
@@ -7331,8 +7331,8 @@ export default {
         }
       });
     },
-    
-    
+
+
     //永安报价
     yongan(num, id) {
       let isTaxSource = this.totalCompanyList[num].isTaxSource;