Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails.vue

@@ -282,7 +282,7 @@
                   <el-tooltip class="item" effect="dark" content="新增" placement="top-start">
                     <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
                   </el-tooltip>
-                  <el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除"
+                  <el-tooltip v-if="item.HotelOrderList.length>1||index==0" class="item" effect="dark" content="删除"
                     placement="top-start">
                     <el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
                     </el-button>

src/components/SalesModule/groupTourOrder.vue

@@ -2163,7 +2163,13 @@
         },
         SuperiorPeople: [],
         TransferMission:'',//订单转团权限
-        Unit_Price:0
+        Unit_Price:0,
+        goLVurl:{ //跳转到旅客页面的参数
+          orderId:'',
+          tcid:'',
+          tcnum:'',
+          isOrder:'',
+        },
       }
     },
     components: {
@@ -2687,6 +2693,10 @@
         }
       },
       getDetail(obj) {
+        this.goLVurl.orderId = obj.orderId;
+        this.goLVurl.tcid = obj.tcid;
+        this.goLVurl.tcnum = obj.tcnum;
+        this.goLVurl.isOrder  = obj.isOrder;
         this.Ysze = false;
         this.starTime = obj.startDate
         this.endTime = obj.backDate
@@ -3439,6 +3449,10 @@
               this.clearMsg()
               this.getList()
               this.isShowLayer = false
+              if(res.data.data == 1){
+                this.$router.push({ name: 'passengerSaleList', query: { id: this.goLVurl.orderId,tcid: this.goLVurl.tcid, tcnum: this.goLVurl.tcnum,isOrder: this.goLVurl.isOrder, blank: 'y', tab: '旅客名单'} });
+
+              }
             } else {
               this.isShowLayer = false
               this.$message.error(res.data.message)

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2526,6 +2526,14 @@
         SuperiorPeople:[],
         TransferMission:'',//订单转团
         Unit_Price:0,// 地接临时存值
+        goLVurl:{ //跳转到旅客页面的参数
+          orderId:'',
+          tcid:'',
+          tcnum:'',
+          isOrder:'',
+        },
+
+
     };
     },
     components: {
@@ -3015,6 +3023,10 @@
       },
 // 点击修改
       getDetail(obj) {
+        this.goLVurl.orderId = obj.orderId;
+        this.goLVurl.tcid = obj.tcid;
+        this.goLVurl.tcnum = obj.tcnum;
+        this.goLVurl.isOrder  = obj.isOrder;
         this.Ysze=false;
         this.starTime = obj.startDate;
         this.endTime = obj.backDate;
@@ -3809,6 +3821,10 @@
               this.clearMsg();
               this.getList();
               this.isShowLayer = false;
+              if(res.data.data == 1){
+                this.$router.push({ name: 'passengerSaleList', query: { id: this.goLVurl.orderId,tcid: this.goLVurl.tcid, tcnum: this.goLVurl.tcnum,isOrder: this.goLVurl.isOrder, blank: 'y', tab: '旅客名单'} });
+
+              }
             } else {
               this.isShowLayer = false;
               this.$message.error(res.data.message);

src/components/activity/CommodityType.vue

@@ -53,6 +53,9 @@
   background-color: #ee4454;
   border-color: #ee4454;
 }
+.comType_Img{
+  max-height: 50px;
+}
 </style>
 
 <template>
@@ -77,6 +80,8 @@
         <th width="120px">类型编号</th>
         <th>商品类型名称</th>
         <th>商品类型图标</th>
+        <th>商品类型logo</th>
+        <th>商品类型展示图片</th>
         <th>商品类型状态</th>
         <th>更新时间</th>
         <th>操作</th>
@@ -85,7 +90,13 @@
         <td>{{item.id}}</td>
         <td>{{item.name}}</td>
         <td>
-          <img :src="item.icon" alt>
+          <img :src="item.icon" class="comType_Img" />
+        </td>
+        <td>
+          <img :src="item.miniLog" class="comType_Img" />
+        </td>
+        <td>
+          <img :src="item.typeImg" class="comType_Img" />
         </td>
         <td>{{item.state === 1 ? '正常' : '禁用'}}</td>
         <td>{{item.updateTime.replace('T', ' ')}}</td>
@@ -160,6 +171,67 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="商品类型logo">
+          <div class="_addUpload_box">
+            <div class="_pic_upload">
+              <template v-if="addMsg.miniLog!==''">
+                <div>
+                  <div
+                    style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
+                  >
+                    <img :src="addMsg.miniLog">
+                    <span
+                      style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
+                      @click="addMsg.miniLog=''"
+                    >重新上传</span>
+                  </div>
+                </div>
+              </template>
+                <el-upload
+                  v-else
+                  drag
+                  :http-request="uploadLogoBtn"
+                  :multiple="false"
+                  :show-file-list="false"
+                  action
+                >
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                  <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
+                </el-upload>
+            </div>
+          </div>
+        </el-form-item>
+        <el-form-item label="商品类型图片">
+          <div class="_addUpload_box">
+            <div class="_pic_upload">
+              <template v-if="addMsg.typeImg!==''">
+                <div>
+                  <div
+                    style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
+                  >
+                    <img :src="addMsg.typeImg">
+                    <span
+                      style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
+                      @click="addMsg.typeImg=''"
+                    >重新上传</span>
+                  </div>
+                </div>
+              </template>
+                <el-upload
+                  v-else
+                  drag
+                  :http-request="uploadTypeImgBtn"
+                  :multiple="false"
+                  :show-file-list="false"
+                  action
+                >
+                  <i class="el-icon-plus avatar-uploader-icon"></i>
+                  <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
+                </el-upload>
+            </div>
+          </div>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button
@@ -185,7 +257,9 @@ export default {
         name: "",
         state: 1,
         icon: "",
-        id: 0
+        id: 0,
+        miniLog:'',
+        typeImg:''
       },
       rules: {
         memberLevel: [
@@ -251,22 +325,89 @@ export default {
           typeOk = true;
         }
       });
-      if (!typeOk) return this.$message.error(this.$t("tips.qsctpian"));
+      if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
       let newArr = [];
       newArr.push(file.file);
       let path = "/Upload/activity/";
-      this.$message.info(this.$t("tips.shangchuanzhong"));
+      this.Success(this.$t("tips.shangchuanzhong"));
       this.UploadSelfFileT(path, newArr, x => {
         let fileSize =
           file.file.size < 1024
             ? file.file.size
             : (file.file.size / 1024).toFixed(0);
         this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath;
-        this.$message.success(this.$t("tips.scchenggong"));
+        this.Success(this.$t("tips.scchenggong"));
+        this.$forceUpdate();
+      });
+    },
+    uploadLogoBtn(file){
+      //上传
+      if (file.file.size > 1024 * 1024 * 10) {
+        this.$message.warning(this.$t("tips.wjdxbncgsz"));
+        return;
+      }
+      //  1 文档  2 数据 3 图片
+      let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
+      let ft = file.file.name
+        .substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
+        .toUpperCase();
+      let fileTypeNumber = 2;
+      let typeOk = false;
+      typeArr.forEach(x => {
+        if (x.stringArr.indexOf(ft) != "-1") {
+          fileTypeNumber = x.type;
+          typeOk = true;
+        }
+      });
+      if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
+      let newArr = [];
+      newArr.push(file.file);
+      let path = "/Upload/activity/";
+      this.Success(this.$t("tips.shangchuanzhong"));
+      this.UploadSelfFileT(path, newArr, x => {
+        let fileSize =
+          file.file.size < 1024
+            ? file.file.size
+            : (file.file.size / 1024).toFixed(0);
+        this.addMsg.miniLog = this.domainManager().ViittoFileUrl + x.data.FilePath;
+        this.Success(this.$t("tips.scchenggong"));
+        this.$forceUpdate();
+      });
+    },
+    uploadTypeImgBtn(file){
+            //上传
+      if (file.file.size > 1024 * 1024 * 10) {
+        this.$message.warning(this.$t("tips.wjdxbncgsz"));
+        return;
+      }
+      //  1 文档  2 数据 3 图片
+      let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
+      let ft = file.file.name
+        .substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
+        .toUpperCase();
+      let fileTypeNumber = 2;
+      let typeOk = false;
+      typeArr.forEach(x => {
+        if (x.stringArr.indexOf(ft) != "-1") {
+          fileTypeNumber = x.type;
+          typeOk = true;
+        }
+      });
+      if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
+      let newArr = [];
+      newArr.push(file.file);
+      let path = "/Upload/activity/";
+      this.Success(this.$t("tips.shangchuanzhong"));
+      this.UploadSelfFileT(path, newArr, x => {
+        let fileSize =
+          file.file.size < 1024
+            ? file.file.size
+            : (file.file.size / 1024).toFixed(0);
+        this.addMsg.typeImg = this.domainManager().ViittoFileUrl + x.data.FilePath;
+        this.Success(this.$t("tips.scchenggong"));
         this.$forceUpdate();
       });
     },
-    
     //获取数据
     getList() {
       this.loading = true;

src/components/busManagement/BusInfo.vue

@@ -301,24 +301,21 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="定团号" min-width="230">
+          <el-table-column label="订团号" min-width="215">
             <template slot-scope="scope">
-              <template v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
+              <div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
                 <template v-if="scope.$index==0&&subIndex==0">
-                  <div class="BusTyleFirst">
-                    <el-input class='w170' type="text" v-model="subItem.BookGroup"></el-input>
-                  </div>
+                  <i class="iconfont icon-tongshang" style="opacity:0;filter:alpha(opacity=0); "></i>
+                  <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
                 </template>
                 <template v-else>
-                  <div class="comBTM">
                   <el-tooltip class="item" effect="dark" content="同上" placement="top">
                     <i class="iconfont icon-tongshang" style="cursor:pointer;"
                       @click="getBeforeInfo(scope.$index,subIndex),getBusPrice(subItem)"></i>
                   </el-tooltip>
-                    <el-input class='w170' type="text" v-model="subItem.BookGroup"></el-input>
-                  </div>
-                </template>
+                  <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
                 </template>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="司机住宿" min-width="180">
@@ -343,19 +340,19 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="高速费用" min-width="150">
+          <el-table-column label="高速费用" min-width="140">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
-                  placeholder="请输入费用" :disabled="isShowBtn==1?true:false"></el-input>
+                  placeholder="请输入费用" :disabled="isShowBtn==1?true:false"  class='w135'></el-input>
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="高速费用付款方式" min-width="150">
+          <el-table-column label="高速费用付款方式" min-width="140">
             <template slot-scope="scope">
               <div>
                 <div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
-                  <el-select class='sel' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
+                  <el-select class='sel w135' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
                     @change="PayTypeChange(subItem)" :disabled="isShowBtn==1?true:false">
                     <el-option label='请选择' :value='0'></el-option>
                     <el-option label='现付' :value='1'></el-option>
@@ -377,11 +374,11 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="成本价" min-width="150">
+          <el-table-column label="成本价" min-width="140">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')"
-                  placeholder="请输入成本价" :disabled="isShowBtn==1?true:false"></el-input>
+                  placeholder="请输入成本价" :disabled="isShowBtn==1?true:false" class="w135"></el-input>
               </div>
             </template>
           </el-table-column>