旅游-必填项添加

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -323,7 +323,9 @@
        * 创建
        * */
       create(formName){
-//        this.isCreate = true;
+        const set = this.$refs;
+        set[formName].validate(valid => {
+          if (valid) {
             let carouse = [];//营地轮播图
             this.form.carouse.map(function (item) {
               let c = {
@@ -339,9 +341,6 @@
             this.form.campsiteTagListVos.map(function (item) {
               campsiteTagDTOS.push(item.id);
             });
-        const set = this.$refs;
-        set[formName].validate(valid => {
-          if (valid) {
             let params = {
               name: this.form.name,//营地名称
               logo: this.form.logo,//封面图
@@ -455,7 +454,6 @@
             return;
           }
         });
-
       },
       /**
        * 更新

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/tourManage/modal/oneTourModal.vue

@@ -5,7 +5,7 @@
     <el-form :model="form" :rules="rules" ref="form" label-width="90px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="旅行名称">
+          <el-form-item label="旅行名称" prop="name">
             <el-input v-model="form.name" placeholder="请输入旅行名称"></el-input>
           </el-form-item>
         </el-col>
@@ -19,44 +19,44 @@
       </el-row>
       <el-row>
         <el-col :span="4">
-          <el-form-item label="旅行原价" prop="operator">
+          <el-form-item label="旅行原价" prop="price">
             <el-input v-model="form.price" type="number" min="0" placeholder="请输入旅行原价"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="儿童价" prop="operator">
+          <el-form-item label="儿童价" prop="childPrice">
             <el-input v-model="form.childPrice" type="number" min="0" placeholder="请输入儿童价"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="4">
-      <el-form-item label="是否为推荐" prop="mileage">
+      <el-form-item label="是否为推荐">
         <el-radio class="radio" v-model="form.recommend" label="1">是</el-radio>
         <el-radio class="radio" v-model="form.recommend" label="0">否</el-radio>
       </el-form-item>
         </el-col>
         <el-col :span="8">
-      <el-form-item label="会员价格" prop="mileage">
+      <el-form-item label="会员价格">
         <el-radio class="radio" v-model="form.isMember" label="1">启用会员价</el-radio>
         <el-radio class="radio" v-model="form.isMember" label="0">不启用会员价</el-radio>
       </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="" prop="mileage">
+      <el-form-item label="">
         <el-radio class="radio" v-model="form.isOutside" label="0">省内</el-radio>
         <el-radio class="radio" v-model="form.isOutside" label="1">省外</el-radio>
       </el-form-item>
       <el-row>
         <el-col :span="4">
-          <el-form-item label="库存" prop="amount">
+          <el-form-item label="库存" prop="stock">
             <el-input v-model="form.stock" placeholder="请输入总人数"  type="number" min="0"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <!--<el-col :span="24">-->
-          <el-form-item label="出发地" prop="departure">
+          <el-form-item label="出发地">
             <el-input style="display: inline-block;margin-right: 10px;width: 240px;" v-model="item.name"  v-for="item in departureList"
                       :key="item.id" readonly placeholder="请输入内容"></el-input>
             <el-button size="small" class="el-button el-button--primary" type="button" icon="edit" @click="editDeparture(departureList)">编辑</el-button>
@@ -101,7 +101,7 @@
             <!--<el-input v-model="form.operator" placeholder="请选择活动日期"></el-input>-->
           </el-form-item>
       </el-row>
-      <el-form-item label="旅行标签" prop="approvers">
+      <el-form-item label="旅行标签">
         <span  v-for="item in form.tagDTOS"
           :key="item.id" style="border: 1px solid #ccc; padding: 5px 10px;border-radius: 5px;margin-right: 10px;">{{item.name}}</span>
   <!--<el-checkbox-group v-model="checkList">-->
@@ -122,12 +122,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="单位" prop="amount">
+          <el-form-item label="单位">
             <el-input v-model="form.unit" placeholder="人"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="销量" prop="saleCount">
+          <el-form-item label="销量">
             <el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
           </el-form-item>
         </el-col>
@@ -200,8 +200,8 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancelTour">取 消</el-button>
-      <el-button type="primary" v-if="title=='创建' && !isCreate" @click="create()">确 定</el-button>
-      <el-button type="primary" v-if="title=='编辑' && !isCreate&&good_btn_update" @click="update()">确 定</el-button>
+      <el-button type="primary" v-if="title=='创建' && !isCreate" @click="create('form')">确 定</el-button>
+      <el-button type="primary" v-if="title=='编辑' && !isCreate&&good_btn_update" @click="update('form')">确 定</el-button>
     </div>
     <!--编辑出发地-->
     <departureModal v-if="editDepartureVisible" :list="departureList" v-on:departureEvent = "departureEvent"></departureModal>
@@ -283,7 +283,7 @@ import ElRow from "element-ui/packages/row/src/row";
         percent: 0,//上传进度
         imgFlag: false,
         onePathObj:{name: ""},//待编辑的途径地
-        destinationObj:{name: ""},//目的地
+        destinationObj:{},//目的地
         departureList: [],//出发地列表
         departureObj:{name: ""},//出发地
         pathway: [],//途径地
@@ -319,26 +319,24 @@ import ElRow from "element-ui/packages/row/src/row";
         showPathWayVisible: false,//编辑途径地
         showTimeVisible: false,//编辑时间
         rules: {
-          name: [
-            {
+          name: {
             type: 'string',
             required: true,
-              message: '请输入消息内容',
+            message: '请输入旅游名称',
             trigger: 'blur'
           },
-            {
-              min: 0,
-              max: 100,
-              message: '长度小于 100 个字符',
-              trigger: 'blur'
+          price: {
+            required: true,
+            message: '请输入价格',
+          },
+          childPrice: {
+            required: true,
+            message: '请输入儿童价格'
+          },
+          stock: {
+            required: true,
+              message: '请输入库存'
           }
-          ],
-//          departure: {
-//            type: 'string',
-//            required: true,
-//            message: '请输入出发地',
-//            trigger: 'blur'
-//          },
         },
         checkList:[],//已选中的标签
         allCompanies: {},
@@ -449,8 +447,10 @@ import ElRow from "element-ui/packages/row/src/row";
       /**
        * 创建
        * */
-      create(){
-        this.isCreate = true;
+      create(formName){
+        const set = this.$refs;
+        set[formName].validate(valid => {
+          if (valid) {
             //旅游标签
             let tagDTOS = [];
             this.form.tagDTOS.map(function(item){
@@ -483,6 +483,15 @@ import ElRow from "element-ui/packages/row/src/row";
               };
               siteDTOS.push(p);
             });
+            if(this.departureList.length<=0){
+              this.$notify({
+                title: '警告',
+                message: '请选择出发地',
+                type: 'warning',
+                duration: 2000
+              });
+              return;
+            }
             //途径地
             this.pathway.map(function(item){
               let provinceObj = item.province?getRegionByCodes([item.province]): [{name:""}];
@@ -506,6 +515,15 @@ import ElRow from "element-ui/packages/row/src/row";
             });
             //destinationObj目的地
             let destinationObj = this.destinationObj;
+            if(!destinationObj.name){
+              this.$notify({
+                title: '警告',
+                message: '请选择目的地',
+                type: 'warning',
+                duration: 2000
+              });
+              return;
+            }
             let provinceObj = destinationObj.province?getRegionByCodes([destinationObj.province]):[{name:""}];
             let cityObj = destinationObj.city?getRegionByCodes([destinationObj.city]):[{name:""}];
             let p = {
@@ -520,6 +538,7 @@ import ElRow from "element-ui/packages/row/src/row";
               type: 2
             };
             siteDTOS.push(p);
+            this.isCreate = true;
             let params = {
               isOutside: this.form.isOutside,//省内、省外
               name: this.form.name,//旅游路线名称
@@ -564,13 +583,19 @@ import ElRow from "element-ui/packages/row/src/row";
                 });
               }
             });
+          } else {
+            return;
+          }
+        });
       },
       /**
        * 编辑
        * */
-      update(){
+      update(formName){
         //旅游标签
-        this.isCreate = true;
+        const set = this.$refs;
+        set[formName].validate(valid => {
+          if (valid) {
             let tagDTOS = [];
             this.form.tagDTOS.map(function(item){
               if(item.tagId){
@@ -603,6 +628,15 @@ import ElRow from "element-ui/packages/row/src/row";
               };
               siteDTOS.push(p);
             });
+            if(this.departureList.length<=0){
+              this.$notify({
+                title: '警告',
+                message: '请选择出发地',
+                type: 'warning',
+                duration: 2000
+              });
+              return;
+            }
             //途径地
             this.pathway.map(function(item){
               let provinceObj = item.province?getRegionByCodes([item.province]): [{name:""}];
@@ -625,6 +659,15 @@ import ElRow from "element-ui/packages/row/src/row";
             });
             //destinationObj目的地
             let destinationObj = this.destinationObj;
+            if(!destinationObj.name){
+              this.$notify({
+                title: '警告',
+                message: '请选择目的地',
+                type: 'warning',
+                duration: 2000
+              });
+              return;
+            }
             let provinceObj = destinationObj.province?getRegionByCodes([destinationObj.province]):[{name:""}];
             let cityObj = destinationObj.city?getRegionByCodes([destinationObj.city]):[{name:""}];
             let p = {
@@ -666,6 +709,7 @@ import ElRow from "element-ui/packages/row/src/row";
               posterBackground:this.form.posterBackground,//海报背景
             };
             console.log(params);
+            this.isCreate = true;
             console.log(this.form);
             goodsEdit(params).then(response => {
               this.isCreate = false;
@@ -686,6 +730,10 @@ import ElRow from "element-ui/packages/row/src/row";
                 });
               }
             });
+          } else {
+            return;
+          }
+        });
       },
       /**
        * 获取全部旅游标签