9.7 bug

src/views/company/companyManage.vue

@@ -378,7 +378,7 @@ export default {
 </script>
 <style>
 .top_btn {
-  width: 90%;
+  width: 100%;
   display: flex;
   justify-content: flex-end;
   margin-bottom: 20px;

src/views/company/storeManage.vue

@@ -448,7 +448,7 @@ export default {
             addrDetail: this.store_form.detail_address,
             latitude: this.store_form.latitude, //纬度
             longitude: this.store_form.longitude, //经度
-            isShow: 1 // 1、app展示
+            isShow: 1, // 1、app展示
           };
           update_store(this.store_form.id, data).then((res) => {
             if (res.status == 200) {
@@ -510,7 +510,7 @@ export default {
             addrDetail: this.store_form.detail_address,
             latitude: this.store_form.latitude, //纬度
             longitude: this.store_form.longitude, //经度
-            isShow: 1 // 1、app显示
+            isShow: 1, // 1、app显示
           };
           let that = this;
           add_store(data).then((res) => {
@@ -826,7 +826,7 @@ export default {
 </script>
 <style scoped>
 .top_btn {
-  width: 90%;
+  width: 100%;
   display: flex;
   justify-content: flex-end;
   margin-bottom: 20px;

src/views/tourManage/modal/oneTourModal.vue

@@ -2,6 +2,7 @@
   <!-- 旅游：创建、编辑 -->
   <div>
     <h4>{{title}}</h4>
+    <p class="title_line_P">基础信息</p>
     <el-form :model="form" :rules="rules" ref="form" label-width="90px">
       <el-row>
         <el-col :span="8">
@@ -28,7 +29,138 @@
             <el-input v-model="form.childPrice" type="number" min="0" placeholder="请输入儿童价"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <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>
+        <!--BASE_API + -->
+        <el-form-item label="封面图" :style="{display:'block'}">
+          <el-upload
+            class="upload-demo"
+            :headers="getHeaderWithToken"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :on-progress="uploadProcess"
+            list-type="picture"
+          >
+            <div slot="tip" class="el-upload__tip">
+              <span style="color: red;">建议尺寸：320*228px</span>
+            </div>
+            <el-progress
+              v-show="imgFlag == true"
+              type="circle"
+              :percentage="percent"
+              style="margin-top: 20px"
+            ></el-progress>
+            <img
+              v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag"
+              :src="form.cover"
+              style="width:300px;max-height:300px;"
+            />
+            <i
+              v-else-if="!imgFlag"
+              class="el-icon-plus avatar-uploader-icon"
+              style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
+            ></i>
+          </el-upload>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="轮播图" :style="{display:'block'}">
+          <el-upload
+            class="upload-demo"
+            :headers="getHeaderWithToken"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
+            :on-remove="handleRemove"
+            :file-list="fileList2"
+            :on-success="handleBannerSuccess"
+            list-type="picture"
+          >
+            <div slot="tip" class="el-upload__tip">
+              最多上传5张
+              <span style="color: red;">建议尺寸：1080*644px</span>
+            </div>
+            <el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="浏览量">
+            <el-input v-model="form.viewCount" placeholder="请输入浏览量" type="number" min="0"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="排序">
+            <el-input v-model="form.rank" placeholder="请输入排序值" type="number" min="0"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="单位">
+            <el-input v-model="form.unit" placeholder="人"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="销量">
+            <el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <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">-->
+        <!--<el-checkbox  v-for="item in allLabelList"-->
+        <!--:key="item.id" :label="item.name"></el-checkbox>-->
+        <!--</el-checkbox-group>-->
+        <el-button
+          size="small"
+          class="el-button el-button--primary"
+          type="button"
+          icon="edit"
+          @click="editLable(form.tagDTOS)"
+        >编辑</el-button>
+      </el-form-item>
+      <el-row>
+        <el-form-item label="所属公司" prop="corporationId">
+          <el-select
+            class="filter-item"
+            v-model="form.corporationId"
+            clearable
+            filterable
+            @change="changeCorporationId"
+            placeholder="请选择公司"
+          >
+            <el-option label="全部" :key="undefined" :value="0"></el-option>
+            <el-option v-for="val in companys_list" :key="val.id" :label="val.name" :value="val.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属门店">
+          <el-select class="filter-item" v-model="form.companyId" clearable placeholder="请选择">
+            <el-option label="全部" :key="undefined" :value="0"></el-option>
+            <el-option
+              v-for="val in branchCompany_list"
+              :key="val.id"
+              :label="val.name"
+              :value="val.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <p class="title_line_P">路线信息</p>
       <el-row>
         <el-col :span="4">
           <el-form-item label="是否为推荐" v-if="false">
@@ -47,13 +179,7 @@
         <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="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="出发地">
@@ -145,104 +271,7 @@
           <!--<el-input v-model="form.operator" placeholder="请选择活动日期"></el-input>-->
         </el-form-item>
       </el-row>
-      <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">-->
-        <!--<el-checkbox  v-for="item in allLabelList"-->
-        <!--:key="item.id" :label="item.name"></el-checkbox>-->
-        <!--</el-checkbox-group>-->
-        <el-button
-          size="small"
-          class="el-button el-button--primary"
-          type="button"
-          icon="edit"
-          @click="editLable(form.tagDTOS)"
-        >编辑</el-button>
-      </el-form-item>
-      <el-row>
-        <el-form-item label="所属公司">
-          <el-select
-            class="filter-item"
-            v-model="form.corporationId"
-            clearable
-            filterable
-            placeholder="请选择公司"
-          >
-            <el-option label="全部" :key="undefined" :value="0"></el-option>
-            <el-option v-for="val in companys_list" :key="val.id" :label="val.name" :value="val.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属门店">
-          <el-select class="filter-item" v-model="form.companyId" clearable placeholder="请选择">
-            <el-option label="全部" :key="undefined" :value="0"></el-option>
-            <el-option
-              v-for="val in branchCompany_list"
-              :key="val.id"
-              :label="val.name"
-              :value="val.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-row>
 
-      <el-row>
-        <el-col :span="4">
-          <el-form-item label="浏览量">
-            <el-input v-model="form.viewCount" placeholder="请输入浏览量" type="number" min="0"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="排序">
-            <el-input v-model="form.rank" placeholder="请输入排序值" type="number" min="0"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <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="销量">
-            <el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <!--BASE_API + -->
-      <el-form-item label="封面图" :style="{display:'block'}">
-        <el-upload
-          class="upload-demo"
-          :headers="getHeaderWithToken"
-          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :on-progress="uploadProcess"
-          list-type="picture"
-        >
-          <div slot="tip" class="el-upload__tip">
-            <span style="color: red;">建议尺寸：320*228px</span>
-          </div>
-          <el-progress
-            v-show="imgFlag == true"
-            type="circle"
-            :percentage="percent"
-            style="margin-top: 20px"
-          ></el-progress>
-          <img
-            v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag"
-            :src="form.cover"
-            style="width:300px;max-height:300px;"
-          />
-          <i
-            v-else-if="!imgFlag"
-            class="el-icon-plus avatar-uploader-icon"
-            style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
-          ></i>
-        </el-upload>
-      </el-form-item>
       <el-row>
         <el-col :span="8">
           <el-form-item label="alt" v-if="false">
@@ -302,23 +331,7 @@
           ></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="轮播图" :style="{display:'block'}">
-        <el-upload
-          class="upload-demo"
-          :headers="getHeaderWithToken"
-          :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
-          :on-remove="handleRemove"
-          :file-list="fileList2"
-          :on-success="handleBannerSuccess"
-          list-type="picture"
-        >
-          <div slot="tip" class="el-upload__tip">
-            最多上传5张
-            <span style="color: red;">建议尺寸：1080*644px</span>
-          </div>
-          <el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
-        </el-upload>
-      </el-form-item>
+
       <el-tabs v-model="activeName2" type="card" @tab-click="handleClick">
         <el-tab-pane label="行程亮点" name="first">
           <div class="editor-container" v-if="activeName2=='first'">
@@ -398,6 +411,13 @@
   </div>
 </template>
 <style>
+.title_line_P {
+  background-color: rgba(245, 245, 245, 1);
+  height: 32px;
+  line-height: 32px;
+  padding-left: 10px;
+  font-size: 14px;
+}
 textarea {
   display: none;
 }
@@ -509,6 +529,11 @@ export default {
           required: true,
           message: "请输入儿童价格",
         },
+        corporationId: {
+          required: true,
+          message: "请选择所属公司",
+          trigger: "blur",
+        },
         stock: {
           required: true,
           message: "请输入库存",
@@ -525,6 +550,7 @@ export default {
       allLabelList: [], //全部旅游标签
       companys_list: [], //门店列表
       branchCompany_list: [], //公司列表
+      branchCompany_list_copy: [],
     };
   },
   created() {
@@ -561,6 +587,17 @@ export default {
     },
   },
   methods: {
+    changeCorporationId(val) {
+      if (val == 0) {
+        this.branchCompany_list = this.branchCompany_list_copy;
+      } else {
+        this.branchCompany_list = this.branchCompany_list_copy.filter(
+          (item) => {
+            return item.companyId == val;
+          }
+        );
+      }
+    },
     //所有公司
     get_all_companys() {
       company_all_list().then((res) => {
@@ -574,6 +611,7 @@ export default {
       branchCompany_all_list({ state: 1 }).then((res) => {
         if (res.status == 200) {
           this.branchCompany_list = res.data;
+          this.branchCompany_list_copy = res.data;
         }
       });
     },