Merge branch 'dev-td' of http://113.105.137.151:22280/youjj/cloud-platform-ui into dev-td

src/views/campsiteManage/modal/campsiteModal.vue

@@ -17,24 +17,27 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="详细地址" prop="address">
+      <el-form-item label="详细地址">
         <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
       </el-form-item>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="纬度" prop="latitude">
-            <el-input :value="form.latitude" readonly></el-input>
+          <el-form-item label="纬度">
+            <el-input v-model="form.latitude" readonly placeholder="点击地图拾取"></el-input>
           </el-form-item>
         </el-col>
         <el-col  :span="8">
-          <el-form-item label="经度" prop="longitude">
-            <el-input :value="form.longitude" readonly></el-input>
+          <el-form-item label="经度">
+            <el-input v-model="form.longitude" readonly placeholder="点击地图拾取"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="拾取经纬度">
+      <el-form-item label="位置搜索">
         <el-input v-model="keyword" placeholder="请输入详细地址获取经纬度"></el-input>
       </el-form-item>
+      <el-form-item label="当前已选位置">
+        <el-input v-model="localKeyword" placeholder="当前地图选址"></el-input>
+      </el-form-item>
       <el-form-item v-if="1>2">
         <baidu-map class="map" id="mapID" center="东莞市" :zoom="zoom" :scroll-wheel-zoom="true" @click="getPoint"  @ready="handler">
           <!--地图类型，两种：一种是路线一种是绿的那种-->
@@ -86,7 +89,7 @@
   </el-dialog>
 </template>
 <script src="http://api.map.baidu.com/api?v=2.0&ak=iSEprDCqtYn5aC06Y3cDyGCEOP1hydwR"></script>
-<script>
+<script type="javascript">
   import BaiduMap from 'vue-baidu-map';
   import {
     getSonRegionByCodes,
@@ -122,6 +125,7 @@
         visible2: false,//是否显示删除确认框
         location: '',
         keyword: '',  //搜索框关键词
+        localKeyword:'',
         zoom: 12.8,   //放大比例
         address:'',   //位置详细信息
         add:{
@@ -190,12 +194,12 @@
           addrProvince:{
             required: true,
             message: '请选择省份',
-            trigger: 'blur'
+            trigger: 'change'
           },
           addrCity:{
             required: true,
             message: '请选择城市',
-            trigger: 'blur'
+            trigger: 'change'
           },
         },
         allCompanies: {},
@@ -293,26 +297,25 @@
        * */
       okHandler(formName) {
         const set = this.$refs;
-        if(!this.listQuery.addrProvince){
-          this.$notify({
-            title: '请选择省份',
-            message: '操作失败！',
-            type: 'error',
-            duration: 2000
-          });
+        this.form.province = this.listQuery.addrProvince;
+        this.form.city = this.listQuery.addrCity;
+        if(!this.form.province){
+          this.$message.warning('请选择省份')
           return;
         }
-        if(!this.listQuery.addrCity){
-          this.$notify({
-            title: '请选择城市',
-            message:'操作失败！',
-            type: 'error',
-            duration: 2000
-          });
+        if(!this.form.city){
+          this.$message.warning('请选择城市')
           return;
         }
-        this.form.province = this.listQuery.addrProvince;
-        this.form.city = this.listQuery.addrCity;
+        if(!this.form.address){
+          this.$message.warning('请输入详细地址')
+          return;
+        }
+        if(!this.form.latitude || !this.form.longitude){
+          this.$message.warning('请拾取经纬度')
+          return;
+        }
+
         set[formName].validate(valid => {
           if (valid) {
             this.$emit(this.form.eventName, this.form);
@@ -386,7 +389,8 @@
         let geocoder= new BMap.Geocoder();  //创建地址解析器的实例
         geocoder.getLocation(e.point,rs=>{
           this.add.site = rs.address;
-          this.keyword = rs.address;
+          // this.keyword = rs.address;
+          this.localKeyword = rs.address;
           this.form.latitude = rs.point.lat;
           this.form.longitude = rs.point.lng;
           //地址描述(string)=

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -17,11 +17,11 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="营地地址" prop="addressStr">
+          <el-form-item label="营地地址">
             <el-input
               placeholder="请输入营地地址"
-              readonly
               v-model="form.addressStr"
+              readonly
               class="input-with-select"
             >
               <el-button
@@ -120,7 +120,7 @@
             v-else
             class="el-icon-plus avatar-uploader-icon"
             style="
-              lineheight: 100px;
+              line-height: 100px;
               width: 300px;
               height: 100px;
               border: 1px dashed #ccc;
@@ -310,7 +310,7 @@ textarea {
   margin-left: 10px;
 }
 </style>
-<script>
+<script type="javascript">
 //  import Editor from "../../modal/editorTool";//富文本
 import UE from "../../modal/Ueditor"; //百度ue富文本
 import campsiteLabelModal from "../../tourManage/modal/tourLabelModal"; //标签
@@ -367,9 +367,11 @@ export default {
       pathway: [], //途径地
       isCreate: false, //是否点击了创建-确定
       fileList2: [],
+      keyword: '',
+      localKeyword: '',
       activeName2: "", //行程亮点
       form: {
-        addressStr: undefined,
+        addressStr: '',
         alt: "",
         imgTitle: undefined,
         imgKeyword: undefined,
@@ -422,9 +424,10 @@ export default {
           trigger: "blur",
         },
         addressStr: {
+          type: "string",
           required: true,
           message: "请输入营地地址",
-          trigger: "blur",
+          trigger: ['blur', 'change']
         },
       },
       checkList: [], //已选中的标签
@@ -505,6 +508,10 @@ export default {
      * */
     create(formName) {
       const set = this.$refs;
+      if(!this.form.addressStr){
+        this.$message.warning('请输入营地地址')
+        return
+      }
       set[formName].validate((valid) => {
         if (valid) {
           let carouse = []; //营地轮播图
@@ -515,6 +522,10 @@ export default {
             };
             carouse.push(c);
           });
+          if(carouse.length <= 0){
+            this.$message.warning('请上传轮播图')
+            return;
+          }
           /**
            * 营地类别
            * */
@@ -598,6 +609,10 @@ export default {
      * */
     update(formName) {
       const set = this.$refs;
+      if(!this.form.addressStr){
+        this.$message.warning('请输入营地地址')
+        return
+      }
       set[formName].validate((valid) => {
         if (valid) {
           this.isCreate = true;
@@ -609,6 +624,10 @@ export default {
             };
             carouse.push(c);
           });
+          if(carouse.length <= 0){
+            this.$message.warning('请上传轮播图')
+            return;
+          }
           /**
            * 营地类别
            * */
@@ -711,6 +730,7 @@ export default {
      * 关闭营地地址弹框
      * */
     campsiteEvent(obj) {
+      let _this = this
       this.showCampsiteVisible = false;
       if (obj) {
         this.campsiteObj = obj;
@@ -729,10 +749,9 @@ export default {
      * 编辑营地地址
      * */
     selectDestination() {
-      let that = this;
       this.campsiteObj.showTitle = "营地地址编辑";
       this.campsiteObj.eventName = "campsiteEvent";
-      this.campsiteObj.keyword = this.campsiteObj.address;
+      this.campsiteObj.keyword = this.campsiteObj.provinceName + this.campsiteObj.cityName + this.campsiteObj.address;
       this.showCampsiteVisible = true;
     },
     /**

src/views/index/disableModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog :title="currentItem.title" :visible.sync="jinyong" width="10%">
+  <el-dialog :title="currentItem.title" :visible.sync="jinyong">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
       <el-form-item label="车牌号:">
         <span>{{currentItem.item.numberPlate}}</span>

src/views/index/vehicleExhibitionModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog :title="currentItem.title" :visible.sync="zhanlan" width="10%">
+  <el-dialog :title="currentItem.title" :visible.sync="zhanlan">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
       <el-form-item label="车牌号:">
         <span>{{currentItem.item.numberPlate}}</span>

src/views/index/vehicleMaintenanceModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog title="保养用车" :visible.sync="baoyang" width="10%">
+  <el-dialog title="保养用车" :visible.sync="baoyang">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
         <el-form-item label="车牌号:">
           <span>{{currentItem.item.numberPlate}}</span>

src/views/tourManage/modal/destinationModal.vue

@@ -20,7 +20,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="详细地址" prop="address">
+      <el-form-item label="详细地址">
         <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
       </el-form-item>
       <el-row>
@@ -32,19 +32,22 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="纬度" prop="latitude">
+          <el-form-item label="纬度">
             <el-input :value="form.latitude" readonly></el-input>
           </el-form-item>
         </el-col>
         <el-col  :span="8">
-          <el-form-item label="经度"  prop="longitude">
+          <el-form-item label="经度">
             <el-input :value="form.longitude" readonly></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="拾取经纬度">
+      <el-form-item label="位置搜索">
         <el-input v-model="keyword" placeholder="请输入详细地址获取经纬度"></el-input>
       </el-form-item>
+      <el-form-item label="当前已选位置">
+        <el-input v-model="localKeyword" placeholder="当前地图选址"></el-input>
+      </el-form-item>
       <el-form-item v-if="1>2">
         <baidu-map class="map" id="mapID" center="东莞市" :zoom="zoom" :scroll-wheel-zoom="true" @click="getPoint"  @ready="handler">
           <!--地图类型，两种：一种是路线一种是绿的那种-->
@@ -97,7 +100,7 @@
   </el-dialog>
 </template>
 
-<script>
+<script type="javascript">
   import BaiduMap from 'vue-baidu-map';
   import {
     getSonRegionByCodes,
@@ -135,6 +138,7 @@
         visible2: false,//是否显示删除确认框
         location: '',
         keyword: '',  //搜索框关键词
+        localKeyword: '',
         zoom: 12.8,   //放大比例
         address:'',   //位置详细信息
         add:{
@@ -281,26 +285,42 @@
        * */
       okHandler(formName) {
         const set = this.$refs;
-        if(!this.listQuery.addrProvince){
-          this.$notify({
-            title: '请选择省份',
-            message: '操作失败！',
-            type: 'error',
-            duration: 2000
-          });
+        // if(!this.listQuery.addrProvince){
+        //   this.$notify({
+        //     title: '请选择省份',
+        //     message: '操作失败！',
+        //     type: 'error',
+        //     duration: 2000
+        //   });
+        //   return;
+        // }
+        // if(!this.listQuery.addrCity){
+        //   this.$notify({
+        //     title: '请选择城市',
+        //     message:'操作失败！',
+        //     type: 'error',
+        //     duration: 2000
+        //   });
+        //   return;
+        // }
+        this.form.province = this.listQuery.addrProvince;
+        this.form.city = this.listQuery.addrCity;
+        if(!this.form.province){
+          this.$message.warning('请选择省份')
           return;
         }
-        if(!this.listQuery.addrCity){
-          this.$notify({
-            title: '请选择城市',
-            message:'操作失败！',
-            type: 'error',
-            duration: 2000
-          });
+        if(!this.form.city){
+          this.$message.warning('请选择城市')
+          return;
+        }
+        if(!this.form.address){
+          this.$message.warning('请输入详细地址')
+          return;
+        }
+        if(!this.form.latitude || !this.form.longitude){
+          this.$message.warning('请拾取经纬度')
           return;
         }
-        this.form.province = this.listQuery.addrProvince;
-        this.form.city = this.listQuery.addrCity;
         set[formName].validate(valid => {
           if (valid) {
             this.$emit(this.form.eventName, this.form);
@@ -371,7 +391,8 @@
         let geocoder= new BMap.Geocoder();  //创建地址解析器的实例
         geocoder.getLocation(e.point,rs=>{
           this.add.site = rs.address;
-          this.keyword = rs.address;
+          // this.keyword = rs.address;
+          this.localKeyword =  rs.address
           this.form.latitude = rs.point.lat;
           this.form.longitude = rs.point.lng;
           //地址描述(string)=

src/views/tourManage/modal/oneTourModal.vue

@@ -90,7 +90,7 @@
               v-else-if="!imgFlag"
               class="el-icon-plus avatar-uploader-icon"
               style="
-                lineheight: 100px;
+                line-height: 100px;
                 width: 300px;
                 height: 100px;
                 border: 1px dashed #ccc;
@@ -546,7 +546,7 @@ textarea {
   margin-left: 10px;
 }
 </style>
-<script>
+<script type="javascript">
 //  import Editor from "../../modal/editorTool";//富文本
 import UE from "../../modal/Ueditor"; //百度ue富文本
 import Destination from "./destinationModal"; //目的地弹框
@@ -832,12 +832,7 @@ export default {
             siteDTOS.push(p);
           });
           if (this.departureList.length <= 0) {
-            this.$notify({
-              title: "警告",
-              message: "请选择出发地",
-              type: "warning",
-              duration: 2000,
-            });
+            this.$message.warning('请选择出发地')
             return;
           }
           //途径地
@@ -868,12 +863,7 @@ export default {
           //destinationObj目的地
           let destinationObj = this.destinationObj;
           if (!destinationObj.name) {
-            this.$notify({
-              title: "警告",
-              message: "请选择目的地",
-              type: "warning",
-              duration: 2000,
-            });
+            this.$message.warning('请选择目的地')
             return;
           }
           let provinceObj = destinationObj.province
@@ -900,6 +890,10 @@ export default {
             type: 2,
           };
           siteDTOS.push(p);
+          if(this.form.bannerDTOS.length <= 0){
+            this.$message.warning('请上传轮播图')
+            return;
+          }
           this.isCreate = true;
           let params = {
             isOutside: this.form.isOutside, //省内、省外
@@ -999,12 +993,7 @@ export default {
             siteDTOS.push(p);
           });
           if (this.departureList.length <= 0) {
-            this.$notify({
-              title: "警告",
-              message: "请选择出发地",
-              type: "warning",
-              duration: 2000,
-            });
+            this.$message.warning('请选择出发地')
             return;
           }
           //途径地
@@ -1034,12 +1023,7 @@ export default {
           //destinationObj目的地
           let destinationObj = this.destinationObj;
           if (!destinationObj.name) {
-            this.$notify({
-              title: "警告",
-              message: "请选择目的地",
-              type: "warning",
-              duration: 2000,
-            });
+            this.$message.warning('请选择目的地')
             return;
           }
           let provinceObj = destinationObj.province
@@ -1067,6 +1051,10 @@ export default {
             type: 2,
           };
           siteDTOS.push(p);
+          if(this.form.bannerDTOS.length <= 0){
+            this.$message.warning('请上传轮播图')
+            return;
+          }
           let params = {
             id: this.form.id,
             isOutside: this.form.isOutside, //省内、省外

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog :title="currentItem.title" :visible.sync="zhanlan" width="10%">
+  <el-dialog :title="currentItem.title" :visible.sync="zhanlan">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
       <el-form-item label="车牌号:">
         <span>{{currentItem.item.numberPlate}}</span>

src/views/vehicle/vehicleSchedulManage/vehicleMaintenanceModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog title="保养用车" :visible.sync="baoyang" width="10%">
+  <el-dialog title="保养用车" :visible.sync="baoyang">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
         <el-form-item label="车牌号:">
           <span>{{currentItem.item.numberPlate}}</span>