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

src/components/Hotel/HotelManagement.vue

@@ -330,11 +330,13 @@
             </el-tooltip>
           </div>
         </div>
-        <div style="padding-left:15px;padding-top:5px;">
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start">
+          <div style="padding-left:15px;padding-top:5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
             <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
             <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
             {{item.UpdateTimeStr}}
           </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>

src/components/LeaderManagement/CarDetails.vue

@@ -17,6 +17,7 @@
           <th>金额</th>
           <th>币种</th>
           <th>支付方式</th>
+          <th>附件</th> 
           <th>备注</th>
         </tr>
         <tr>
@@ -54,6 +55,16 @@
               <p v-if="item.ReimburseList.SettlementType==1">现金支付</p>
               <p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
           </td>
+          <td >
+            <div v-if="item.ReimburseList.VoucherPicList.length">
+              <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
+                <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+              </div>
+            </div>
+            <div v-else>
+              无
+            </div>
+          </td> 
           <td>{{item.ReimburseList.Remarks}}</td>
         </tr>
         
@@ -113,6 +124,9 @@ export default {
         query: { id: id, blank: "y", tab: name }
       });
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     handleCurrentChange(val) {
       this.msg.pageIndex = val;
       this.getList();

src/components/LeaderManagement/DinningDetails.vue

@@ -16,6 +16,7 @@
           <th>实付</th>
           <th>币种</th>
           <th>支付方式</th>
+          <th>附件</th> 
           <th>备注</th>
         </tr>
         <tr>
@@ -60,6 +61,16 @@
                     <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                     {{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
                     </td> 
+                    <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+                      <div v-if="subItem.ReimburseList.VoucherPicList.length">
+                        <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
+                          <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                        </div>
+                      </div>
+                      <div v-else>
+                        无
+                      </div>
+                    </td> 
                     <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                     {{subItem.ReimburseList.Remarks}}
                     </td> 
@@ -153,6 +164,9 @@ export default {
       this.msg.pageIndex = 1;
       this.currentPage = 1;
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     getList() {
       
       this.loading = true;

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -15,6 +15,7 @@
         <th>金额小计</th>
         <th>支付方式</th>
         <th>币种</th> 
+        <th>附件</th> 
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
@@ -48,6 +49,16 @@
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
               {{getCurrencyStr(item.ReimburseList.CurrencyId)}}
             </td> 
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              <div v-if="item.ReimburseList.VoucherPicList.length">
+                <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
+                  <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                </div>
+              </div>
+              <div v-else>
+                无
+              </div>
+            </td> 
             <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
               {{item.ReimburseList.Remarks}}
             </td> 
@@ -94,6 +105,9 @@ export default {
         }
       }
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     //获取数据
     getList(TCIDs, date) {
       this.loading = true;

src/components/LeaderManagement/leaderPayTicketDetail.vue

@@ -15,6 +15,7 @@
         <th>金额小计</th>
         <th>支付方式</th>
         <th>币种</th> 
+        <th>附件</th> 
         <th>备注</th> 
       </tr>
      <template v-for='(item,index) in dataList'>
@@ -48,6 +49,16 @@
             <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
               {{getCurrencyStr(subItem.ReimburseList.CurrencyId)}}
             </td> 
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              <div v-if="subItem.ReimburseList.VoucherPicList.length">
+                <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
+                  <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                </div>
+              </div>
+              <div v-else>
+                无
+              </div>
+            </td> 
             <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
               {{subItem.ReimburseList.Remarks}}
             </td> 
@@ -88,6 +99,9 @@ export default {
         }
       }
     },
+    openImg(src){
+      window.open(src, "_blank");
+    },
     //获取数据
     getList(TCIDs, date) {
       this.loading = true;
@@ -109,6 +123,7 @@ export default {
               dataList = data
             }
             this.dataList = dataList;
+            console.log(dataList)
           } else {
             this.Error(res.data.message);
           }

src/components/ScenicStrategyview.vue

+<style>
+    .ScenicMainContant{
+        width:900px;
+        margin:auto;
+        height:auto;
+        color:#4F5A61;
+    }
+    .cardTitle{
+        width:900px;
+        margin:20px auto;
+        font-weight:500;
+        word-break: break-word;
+        font-size:44px;
+    }
+    .ScenicCoverImg{
+        margin-top:20px;
+    }
+    .ScenicCoverImg img{
+        width:100%;
+    }
+    .ScenicStrateg{
+        color:#4F5A61;
+    }
+    .ScenicStrateg img{
+        width:100%;
+    }
+</style>
+<template>
+    <div class="ScenicMainContant">
+        <div class="cardTitle">
+            {{dataList.Name}}
+        </div>
+        <div class="ScenicCoverImg" v-if="dataList.ImgCover">
+            <img :src="dataList.ImgCover" alt=""/>
+        </div>
+        <div class="ScenicStrateg" v-html="dataList.Content">
+
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            msg:{
+                Id:0,
+            },
+            dataList:{}
+        };
+    },
+    mounted() {
+        this.msg.Id = this.$route.query.id;
+        this.getList();
+    },
+    filters: {
+    },
+    methods: {
+        getList(){
+            this.apipost(
+            "ScenicRecomment_Get_GetScenicRecommentService", this.msg,
+            res => {
+                if (res.data.resultCode == 1) {
+                    console.log(res,'ressss')
+                    this.dataList=res.data.data;
+                }
+            },
+            null
+            );
+
+        }
+    }
+};
+</script>
\ No newline at end of file

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -27,7 +27,7 @@
   .CostNewTable td {
     padding: 5px;
     height: 40px;
-    border: 1px solid #106BAF!important;
+    border: 1px solid #106BAF !important;
   }
 
   .CostPriceDiv {
@@ -39,22 +39,28 @@
   .CP_ComTitle {
     color: #106BAF;
   }
+
   .w79 {
     width: 79px !important;
   }
-  .w70{
-    width:70px!important;
+
+  .w70 {
+    width: 70px !important;
   }
+
   .CostcomCenter {
     text-align: center;
   }
-  .txtRightCost{
+
+  .txtRightCost {
     text-align: right;
     padding-right: 10px;
   }
-  .CostNewTable .el-input__inner{
-    padding:0 5px;
+
+  .CostNewTable .el-input__inner {
+    padding: 0 5px;
   }
+
 </style>
 
 <template>
@@ -94,8 +100,8 @@
             <tr>
               <td width="80" class="txtRightCost">团队标题</td>
               <td colspan="3">
-                  <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
-                  resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
+                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
+                  placeholder="请填写团队标题" maxlength="200"></el-input>
               </td>
               <td width="80" class="txtRightCost">行程天数</td>
               <td>
@@ -298,7 +304,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandAirTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
@@ -326,7 +332,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandShipTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
@@ -354,7 +360,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandTrainTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
@@ -391,13 +397,13 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br/>(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
           </tr>
           <tr>
             <td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td>
@@ -519,6 +525,12 @@
             <td>{{item.PeopleNumber}}+1</td>
             <td colspan="8">{{item.TotalMoney}}</td>
           </tr>
+          <tr>
+            <td class="CP_ComTitle2">备注</td>
+            <td colspan="8">
+              <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
+            </td>
+          </tr>
         </table>
         <div class="Cost_Line"></div>
       </el-form>
@@ -549,8 +561,7 @@
 
     },
     methods: {
-      ReCalc() {
-      },
+      ReCalc() {},
       //获取汇率
       getCurrencyMoney(currencyId) {
         let currency = 0.0;
@@ -667,7 +678,7 @@
       getCurrencyNumberList(CurrencyId) {
         let currencyNumberList = [];
         let flag = false;
-        console.log("this.CurrencyNumberListExt", this.CurrencyNumberListExt);
+
         this.CurrencyNumberListExt.forEach(item => {
           if (!flag && item.Key == CurrencyId) {
             flag = true;
@@ -869,7 +880,6 @@
       }
     },
     mounted() {
-
       this.getAllCurrency();
     },
     created() {

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -103,7 +103,9 @@
     right: -27px;
     top: -18px;
   }
-
+  .w875{
+    width:875px!important;
+  }
 </style>
 
 <template>
@@ -193,7 +195,7 @@
           </div>
           <div class="clearfix" v-show="IsShow">
             <div class="Dleftname">增收</div>
-            <div class="DrightList">
+            <div class="DrightList" style="width:900px;">
               <el-form-item>
                 <el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
                   @keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w200 ComSeat">
@@ -275,6 +277,14 @@
               </el-form-item>
             </div>
           </div>
+          <div class="clearfix"  v-show="IsShow">
+            <div class="Dleftname">备注</div>
+            <div class="DrightList">
+              <el-form-item>
+                <el-input type="textarea" class="w875" v-model="teamPrice.PriceRemark"></el-input>
+              </el-form-item>
+            </div>
+          </div>
         </div>
       </div>
     </el-form>

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -51,7 +51,7 @@
           NightNum: 0, //晚数
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
-          CustomerName:"",//客户名称
+          CustomerName: "", //客户名称
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -80,6 +80,7 @@
           SingleRoomShareMoney: 0, //单房差分摊费用
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
+          OtherRemark: "", //其他价格备注
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -112,9 +113,10 @@
           BackVisaPrice: 0, //退签证费
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
+          PriceRemark: "", //定价备注
         },
         LineList: [], //线路列表
-        loading:false
+        loading: false
       };
     },
     methods: {
@@ -141,11 +143,11 @@
           CostNumberList: this.CostNumberList,
           CurrencyNumberListExt: currencyNumList
         };
-        this.loading=true;
+        this.loading = true;
         this.apipost(
           "travel_post_SetConfigOffer_V2", nObj,
           res => {
-              this.loading=false;
+            this.loading = false;
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
               this.goUrl('newQuotation');
@@ -166,8 +168,13 @@
       },
       getPostData() {
         let configId = this.$route.query.configId;
+        let offerId = 0;
+        if (this.$route.query.offerid) {
+          offerId = this.$route.query.offerid;
+        }
         let msg = {
-          ID: configId
+          ID: configId,
+          offerId: offerId
         };
         this.apipost(
           "travel_get_GetMyTravelInfo_V2",
@@ -175,7 +182,6 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
-              console.log("temp",tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
@@ -206,7 +212,7 @@
               if (tempData.NightNum && tempData.NightNum > 0) {
                 this.postData.NightNum = tempData.NightNum;
               }
-              this.postData.CustomerName=tempData.CustomerName;
+              this.postData.CustomerName = tempData.CustomerName;
               this.LineList = tempData.LineList;
               if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
                 0) {
@@ -229,6 +235,16 @@
                 .CurrencyNumberListExt.length > 0) {
                 this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
               }
+              if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
+                this.CurrencyNumberListExt) {
+                this.CostCurrencyList.forEach(item => {
+                  let currencyNumberItem = {
+                    Key: item.CurrencyId,
+                    currencyNumberList: []
+                  };
+                  this.CurrencyNumberListExt.push(currencyNumberItem);
+                });
+              }
             } else {
               this.Error(res.data.message);
             }
@@ -245,4 +261,5 @@
       DirectQuotation: DirectQuotation
     }
   };
+
 </script>

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -154,7 +154,7 @@
               </div>
             </div>
             <div>
-              <span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item.ID,item.OpenState)">
+              <span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item)">
                 <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
@@ -419,7 +419,8 @@
             name: path,
             query: {
               configId: configId,
-              isCopy: isCopy
+              isCopy: isCopy,
+              blank: 'y'
             }
           });
         } else {
@@ -458,15 +459,16 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path, configId, openState) {
-        if (configId > 0) {
+      goToOpenTravel(path,item) {
+        if (item.ID > 0) {
           this.$router.push({
             name: path,
             query: {
-              configId: configId,
-              openState: openState,
+              configId: item.ID,
+              openState: item.OpenState,
               isOffer: 1,
-              offerId:configId
+              offerId:item.OfferId,
+              blank: 'y'
             }
           });
         } else {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -16,11 +16,13 @@
           {{$t('sm.xianluxingcheng')}}
         </div>
         <div class="TravelLine" v-if="TeamType!=3"></div>
-        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}"
+          @click.prevent="custormAnchor('thirdAnchor',3)">
           {{$t('sm.chanpintese')}}
         </div>
         <div class="TravelLine" v-if="TeamType!=3"></div>
-        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}"
+          @click.prevent="custormAnchor('fourAnchor',4)">
           {{$t('sm.buchongxinxi')}}
         </div>
         <div class="TravelLine"></div>
@@ -60,12 +62,15 @@
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
           </div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">{{$t('pub.saveBtn')}}</div>
-          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">{{$t('fnc.tijiao')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(1)">
+            {{$t('pub.saveBtn')}}</div>
+          <div v-if="modifyType!=2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(2)">
+            {{$t('fnc.tijiao')}}</div>
           <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="submitForm(3)"
             title="另存为新模板">{{$t('pub.saveBtn')}}
           </div>
-          <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}</div>
+          <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}
+          </div>
         </div>
       </div>
     </div>
@@ -86,7 +91,7 @@
     provide() {
       return {
         loadConfigInfo: this.firstLoadConfigInfo,
-        reload:this.reload
+        reload: this.reload
       }
     },
     data() {
@@ -144,6 +149,7 @@
           OpenTeamDescribe: "", //开团备注
           IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
           DayNum: 0, //行程天数
+          OfferId: 0, //报价单Id
         },
         //行程
         FeatureData: {
@@ -240,7 +246,6 @@
         ) {
           //to do something
         } else {
-          //this.$set(this.FeatureData, "DayList", data);
           this.$refs.TravelFeature.setNewDate(data);
         }
       },
@@ -341,6 +346,7 @@
         basicData.IsDirect = this.PostConfig.IsDirect;
         basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
         basicData.RemoveChild = this.PostConfig.RemoveChild;
+        basicData.OfferId=this.PostConfig.OfferId;
 
         basicData.TeamType = this.PostConfig.TeamType;
 
@@ -622,6 +628,9 @@
         let configId = this.$route.query.configId;
         this.modifyTcid = this.$route.query.tcid;
         this.TCNUM = this.$route.query.TCNUM;
+        if (this.$route.query.offerId) {
+          this.PostConfig.OfferId = this.$route.query.offerId;
+        }
         if (this.modifyTcid > 0) {
           this.modifyType = 2;
         } else {
@@ -721,6 +730,11 @@
                 this.PostConfig.IsSubstitution = tempData.IsSubstitution;
                 this.PostConfig.IsDirect = tempData.IsDirect;
                 this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
+                this.PostConfig.OfferId = tempData.OfferId;
+                if (this.$route.query.offerId) {
+                  this.PostConfig.OfferId = this.$route.query.offerId;
+                }
+
                 //是否有报价单
                 this.IsHaveOffer = tempData.IsHaveOffer;
 
@@ -824,7 +838,7 @@
     },
     watch: {
       // 方法1
-        '$route' (to, from) { //监听路由是否变化
+      '$route'(to, from) { //监听路由是否变化
         location.reload()
       },
     },

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -29,7 +29,7 @@
           <span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span>
           <span>
             <el-form-item prop="StartCityId">
-              <el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId"
+              <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId"
                 filterable>
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
                 <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
@@ -37,10 +37,10 @@
               </el-select>
             </el-form-item>
           </span>
-          <span class="TDTextspan">{{$t('sm.jhcfchengshi')}}返回抵达城市</span>
+          <span class="TDTextspan">返回抵达城市</span>
           <span>
             <el-form-item prop="ReturnArriveCityId">
-              <el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
+              <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
                 filterable>
                 <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
                 <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -9,10 +9,12 @@
           <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
             <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-          <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
+          <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
+            placement="top-start">
             <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0&&!isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
@@ -47,7 +49,8 @@
             <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
               @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}}
             <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
-              @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;{{$t('sm.Minute')}}
+              @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>
+            &nbsp;&nbsp;{{$t('sm.Minute')}}
           </div>
         </div>
       </div>
@@ -92,10 +95,12 @@
           <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
             <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-          <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
+          <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
+            placement="top-start">
             <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0&&!isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
@@ -178,8 +183,7 @@
       };
       return {
         //其他餐食
-        otherDinner: [
-          {
+        otherDinner: [{
             Id: 1,
             Name: this.$t('sm.jiudiannxyzc'),
             City: 0,
@@ -216,7 +220,7 @@
           },
           {
             ID: -2,
-            Name:this.$t('sm.jiudianxy'),
+            Name: this.$t('sm.jiudianxy'),
             City: 0,
             About: "",
             PicPath: ""
@@ -335,6 +339,7 @@
             this.subItemObj.childItem.ImaArray = [];
             var dinnerImgList = obj.PicPath.split(",");
             for (var i = 0; i < dinnerImgList.length; i++) {
+              if (i <= 3) {
                 var fileObj = this.$commonUtils.FileObject();
                 fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
                 fileObj.Name = "";
@@ -342,6 +347,7 @@
               }
             }
           }
+        }
       },
       //获取餐厅套餐列表
       getDinnerMealList(event) {

src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue

@@ -7,7 +7,8 @@
         </div>
         <span class="datePickContent" style="display:none;">
           <el-form-item>
-            <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType">
+            <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
+              v-model="subItemObj.childItem.TimeType">
               <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
               </el-option>
             </el-select>
@@ -17,13 +18,16 @@
           <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
             <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
+            v-if="!isOpenGroup">
             <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0 && !isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
+            v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
             <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
           </el-tooltip>
         </div>
@@ -31,9 +35,11 @@
           <div class="TDLeftPlan">
             <span>{{$t('sm.scenChoosse')}}</span>
             <span>
-              <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'" :rules="scienTripRules.CouponsId">
-                <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.CouponsId"
-                  @visible-change="getQScenicList($event)" @change="changeQScenicList()">
+              <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
+                :rules="scienTripRules.CouponsId">
+                <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
+                  v-model="subItemObj.childItem.CouponsId" @visible-change="getQScenicList($event)"
+                  @change="changeQScenicList()">
                   <el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
                   <el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
                   </el-option>
@@ -55,13 +61,15 @@
             <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
             <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
-              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟
+              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
+            &nbsp;&nbsp;分钟
           </div>
         </div>
       </div>
       <div class="TP_edit">
-        <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description"
-          v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
+        <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
+          v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
+          v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
       </div>
       <div class="SiencDiv clearfix">
         <div class="ScLeftImg">
@@ -70,18 +78,20 @@
             <img v-else :src="item.Url" />
             <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
               <div class="clearfix" style="text-align:center;">
-                <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div>
-                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i
-                    class="iconfont icon-zuoyi"></i></div>
-                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i
-                    class="iconfont icon-youyi"></i></div>
+                <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
+                </div>
+                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
+                  v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
+                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
+                  v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
               </div>
             </div>
           </div>
         </div>
         <div class="rightAddImg">
-          <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem"
-            :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+          <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
+            :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
+            :show-file-list="false" action="">
             <i class="iconfont icon-img_haha"></i>
           </el-upload>
         </div>
@@ -97,13 +107,16 @@
           <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit">
             <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
+            v-if="!isOpenGroup">
             <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 &&  !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0 &&  !isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
+            v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
             <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
           </el-tooltip>
         </div>
@@ -248,6 +261,7 @@
             if (obj.PicPath != undefined && obj.PicPath != "") {
               var scenImgList = obj.PicPath.split(",");
               for (var i = 0; i < scenImgList.length; i++) {
+                if (i <= 3) {
                   var fileObj = that.$commonUtils.FileObject();
                   if (scenImgList[i] != "") {
                     fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
@@ -255,6 +269,8 @@
                     that.subItemObj.childItem.ImaArray.push(fileObj);
                   }
                 }
+
+              }
             }
           }
         }
@@ -326,10 +342,10 @@
         this.dspNone = true;
         this.initialIndex = index;
       },
-      getItemLabel(item){
+      getItemLabel(item) {
         let returnName = item.Name;
-        if(item.Inventory>=0){
-          returnName = returnName+ "   " +item.Inventory;
+        if (item.Inventory >= 0) {
+          returnName = returnName + "   " + item.Inventory;
         }
         return returnName;
       }

src/components/scenicSpot/scenicRecommentList.vue

@@ -325,6 +325,9 @@
             <el-tooltip class="item" effect="dark" content="修改" placement="top">
               <el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button>
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="预览" placement="top">
+              <el-button type="primary" icon="iconfont icon-view" circle @click="goView(item.Id)"></el-button>
+            </el-tooltip>
             <el-tooltip class="item" effect="dark" content="删除" placement="top">
               <el-button type="danger" icon="iconfont icon-img_delete_small" circle
                 @click="removeScenicRecomment(item.Id)"></el-button>
@@ -673,6 +676,18 @@
             err => {}
           );
         }
+      },
+
+      //跳转至预览页面
+      goView(id){
+        this.$router.push({
+          name: 'ScenicStrategyview',
+          query: {
+            id: id,
+            blank: 'y',
+            tab: name
+          }
+        })
       }
     },
     mounted() {

src/components/scenicSpot/scenicSpotList.vue

@@ -312,11 +312,13 @@
         <el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start" popper-class="max-w250">
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
-        <div style="padding-left:15px;margin:10px 0;">
+        <el-tooltip class="item" effect="dark" :content="item.UpdateName+''+item.UpdateTimeStr" placement="top-start" popper-class="max-w250">
+          <div style="padding-left:15px;margin:10px 0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
             <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
             <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}</span>
             {{item.UpdateTimeStr}}
           </div>
+        </el-tooltip>
         <div class="btnList">
           <button @click="goUrl('scenicSpotInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button @click="CopyScenic(item.ID)" class="hotelBtn">复制</button>

src/components/work/mywork.vue

@@ -266,6 +266,7 @@
         </el-form-item>
         <el-form-item label="计划日期" prop="TimeRanges">
           <el-date-picker
+            :picker-options="pickerOptions"
             v-model="addMsg.TimeRanges"
             type="datetimerange"
             class="wd100"
@@ -363,7 +364,13 @@ export default {
       inputValue: "",
       datas: [],
       tempList: [],
-      examineStatusValue: "-2"
+      examineStatusValue: "-2",
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;   //禁用以前的日期，今天不禁用
+          // return date.getTime() <= Date.now();    //禁用今天以及以前的日期
+        }
+      }
     };
   },
   mounted() {

src/components/work/workDetails.vue

@@ -433,7 +433,7 @@
             </el-row>
           </div>
           <div slot="footer" class="dialog-footer">
-            <button v-if="loading"  style="background: #909399;border: 1px solid #909399;cursor: no-drop;" class="normalBtn" type="info">确认提交</button>
+            <button v-if="loading"  style="background: #909399;border: 1px solid #909399;cursor: no-drop;" class="normalBtn" type="info">上传中...</button>
             <button v-else class="normalBtn" type="primary" @click="setprogress">确认提交</button>
           </div>
         </fieldset>
@@ -483,6 +483,9 @@ export default {
     this.isEaxmine = this.$route.query.examine ? true : false;
     this.isUpdate = this.$route.query.update ? true : false;
     this.init(id);
+    this.MsgBus.$on('UploadSelfFileErr', content=>{
+      this.loading = false
+    })
   },
   methods: {
     openFile(file) {

src/components/work/workManager2.vue

@@ -54,7 +54,7 @@
             ></el-option>
           </el-select>
         </li>
-        <li>
+        <li v-if="false">
           <span>
             <em>审批状态</em>
             <el-select class="w200" v-model="msg.examineStatus">
@@ -122,9 +122,11 @@
         <th>开始时间</th>
         <th>截止时间</th>
         <th>创建时间</th>
-        <th>立项审批信息</th>
+        <th>总经理立项审批</th>
+        <th>主管立项审批</th>
         <th>当前进度</th>
-        <th>完成审批信息</th>
+        <th>总经理完成审批</th>
+        <th>主管完成审批</th>
         <th>操作</th>
       </tr>
       <tr v-for="(item, index) in DataList" :key="index">
@@ -148,6 +150,14 @@
         <td>{{item.BeginTime}}</td>
         <td>{{item.EndTime}}</td>
         <td>{{item.CreateDate}}</td>
+        <td>
+          <span v-if="item.ZongExamineStatus==0" style="color:grey">审批中</span>
+          <span
+            v-else-if="item.ZongExamineStatus==1"
+            style="color:green;text-decoration: underline;"
+          >已通过</span>
+          <span v-else style="color:red;text-decoration: underline;">已驳回</span>
+        </td>
         <td>
           <span v-if="item.ExamineStatus==0" style="color:grey">审批中</span>
           <span
@@ -164,6 +174,16 @@
             status="success"
           ></el-progress>
         </td>
+        <td>
+          <span v-if="item.Status==2||item.Status==3">
+            <span v-if="item.ZongFinishExamineStatus==0" style="color:grey">审批中</span>
+            <span
+              v-else-if="item.ZongFinishExamineStatus==1"
+              style="color:green;text-decoration: underline;"
+            >已通过</span>
+            <span v-else style="color:red;text-decoration: underline;">已驳回</span>
+          </span>
+        </td>
         <td>
           <span v-if="item.Status==2||item.Status==3">
             <span v-if="item.FinishExamineStatus==0" style="color:grey">审批中</span>

src/plug/index.js

@@ -756,6 +756,7 @@ export default {
                 }).catch(function(reason){
                   that.$refs['my-upload'].clearFiles();
                   that.$message.error('上传失败！');
+                  that.MsgBus.$emit('UploadSelfFileErr')
                 });
       
             }

src/router/config.js

@@ -4448,7 +4448,14 @@ export default {
                 title: '电子合同'
             }
         },
-
+        {
+            path: '/ScenicStrategyview', //景点攻略预览
+            name: 'ScenicStrategyview',
+            component: resolve => require(['@/components/ScenicStrategyview'], resolve),
+            meta: {
+                title: '景点攻略预览'
+            }
+        },
         {
             path: '/supplierLogin', //供应商登录
             name: 'supplierLogin',