Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/admin/user/index.vue

@@ -274,6 +274,7 @@
       getAll()
         .then(response => {
           this.allCompaniesArr = response.data;
+          this.allBranchCompany= response.data;
         })
       getAllCompany(codeAndBranchCompany => {
         this.allCompanies = codeAndBranchCompany;
@@ -299,9 +300,10 @@
         'elements'
       ]),
       getAllZoneList() {
-        console.log('getAllZoneList')
-        this.allZoneArr = getAllZone();
-        return getAllZone();
+        // console.log('getAllZoneList')
+        let allZone = getAllZone();
+        this.allZoneArr = allZone ;
+        return allZone;
       },
     },
     methods: {
@@ -325,6 +327,7 @@
        * 所属分公司
        * */
       handleSelectSubordinate(item) {
+
         this.form.companyId = item.id;
         this.form.companyName = item.name;
       },
@@ -419,7 +422,7 @@
                 });
                 this.dialogFormVisible = true;
                 this.dialogStatus = 'update';
-                console.log(this.form);
+                // console.log(this.form);
                 // console.log(JSON.stringify(this.form))
               });
             });

src/views/baseInfo/branchCompany/index.vue

@@ -405,6 +405,7 @@
         'companyStatusAndCode'
       ]),
       getAllZoneList(){
+
         this.allZoneArr = getAllZone();
         return getAllZone();
       },

src/views/campsiteManage/modal/campsiteModal.vue

@@ -22,12 +22,12 @@
       </el-form-item>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="经度">
+          <el-form-item label="经度" prop="latitude">
             <el-input :value="form.latitude" readonly></el-input>
           </el-form-item>
         </el-col>
         <el-col  :span="8">
-          <el-form-item label="纬度">
+          <el-form-item label="纬度" prop="longitude">
             <el-input :value="form.longitude" readonly></el-input>
           </el-form-item>
         </el-col>
@@ -52,10 +52,9 @@
           </bm-marker>
         </baidu-map>
       </el-form-item>
-      <el-form-item>
+      <el-form-item >
         <!--:center="center"-->
         <baidu-map
-
           :zoom="zoom"
           :dragging="true"
           :scroll-wheel-zoom="true"
@@ -86,7 +85,7 @@
     </div>
   </el-dialog>
 </template>
-
+<script src="http://api.map.baidu.com/api?v=2.0&ak=iSEprDCqtYn5aC06Y3cDyGCEOP1hydwR"></script>
 <script>
   import BaiduMap from 'vue-baidu-map';
   import {
@@ -104,12 +103,10 @@
   import ElRow from "element-ui/packages/row/src/row";
   import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
   import ElCol from "element-ui/packages/col/src/col";
-  import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
   export default {
     props: ["obj"],
     name: 'destinationDialog',
     components: {
-      ElFormItem,
       ElCol,
       ElInput,
       ElRow
@@ -183,16 +180,12 @@
             }
           ],
           longitude:{
-            type: 'string',
             required: true,
-            message: '请输入经纬度',
-            trigger: 'blur'
+            message: '请拾取经纬度'
           },
           latitude:{
-            type: 'string',
             required: true,
-            message: '请输入经纬度',
-            trigger: 'blur'
+            message: '请拾取经纬度'
           },
           addrProvince:{
             required: true,
@@ -264,7 +257,7 @@
         }).then(() => {
           this.form.method = 'delete';
           this.$emit(this.form.eventName, this.form);
-        })        
+        })
       },
       querySearch(queryString, cb) {
         let selectArry = [];
@@ -331,8 +324,12 @@
       /**
        * 加载地图
        * */
-      handler({map}){
-
+      handler ({BMap, map}) {
+        console.log(BMap, map)
+        this.postionMap = {  //地图坐标
+          lng: 120.211486,
+          lat: 30.256576
+        };
       },
       //点击获取到当前经纬度
       getClickInfo(e) {

src/views/tourManage/modal/destinationModal.vue

@@ -32,12 +32,12 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="经度">
+          <el-form-item label="经度" prop="latitude">
             <el-input :value="form.latitude" readonly></el-input>
           </el-form-item>
         </el-col>
         <el-col  :span="8">
-          <el-form-item label="纬度">
+          <el-form-item label="纬度"  prop="longitude">
             <el-input :value="form.longitude" readonly></el-input>
           </el-form-item>
         </el-col>
@@ -164,56 +164,26 @@
           addrCity: undefined,
         },
         rules: {
-          name: [
-            {
+          name:{
               type: 'string',
               required: true,
               message: '请输入名称',
               trigger: 'blur'
             },
-            {
-              min: 0,
-              max: 2000,
-              message: '长度小于 2000 个字符',
-              trigger: 'blur'
-            }
-          ],
-          address: [
-            {
+          address: {
               type: 'string',
               required: true,
               message: '请输入详细地址',
               trigger: 'blur'
             },
-            {
-              min: 0,
-              max: 2000,
-              message: '长度小于 2000 个字符',
-              trigger: 'blur'
-            }
-          ],
           longitude:{
-            type: 'string',
             required: true,
-            message: '请输入经纬度',
-            trigger: 'blur'
+            message: '请选择经纬度'
           },
           latitude:{
-            type: 'string',
             required: true,
-            message: '请输入经纬度',
-            trigger: 'blur'
-          },
-          addrProvince:{
-            required: true,
-            message: '请选择省份',
-            trigger: 'blur'
-          },
-          addrCity:{
-            required: true,
-            message: '请选择城市',
-            trigger: 'blur'
-          },
+            message: '请选择经纬度'
+          }
         },
         allCompanies: {},
         allCompaniesArr: [],
@@ -223,7 +193,6 @@
         baidumapSwitch:false,
         zoom: 16,
         location: "深圳市",
-
       }
     },
     created() {

src/views/userManagement/memberManagement/index.vue

@@ -137,6 +137,7 @@
     name: 'membershipGrade',
     data() {
       return {
+        BASE_API: process.env.BASE_API,
         list: [],
         listLoading: true,
         tableKey: 0,

src/views/vehicle/vehicleInfo/index.vue

@@ -236,7 +236,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="65" align="center" v-if="showMoreMoreCol" label="保险公司">
+      <el-table-column width="150" align="center" v-if="showMoreMoreCol" label="保险公司">
         <template scope="scope">
           <span>{{getInsuranceCompany(scope.row.insuranceCompany)}}</span>
         </template>
@@ -248,31 +248,31 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保险开始时间">
+      <el-table-column width="150" align="center" v-if="showMoreMoreCol" label="保险开始时间">
         <template scope="scope">
           <span>{{scope.row.insuranceStartDate}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保险结束时间">
+      <el-table-column width="180" align="center" v-if="showMoreMoreCol" label="保险结束时间">
         <template scope="scope">
           <span>{{scope.row.insuranceEndDate}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="100" align="center" v-if="showMoreMoreCol" label="年审时间">
+      <el-table-column width="180" align="center" v-if="showMoreMoreCol" label="年审时间">
         <template scope="scope">
           <span>{{scope.row.annualVerificationDate}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保养时间">
+      <el-table-column width="180" align="center" v-if="showMoreMoreCol" label="保养时间">
         <template scope="scope">
           <span>{{scope.row.maintenanceDate}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="65" align="center" v-if="showMoreMoreCol" label="保养里程数">
+      <el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保养里程数">
         <template scope="scope">
           <span>{{scope.row.maintenanceMileage}}</span>
         </template>
@@ -299,7 +299,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="120" align="center" v-if="showMoreMoreCol" label="发动机号">
+      <el-table-column width="130" align="center" v-if="showMoreMoreCol" label="发动机号">
         <template scope="scope">
           <span>{{scope.row.engineNum}}</span>
         </template>
@@ -323,7 +323,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="操作" width="380" fixed="right">
+      <el-table-column align="center" label="操作" width="280" fixed="right">
         <template scope="scope">
           <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleInfo_btn_edit?"编辑":"查看"}}
           </el-button>
@@ -1053,7 +1053,7 @@
               message: '请输入使用人联系方式',
               trigger: 'blur'
             },{
-              pattern: /^1[3456789]\d{9}$/, 
+              pattern: /^1[3456789]\d{9}$/,
               message: '请输入正确的手机号'
             }
           ],
@@ -2139,4 +2139,4 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -130,7 +130,7 @@
         if (!value) {
           return callback(new Error('手机号不能为空'));
         } else {
-          const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
+          const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
           console.log(reg.test(value));
           if (reg.test(value)) {
             callback();