新增餐厅订单，团控列表新增设置精品推荐，修改财务单据公司列表禁用条件，线路管理新增背景图上传

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -918,7 +918,7 @@ export default {
                     let data = res.data.data;
                     if(data.length){
                         this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;  // 外币
-                        this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0;  //  本位币
+                        this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0;  //  本位币
                         let endStartMoney = 0,
                             endRStartMoney = 0;
                         data.forEach( ( x ) => {

src/components/FinancialModule/addFinancialDocuments.vue

@@ -674,6 +674,7 @@ export default {
             describeList:[],
             isFrompassenger:false,
             showDisable:false,
+            editTemplateId:-1,
         }
     },
     methods:{
@@ -1204,6 +1205,9 @@ export default {
                 if(res.data.resultCode == 1) {
                     console.log("res.data",res.data)
                     let data= res.data.data;
+                    this.editTemplateId=data.TemplateId;
+                    this.getCompany();
+                    
                     data.IsLeader = 1;
                     this.msg = JSON.parse(JSON.stringify(data));
                     this.msg.ClientType = this.msg.ClientType==0?'':this.msg.ClientType;
@@ -1341,7 +1345,13 @@ export default {
               }
               this.companyList = data;
                 if(!Status){
-                    let id=this.$route.query.id;
+                    let id=0;
+                    if(this.$route.query.id){
+                        id=this.$route.query.id;  
+                    }else{
+                        id=this.editTemplateId;
+                        
+                    }
                     this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {ID:id}, res => {
                         if (res.data.resultCode == 1) {
                             let resdata = res.data.data;
@@ -1452,12 +1462,10 @@ export default {
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj.isFromPassenger;
-        console.log(this.orderObj,'orderObj');
         //  console.log(this.$route.query.orderObj)
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
-          console.log("that.describeList",that.describeList)
           if(that.describeList){
               that.describeList.forEach(item=>{
                 that.Description+=item.GuestName+" ";
@@ -1484,8 +1492,8 @@ export default {
         let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
         let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
         this.timer = hour + ':' + minute + ':' + second;
-        this.getCompany();
         if(this.$route.query.edit){
+            // 编辑
             this.msg.FrID = this.$route.query.FrID;
             this.Financial_post_Get(this.$route.query.FrID,0);
         }else{

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -388,6 +388,7 @@
                     <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
                     <span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span>
                     <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
+                    <span v-if="item.GroupRecommendType==1" title="精品">精</span>
                   </div>
                   <div class="TCL-OutBranchName" title="销售公司">{{item.UnionBranchName}}</div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
@@ -777,6 +778,12 @@
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
                     <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                       <el-dropdown-item @click.native="SetGroupRecommendType(item,1)" v-if="item.b2b&&item.GroupRecommendType==0">
+                        设为精品推荐
+                      </el-dropdown-item>
+                      <el-dropdown-item  @click.native="SetGroupRecommendType(item,0)" v-if="item.b2b&&item.GroupRecommendType==1">
+                        取消设为精品
+                      </el-dropdown-item>
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}
                       </el-dropdown-item>
@@ -1097,6 +1104,26 @@
       }
     },
     methods: {
+      SetGroupRecommendType(item,num){
+        let msg={};
+        msg.groupRecommendType=num;
+        msg.tcid=item.TCID;
+        
+        this.apipost(
+          'travel_post_SetGroupRecommendType', msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message)
+              this.getControlList()
+            }else{
+              this.Error(res.data.message)
+              
+            }
+          },
+          err => {}
+        )
+        
+      },
       downloadFile: function (item) {
         let reg = /^http(s)?:\/\/(.*?)\//
         this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
@@ -1119,7 +1146,8 @@
           if (res.data.resultCode == 1) {
             this.queryCommonData.LineList = res.data.data
             this.queryCommonData.PlaceList = []
-            this.queryCommonData.LineTeamList = []
+            this.queryCommonData.LineTeamList = [];
+            
           }
         })
       },
@@ -1227,12 +1255,16 @@
               this.queryCommonData.dataList.forEach(item => {
                 item.SalePlatList = []
                 if (item.SalePlat !== null) {
+                  if(item.SalePlat.indexOf("1") != -1){
+                      item.b2b=true;
+                    }
                   var SalePlatArr = item.SalePlat.split(',')
                   SalePlatArr.forEach(y => {
                     item.SalePlatList.push(parseInt(y))
                   })
                 }
               });
+              // console.log('this.queryCommonData', this.queryCommonData.dataList)
             }
           },
           err => {}

src/components/activity/CouponList.vue

@@ -92,6 +92,8 @@
                   <el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
                   <el-option label="门票" :value="5"></el-option>
                   <el-option label="车辆" :value="6"></el-option>
+                  <el-option label="自由行" :value="7"></el-option>
+                  <el-option label="当地游" :value="8"></el-option>
                 </el-select>
           </span>
         </li>
@@ -369,6 +371,8 @@
                   <el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
                   <el-option label="门票" :value="5"></el-option>
                   <el-option label="车辆" :value="6"></el-option>
+                  <el-option label="自由行" :value="7"></el-option>
+                  <el-option label="当地游" :value="8"></el-option>
                 </el-select>
               </el-form-item>
             </td>

src/components/systemManagement/lineManagement.vue

@@ -283,6 +283,33 @@ input[type="number"] {
   box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
   transition: all linear 0.5s;
 }
+.lineManagement .TFimgList {
+    float: left;
+    width: 170px;
+    height: 100px;
+    border-radius: 4px;
+    position: relative;
+    margin: 0 10px 10px 0;
+    overflow: hidden;
+}
+.lineManagement .TFimgList img{
+  width: 100%;
+  height: 100%;
+}
+.lineManagement .TFIMGzhe {
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    position: absolute;
+    top: 0;
+    text-align: center;
+    line-height: 115px;
+    border-radius: 4px;
+    display: none;
+}
+.lineManagement .TFimgList:hover .TFIMGzhe {
+    display: block;
+}
 </style>
 <template>
   <div class="flexOne lineManagement">
@@ -501,6 +528,25 @@ input[type="number"] {
                 </el-select>
               </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="线路图片">
+              <div class="TFimgList">
+                    <img v-if="!addMsg.BackgroundImage" src="../../assets/img/bg_c3@3x.png">
+                    <img v-else :src='addMsg.BackgroundImage'>
+                    <div class="TFIMGzhe">
+                      <div class="TFreupload">
+                          <el-upload :file-list="fileList" :http-request="uploadTest" :multiple="true" :limit="2"
+                                  :on-change="handleChange1"
+                                  accept="image/jpeg, image/gif, image/png, image/bmp"
+                                  :show-file-list="false" action="">
+                          <i class="iconfont icon-Edit"></i>
+                          </el-upload>
+                      </div>
+                    </div>
+                </div>    
+            </el-form-item>
+            
+          </el-col>
           <div class="LM_Btcontent">
               <input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')"/>
               <input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')"/>
@@ -588,6 +634,7 @@ input[type="number"] {
 export default {
   data() {
     return {
+      fileList:[],
       msg: {
         pageIndex: 1,
         pageSize: 6,
@@ -609,6 +656,7 @@ export default {
         IsShare: 0,
         Is_PacketGroup: 0,
         LineDirection:2,
+        BackgroundImage:"",
       },
       departCompany: "",
       departDepartment: "",
@@ -649,6 +697,19 @@ export default {
     };
   },
   methods: {
+    handleChange1(file, fileList) {
+      
+      this.fileList = fileList.slice(-1);
+    },
+    uploadTest(file) {
+      let newArr = [];
+      newArr.push(file.file);
+      let path = "/Upload/DMC/Icon/";
+      this.UploadSelfFileT(path, newArr, x => {
+        let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
+        this.addMsg.BackgroundImage = url;
+      });
+    },
     getList() {
       //获取现有线路列表
       this.loading = true;
@@ -748,6 +809,8 @@ export default {
       this.addMsg.IsShare = getInfo.isShare;
       this.addMsg.Is_PacketGroup = getInfo.is_PacketGroup;
       this.addMsg.LineDirection = getInfo.lineDirection;
+      this.addMsg.BackgroundImage = getInfo.BackgroundImage;
+      console.log("this.addMsg.BackgroundImage",getInfo)
     },
     deletelist(lineID) {
       var that = this;

src/router/config.js

@@ -1003,6 +1003,14 @@ export default {
                                 title: '餐厅套餐查询'
                             },
                         },
+                        {
+                            path: '/FoodOrder', //餐厅订单
+                            name: 'FoodOrder',
+                            component: resolve => require(['@/components/Restaurant/FoodOrder'], resolve),
+                            meta: {
+                                title: '餐厅订单'
+                            },
+                        },
                         {
                             path: '/ChangeDining', //更换餐厅
                             name: 'ChangeDining',