lihongxiao преди 2 години
родител
ревизия
6e70698de1
променени са 4 файла, в които са добавени 69 реда и са изтрити 79 реда
  1. 2 2
      config/dev.env.js
  2. 0 0
      src/assets/js/yongchengData.js
  3. 67 57
      src/views/Letter/Letter.vue
  4. 0 20
      src/views/Letter/Orderlist.vue

+ 2 - 2
config/dev.env.js

@@ -5,9 +5,9 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
   // BASE_URL:'"http://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  BASE_URL: '"http://192.168.0.111:8080/"' //大哥
+  // BASE_URL: '"http://192.168.0.111:8080/"' //大哥
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
 })
 

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/assets/js/yongchengData.js


+ 67 - 57
src/views/Letter/Letter.vue

@@ -283,6 +283,11 @@
               <el-input v-model="ownerInfo.email" placeholder="请输入电子邮箱"></el-input>
             </el-form-item>
           </el-col>
+          <!-- <el-col :xs="xscell" :sm="smcell" :md="mdcell" :lg="lgcell" :xl="xlcell">
+            <el-form-item label="省市区:">
+              <el-cascader v-model="ownerInfo.provinceData" :options="areaOption" :props="{ value: 'code',label: 'name',children: 'sub'}"></el-cascader>
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
     </div>
@@ -451,6 +456,7 @@
               <el-input v-model="insuredPersonInfo.email" placeholder="请输入电子邮箱"></el-input>
             </el-form-item>
           </el-col>
+          
         </el-row>
       </el-form>
     </div>
@@ -1745,6 +1751,7 @@ import Cookies from "js-cookie";
 import CommonUtil from "@/utils/comutil.js";
 import { getAgeByIdCard, searchkey, addressCode } from "@/utils/validate.js";
 import citydata from "@/assets/js/citydata.js";
+import  yongchengData from '../../assets/js/yongchengData';
 import { regionData, codeToText } from "element-china-area-data";
 export default {
   inject: ["reload"],
@@ -1773,6 +1780,7 @@ export default {
       }
     };
     return {
+      areaOption:yongchengData.data,
       formInline: {},
       xlcell: 6,
       lgcell: 12,
@@ -1780,9 +1788,9 @@ export default {
       smcell: 24,
       xscell: 24,
       areaOptions: regionData,
-      selectedOptions1: [],
-      selectedOptions2: [],
-      selectedOptions3: [],
+      // selectedOptions1: [],
+      // selectedOptions2: [],
+      // selectedOptions3: [],
       // ------------紫金意外险
       ziJinInsuranceData: [],
       accidentalDrivingVo: [],
@@ -1940,9 +1948,9 @@ export default {
         mobile: "",
         identifyValidDate: "", //有效期起期
         identifyValidEndDate: "", //有效期止期
-        province: "",//省
-        city: "",//市
-        county: "",//县
+        // province: "",//省
+        // city: "",//市
+        // county: "",//县
       },
       riskList: [], //险种大类信息
       kindList: [], //商业险险别
@@ -1957,9 +1965,10 @@ export default {
         mobile: "", //电话
         identifyValidDate: "", //有效期起期
         identifyValidEndDate: "", //有效期止期
-        province: "",//省
-        city: "",//市
-        county: "",//县
+        // province: "",//省
+        // city: "",//市
+        // county: "",//县
+        provinceData:[], //省市区
       },
       policyHolderInfo: {
         //投保人
@@ -1972,9 +1981,10 @@ export default {
         mobile: "", //电话
         identifyValidDate: "", //有效期起期
         identifyValidEndDate: "", //有效期止期
-        province: "",//省
-        city: "",//市
-        county: "",//县
+        // province: "",//省
+        // city: "",//市
+        // county: "",//县
+        provinceData:[], //省市区
       },
       insuredPersonInfo: {
         //被保人
@@ -1987,9 +1997,10 @@ export default {
         mobile: "", //电话
         identifyValidDate: "", //有效期起期
         identifyValidEndDate: "", //有效期止期
-        province: "",//省
-        city: "",//市
-        county: "",//县
+        provinceData:[], //省市区
+        // province: "",//省
+        // city: "",//市
+        // county: "",//县
       },
       //车船税form
       vehicleAndVesselTaxForm: {
@@ -3090,27 +3101,27 @@ export default {
     }
     },
     //身份证前六位识别地区
-    getAreaByCode(code) {
-      let list = regionData;
-      let provinceCode = code.substring(0, 2);
-      let cityCode = code.substring(0, 4);
-      let areaCode = code.substring(0, 6);
-      // 获取省份信息
-      let province = list.filter(function (item) {
-        return item.value === provinceCode;
-      });
-      // 获取城市信息
-      let city = province[0].children.filter(function (item) {
-        return item.value === cityCode;
-      });
-      if (city.length > 0) {
-        // 获取区/县信息
-        let area = city[0].children.filter(function (item) {
-          return item.value === areaCode;
-        });
-        return province[0].label + city[0].label + area[0].label;
-      }
-    },
+    // getAreaByCode(code) {
+    //   let list = regionData;
+    //   let provinceCode = code.substring(0, 2);
+    //   let cityCode = code.substring(0, 4);
+    //   let areaCode = code.substring(0, 6);
+    //   // 获取省份信息
+    //   let province = list.filter(function (item) {
+    //     return item.value === provinceCode;
+    //   });
+    //   // 获取城市信息
+    //   let city = province[0].children.filter(function (item) {
+    //     return item.value === cityCode;
+    //   });
+    //   if (city.length > 0) {
+    //     // 获取区/县信息
+    //     let area = city[0].children.filter(function (item) {
+    //       return item.value === areaCode;
+    //     });
+    //     return province[0].label + city[0].label + area[0].label;
+    //   }
+    // },
     //--数据字典 begin --
     getDicType(type) {
       this.$api.insCompany.dicType(type).then(res => {
@@ -3125,14 +3136,14 @@ export default {
       this[info].age = getAgeByIdCard(this[info].identifyNumber)
     },
     //省市区
-    areahandleChange(event, info) {
-      console.log(event)
-      if (event[0] != null && event[1] != null && event[2] != null) {
-        this[info].province = codeToText[event[0]]
-        this[info].city = codeToText[event[1]]
-        this[info].county = codeToText[event[2]]
-      }
-    },
+    // areahandleChange(event, info) {
+    //   console.log(event)
+    //   if (event[0] != null && event[1] != null && event[2] != null) {
+    //     this[info].province = codeToText[event[0]]
+    //     this[info].city = codeToText[event[1]]
+    //     this[info].county = codeToText[event[2]]
+    //   }
+    // },
     iconfftter(icon) {
       return CommonUtil.getDataName({
         dataList: this.global.insCompanyList,
@@ -3213,7 +3224,7 @@ export default {
               this.sychecked = true;
               this.systartDate = ele.startDate;
               this.syendDate = ele.endDate;
-            }
+            }county
           });
         }
         else {
@@ -5000,7 +5011,7 @@ export default {
         default:
           for (let key in this.insuredPersonInfo) {
             this.insuredPersonInfo[key] = "";
-            this.selectedOptions3 = [];
+            // this.selectedOptions3 = [];
           }
       }
     },
@@ -5405,10 +5416,10 @@ export default {
               this.ownerInfoform.identifyValidEndDate = '9999-12-31';
             }
           }
-          let values = addressCode(this.ownerInfoform.addr);
-          this.ownerInfoform.province = codeToText[values[0]]
-          this.ownerInfoform.city = codeToText[values[1]]
-          this.ownerInfoform.county = codeToText[values[2]]
+          // let values = addressCode(this.ownerInfoform.addr);
+          // this.ownerInfoform.province = codeToText[values[0]]
+          // this.ownerInfoform.city = codeToText[values[1]]
+          // this.ownerInfoform.county = codeToText[values[2]]
         }
       });
     },
@@ -5416,21 +5427,20 @@ export default {
       //传参
       switch (this.userIndex) {
         case 2:
-          this.selectedOptions1 = addressCode(this.ownerInfoform.addr);
+          // this.selectedOptions1 = addressCode(this.ownerInfoform.addr);
           this.ownerInfo = JSON.parse(JSON.stringify(this.ownerInfoform));
           break;
         case 3:
-          this.selectedOptions2 = addressCode(this.ownerInfoform.addr);
+          // this.selectedOptions2 = addressCode(this.ownerInfoform.addr);
           this.policyHolderInfo = JSON.parse(
             JSON.stringify(this.ownerInfoform)
           );
           break;
         case 4:
-          this.selectedOptions3 = addressCode(this.ownerInfoform.addr);
+          // this.selectedOptions3 = addressCode(this.ownerInfoform.addr);
           this.insuredPersonInfo = JSON.parse(
             JSON.stringify(this.ownerInfoform)
           );
-
           break;
       }
       this.uploaduserdialogVisible = false;
@@ -5624,9 +5634,9 @@ export default {
       this.imgList6 = [];
       this.imgList7 = [];
       this.imgList8 = [];
-      this.selectedOptions1 = [];
-      this.selectedOptions2 = [];
-      this.selectedOptions3 = [];
+      // this.selectedOptions1 = [];
+      // this.selectedOptions2 = [];
+      // this.selectedOptions3 = [];
       this.orderno = "";
       this.quoteno = "";
       this.HistoryList = [];

+ 0 - 20
src/views/Letter/Orderlist.vue

@@ -1327,7 +1327,6 @@ import {
   pathToBase64,
   base64ToPath
 } from '@/common/image-tools-base64.js';
-import  yongchengData from '../../assets/js/yongchengData';
 import Cookies from "js-cookie";
 import QRCode from "qrcodejs2";
 export default {
@@ -1401,14 +1400,6 @@ export default {
     }
   },
   created() {
-    // let a= this.uniqueArr(yongchengData.data)
-    
-    // console.log(a,11111111)
-
-
-
-
-
     this.$api.insCompany.dicType('insOrderStatus').then(res=>{
       this.optionsStatus=res.data.ddList
     })
@@ -1458,17 +1449,6 @@ export default {
     },
   },
   methods: {
-   uniqueArr(arr) {
-            for (let i = 0; i < arr.length; i++) {
-                for (let j = i + 1; j < arr.length; j++) {
-                    if (arr[i] == arr[j]) {
-                        arr.splice(j, 1)
-                        j--
-                    }
-                }
-            }
-            return arr
-          },
     getRowClass(scope, rowIndex) {
       if (scope.row.insAreaCompanyList.length == 0) {  //判断当前行是否有子数据或者根据实际情况设置
         return 'row-expand-cover'

Някои файлове не бяха показани, защото твърде много файлове са промени