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

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -163,7 +163,7 @@
                     <th width="">{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="7">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="7">{{$t('fnc.a_qcyue')}}：期初余额</td>
                     <td></td>
                     <td></td>
                     <td> {{ moneyFormat(RStartMoney) }} </td>
@@ -196,13 +196,13 @@
                         {{ item.AccountNumber }}
                     </td>
                     <td>
-                        {{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
+                        收入：{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
                     </td>
                     <td>
-                        {{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
+                       支出： {{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
                     </td>
                     <td>
-                        {{ moneyFormat(item.enRSMoney) }}
+                        余额：{{ moneyFormat(item.enRSMoney) }}
                     </td>
                     <td>
                         {{item.Rate}}
@@ -916,26 +916,30 @@ export default {
             this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
                  if(res.data.resultCode===1){
                     let data = res.data.data;
+                    console.log("data",data)
                     if(data.length){
                         this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;  // 外币
-                        this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0;  //  本位币
-                        let endStartMoney = 0,
-                            endRStartMoney = 0;
+                        this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0;  //  本位币
+                        let endStartMoney =  this.StartMoney;
+                        let endRStartMoney = this.RStartMoney;
                         data.forEach( ( x ) => {
-                            if(x.Type===1){
+                            if(x.Type===1){//收入
                                 this.bShou = this.bShou + x.Money;
                                 this.wShou = this.wShou + x.OriginalMoney;
                                 endRStartMoney = endRStartMoney + x.OriginalMoney;
                                 endStartMoney = endStartMoney + x.Money;
-                                x.enRSMoney = endRStartMoney;
+                                x.enRSMoney = endRStartMoney;//外币收入
                                 x.enSMoney = endStartMoney;
-                            }else if(x.Type===2){
+                                
+                            }else if(x.Type===2){//支出
                                 this.bZhi = this.bZhi + x.Money;
                                 this.wZhi = this.bZhi + x.OriginalMoney;
                                 endRStartMoney = endRStartMoney - x.OriginalMoney;
                                 endStartMoney = endStartMoney - x.Money;
                                 x.enRSMoney = endRStartMoney;
                                 x.enSMoney = endStartMoney;
+                                console.log("this.wZhi",this.wZhi);
+                                
                             }
                             x.check = false;
                             x.disabled = false;

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/Supplier/AddSupplierComplaints.vue

+<style type="text/css">
+  .Supplier_AC_content {
+    width: 800px;
+    margin: 50px auto;
+    min-height: 730px;
+    padding: 20px;
+    font-size: 14px;
+    background-color: #fff;
+    border: 1px solid #ccc;
+  }
+
+  .Supplier_AC_inputGroup {
+    margin-bottom: 20px;
+  }
+
+  .Supplier_AC_contDetail>p {
+    background: #ccc;
+    color: #333;
+    padding: 5px;
+    text-indent: 11px;
+  }
+
+  .Supplier_AC_inputGroup .el-input-group__append {
+    background-color: #CD2929;
+    color: #fff;
+  }
+
+  .Supplier_AC_OrderList {
+    overflow: hidden;
+    width: 800px;
+  }
+
+  .Supplier_AC_OrderList ul li {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    float: left;
+    width: 380px;
+    height: 36px;
+    line-height: 36px;
+    border-bottom: 1px solid #ccc;
+  }
+
+  .Supplier_AC_OrderList ul li:nth-child(2n + 1) {
+    border-right: 1px solid #ccc;
+    box-sizing: border-box;
+  }
+
+  .Supplier_AC_OrderList ul li span {
+    display: inline-block;
+    width: 80px;
+    text-align: right;
+  }
+
+  .Supplier_AC_complaintList {
+    padding: 10px 0 0 0;
+    height: auto;
+    overflow: hidden;
+  }
+
+  .Supplier_AC_complaintList .t {
+    padding: 4px 0 0 0;
+  }
+
+  .Supplier_AC_complaintList .t,
+  .Supplier_AC_complaintList ul {
+    float: left;
+  }
+
+  .Supplier_AC_complaintList ul li {
+    border: 1px solid #ccc;
+    padding: 4px 8px;
+    float: left;
+    margin: 0 5px 5px 0;
+    cursor: pointer;
+  }
+
+  .Supplier_AC_complaintList ul li:hover {
+    border: 1px #d81e06 solid;
+  }
+
+  .Supplier_AC_complaintList ul li.checked {
+    border: 1px #d81e06 solid;
+  }
+
+  .Supplier_AC_contDetail>a {
+    color: #3980c8 !important;
+  }
+
+  .Supplier_AC_contDetail a:hover {
+    color: #bd2e40 !important;
+    text-decoration: underline !important;
+  }
+
+  .Supplier_AC_content .w757 {
+    width: 757px !important;
+  }
+
+</style>
+
+<template>
+  <div class="Supplier_AC_content">
+    <div class="Supplier_AC_inputGroup">
+      <el-input placeholder="请输入团号/编号" class="w757" v-model="QMsg.TCID">
+        <el-button slot="append" @click="CheckTCID()">验证</el-button>
+      </el-input>
+    </div>
+    <div class="Supplier_AC_contDetail">
+      <p>团队情况</p>
+      <div class="Supplier_AC_OrderList">
+        <ul>
+          <li><span>线路：</span>{{this.PriceInfo.LineName}}</li>
+          <li><span>系列：</span>{{this.PriceInfo.LtName}}</li>
+          <li><span>团队编号：</span><a>{{this.PriceInfo.TCID}}</a></li>
+          <li><span>行程天数：</span>{{this.PriceInfo.DayNum}}</li>
+          <li><span>出发日期：</span>{{this.PriceInfo.StartDate}}</li>
+          <li><span>返回日期：</span>{{this.PriceInfo.BackDate}}</li>
+          <li><span>操作OP：</span>{{this.PriceInfo.OpName}}</li>
+          <li><span>领队：</span>{{this.PriceInfo.LeaderName}}</li>
+          <li><span>导游：</span>{{this.PriceInfo.GuideName}}</li>
+        </ul>
+      </div>
+      <p>投诉情况</p>
+      <div class="Supplier_AC_complaintList">
+        <div class="t">主题内容：</div>
+        <ul style="width:90%;">
+          <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
+            {{subItem.Name}}
+          </li>
+        </ul>
+      </div>
+
+      <el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
+        placeholder="具体问题描述，以及投诉人的姓名、联系方式"></el-input>
+    </div>
+    <p style="text-align: center; margin: 10px 0 15px 0;">
+      <input type="button" class="normalBtn" value="保存" @click="SaveData()" />
+      <input type="button" class="normalBtn" value="取消" />
+    </p>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //主题内容
+        themeList: [],
+        //主题选中数组
+        themeCked: [],
+        //添加修改投诉
+        EditMsg: {
+          Id: 0, //编号
+          SupplierId: 0, //供应商编号
+          TCID: 0, //团队编号
+          ComplainContentrs: '', //投诉内容
+          ComplainContent: '', //问题描述
+        },
+        //查询参数
+        QMsg: {
+          TCID: ""
+        },
+        //团信息
+        PriceInfo: {},
+        //订单投诉条数
+        ExitCount: 0
+      };
+    },
+    mounted() {},
+    methods: {
+      //选取主题内容
+      getTheme(item) {
+        item.isCheck = !item.isCheck;
+        this.themeCked = [];
+        this.themeList.forEach(x => {
+          if (x.isCheck) {
+            this.themeCked.push(x.Id)
+          }
+        })
+      },
+      //验证订单
+      CheckTCID() {
+        this.ApiPost2('supplierComplain_Get_GetPriceData', {
+          TCID: this.QMsg.TCID
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.PriceInfo = res.data.data.PriceInfo;
+            if (this.PriceInfo == null) {
+              this.PriceInfo = {};
+            } else {
+              this.EditMsg.TCID = this.PriceInfo.TCID;
+            }
+          } else {
+            this.Error(res.data.message)
+          }
+        }, err => {});
+      },
+      //保存数据
+      SaveData(status) {
+        if (this.themeCked.length === 0) {
+          this.Error("请选择主题内容");
+          return false;
+        }
+        //数据组装
+        this.EditMsg.ComplainContentrs = "";
+        let contentrArr = [];
+        this.themeList.forEach(x => {
+          if (x.isCheck) {
+            contentrArr.push(x.Name);
+          }
+        });
+        if (contentrArr.length > 0) {
+          this.EditMsg.ComplainContentrs = contentrArr.join(",")
+        }
+        this.ApiPost2('supplierComplain_Post_SetSupplierComplain', this.EditMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success("添加成功");
+            this.$router.push({
+              path: "roomQuery2",
+              query: {}
+            });
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {});
+      },
+      //获取投诉枚举集合
+      getEnumeration() {
+        this.ApiPost2("conplain_get_GetComplainEnumList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.themeList = [];
+            res.data.data.ComplainContentEnumList.forEach(x => {
+              x["isCheck"] = false;
+              this.themeList.push(x);
+            })
+          } else {
+            this.Error(res.data.message);
+          }
+        });
+      },
+      GetData() {
+        this.ApiPost2('supplierComplain_Get_GetSupplierComplain', {
+          Id: this.EditMsg.Id
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.EditMsg = res.data.data;
+            if (this.EditMsg.ComplainContentrs && this.EditMsg.ComplainContentrs != '') {
+              var array = this.EditMsg.ComplainContentrs.split(',');
+              if (array != null && array.length > 0) {
+                array.forEach(subItem => {
+                  this.themeList.forEach(x => {
+                    if (subItem==x.Name) {
+                       x.isCheck=true;
+                        this.themeCked.push(x.Id)
+                    }
+                  });
+                });
+              }
+            }
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {});
+      }
+    },
+    created() {
+      this.EditMsg.Id = this.$route.query.Id;
+      this.QMsg.TCID = this.$route.query.TCID;
+    },
+    mounted() {
+      this.getEnumeration();
+      if (this.QMsg.TCID) {
+        this.CheckTCID();
+      }
+      if (this.EditMsg.Id && this.EditMsg.Id > 0) {
+        this.GetData();
+      }
+    }
+  };
+
+</script>

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

@@ -1002,6 +1002,14 @@ export default {
                                 title: '餐厅套餐查询'
                             },
                         },
+                        {
+                            path: '/FoodOrder', //餐厅订单
+                            name: 'FoodOrder',
+                            component: resolve => require(['@/components/Restaurant/FoodOrder'], resolve),
+                            meta: {
+                                title: '餐厅订单'
+                            },
+                        },
                         {
                             path: '/ChangeDining', //更换餐厅
                             name: 'ChangeDining',
@@ -3423,7 +3431,16 @@ export default {
                 meta: {
                     title: '酒店查询'
                 },
-            }]
+            },
+            {
+                path: '/AddSupplierComplaints',    //供应商=>供应商投诉
+                name: 'AddSupplierComplaints',
+                component: resolve => require(['@/components/Supplier/AddSupplierComplaints'], resolve),
+                meta: {
+                    title: '供应商投诉'
+                },
+            }
+        ]
         },
     ]
 }