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

src/App.vue

@@ -108,7 +108,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_t6jc0sd8qcj.css";
+  @import "//at.alicdn.com/t/font_635492_2e8rmd21ktq.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/Details.vue

@@ -805,7 +805,7 @@ export default {
     },
     getTitleByRouter(name){
       let obj={}
-      routerConfig.routes[11].children[10].children.forEach(x=>{
+      routerConfig.routes[11].children[11].children.forEach(x=>{
         if(x.name==name){
           obj.comp=x.component
           if(x.meta && x.meta.title)

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -36,7 +36,7 @@
           <el-col :span="6">
             <el-form-item label="出团公司：">
               <el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
-                <el-option label="不限" :value="-2"></el-option>
+                <el-option label="不限" :value="-1"></el-option>
                 <el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
               </el-select>
             </el-form-item>
@@ -85,7 +85,7 @@ export default {
         Month: 0,
         Money: '',
         sharelist: [],
-        BranchId: -2,
+        BranchId: -1,
       },
       data: [],
       DataList: [],
@@ -415,7 +415,8 @@ export default {
       let msg = {
         EmployeeId: this.userId,
         Year: this.year,
-        sharelist: []
+        sharelist: [],
+        BranchId: this.msg.BranchId,
       }
       this.monthList.forEach(x=>{
         let obj = {

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -990,7 +990,7 @@ export default {
                     }
                     if (x.Type===4){
                       AccList.forEach(y=>{
-                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池'){
+                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
                           newAccList.push(y)
                         }
                       })

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1404,35 +1404,7 @@
               <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
             </td>
             <td>
-              <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
-                <!-- <div class="personNolayer">
-                  <p>
-                    <span>成人：{{item.ManNum}}人</span>
-                    <span>儿童：{{item.ChirdNum}}人</span>
-                    <span>老人：{{item.OldPeopleNum}}人</span>
-                    <span>婴儿：{{item.BabyNum}}人</span>
-                    <span>单地接：{{item.AirticketNum}}人</span>
-                  </p>
-                  <table border="0" cellspacing="1" cellpadding="1">
-                    <tr>
-                      <th>姓名</th>
-                      <th>护照</th>
-                      <th>性别</th>
-                      <th>年龄</th>
-                      <th width="110">联系电话</th>
-                    </tr>
-                    <tr v-if='item.GuestList.length>0' v-for="(item2,index2) in item.GuestList" :key="index2">
-                      <td>{{item2.userName}}</td>
-                      <td>{{item2.passportNo}}</td>
-                      <td>{{item2.sexStr}}</td>
-                      <td>{{item2.age}}</td>
-                      <td>{{item2.mobilePhone}}</td>
-                    </tr>
-                    <tr v-if='item.GuestList.length==0'>
-                      <td colspan="5" align="center">暂无数据</td>
-                    </tr>
-                  </table>
-                </div> -->
+
                 <span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
                 <span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
                 <span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
@@ -1506,6 +1478,7 @@
                 <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
+                      <div @click="goToPassenger(item)">旅客名单</div>
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
@@ -3975,6 +3948,23 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
             tab: "团队收支明细"
           }
         });
+      },
+      //跳转到旅客名单
+      goToPassenger(item)
+      {
+        //passengerSaleList?id=11468&tcid=732&tcnum=NRT3U07190101A&isOrder=1&blank=y&tab=旅客名单
+        this.$router.push({
+          name: "passengerSaleList",
+          query: {
+            id: item.OrderId,
+            tcid:  this.msg.TCID,
+            tcnum:this.ConfigData.Config.TCNUM,
+            isOrder:1,
+            blank: "y",
+            tab: "旅客名单"
+          }
+        });
+
       }
     },
     mounted() {

src/components/activity/awardList.vue

+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul class="user_time_picker">
+        <li>
+          <input type="button" @click="outerVisible = true,dialogTitle='新增奖项',resetInfo()" class="normalBtn" value="新增">
+        </li>
+      </ul>
+    </div>
+
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th>奖项名</th>
+        <th>奖项数量</th>
+        <th>奖项状态</th>
+        <th>奖项类型</th>
+        <th>操作</th>
+      </tr>
+      <tr v-for="item in dataList">
+         <td>{{item.awardName}}</td>
+         <td>{{item.awardCount}}</td>
+         <td>{{item.awardStatus==1?'正常':'禁用'}}</td>
+         <td v-if="item.awardType==1">谢谢参与</td>
+         <td v-if="item.awardType==2">一般奖项</td>
+         <td v-if="item.awardType==3">优惠券</td>
+         <td>
+            <el-tooltip class="item" effect="dark" content="修改抽奖信息" placement="top">
+                <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                @click="outerVisible=true,dialogTitle='修改抽奖信息',updateData(item)"
+                ></el-button>
+            </el-tooltip>
+         </td>
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>没有找到你需要的数据</p>
+    </div>
+    <el-dialog
+      custom-class="w800"
+      :title="dialogTitle"
+      :visible.sync="outerVisible"
+      center
+      :before-close="closeChangeMachie"
+    >
+      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+        <table class="layerTable layerNoIcon">
+          <tr>
+            <td>
+              <el-form-item label="奖项名" prop="awardName">
+                <el-input v-model="addMsg.awardName" class="w217" placeholder="奖项名"/>
+              </el-form-item>
+            </td>
+            <td>
+              <el-form-item label="奖项数量" prop="awardCount">
+                <el-input v-model="addMsg.awardCount" class="w217" @keyup.native="checkInteger(addMsg,'awardCount')" placeholder="奖项数量"/>
+              </el-form-item>
+            </td>
+          </tr>
+            <td>
+              <el-form-item label="奖项类型" prop="awardType">
+                <el-select filterable v-model="addMsg.awardType" class="w217" @change="getAwardRelationId()">
+                  <el-option label="谢谢参与" :value="1"></el-option>
+                  <el-option label="一般奖项" :value="2"></el-option>
+                  <el-option label="优惠券" :value="3"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+            <td>
+              <el-form-item label="奖项关联" prop="awardRelationId" v-if="addMsg.awardType==3">
+                <el-select filterable v-model="addMsg.awardRelationId" class="w217" >
+                  <el-option label="不限" :value="0"></el-option>
+                  <el-option v-for="item in awardRelationList" :label="item.couponsName" :value="item.couponId" :key="item.couponId"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <el-form-item label="排序" prop="rank">
+                <el-input v-model="addMsg.rank" class="w217" @keyup.native="checkInteger(addMsg,'rank')" placeholder="排序"/>
+              </el-form-item>
+            </td>
+            <td>
+              <el-form-item label="奖项状态" prop="awardStatus">
+                <el-select filterable v-model="addMsg.awardStatus" class="w217">
+                  <el-option label="正常" :value="1"></el-option>
+                  <el-option label="禁用" :value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+          </tr>
+        </table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="outerVisible = false">取 消</button> &nbsp;
+        <button class="normalBtn" @click="submitForm('addMsg')">保存</button>
+      </div>
+    </el-dialog>
+</div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      //请求
+      msg: {
+        lotteryId: '',
+      },
+      addMsg:{
+          id:0,
+          lotteryId:0,
+          awardName:'',
+          awardType:1,
+          //谢谢参与和一般奖项为0，优惠券 请求接口返回
+          awardRelationId:'',
+          awardCount:'',
+          awardStatus:1,
+          rank:'',  
+      },
+     rules:{ 
+        awardName: [{ required: true, message: "请输入公司", trigger: "blur" }],
+        awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
+        awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
+        awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],
+        awardStatus: [{ required: true, message: "请选择奖项状态", trigger: "change" }],
+        rank: [{ required: true, message: "请输入排序", trigger: "blur" }],
+      },
+      loading:true,
+      outerVisible:false,
+      dialogTitle:'',
+      dataList:[],
+      awardRelationList:[],  
+    };
+  },
+  mounted() {
+    this.msg.lotteryId = this.$route.query.lotteryId;
+    this.getList();
+  },
+  filters: {
+  },
+
+  methods: {
+    //获取数据
+    getList() {
+      this.loading = true;
+      this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
+        console.log(res,'getList');
+        this.loading = false;
+        if (res.data.resultCode === 1) {
+          this.dataList = res.data.data;
+        } else {
+          this.Error(res.data.message)
+        }
+      }, null);
+    },
+    //提交
+    submitForm(addMsg) {
+      //提交创建、修改表单
+      this.$refs[addMsg].validate(valid => {
+        if (valid) {
+            this.addAward();
+        } else {
+          return false;
+        }
+      });
+    },
+    //提交添加
+    addAward(){
+        this.addMsg.lotteryId = this.$route.query.lotteryId;
+        if(this.addMsg.awardType==1||this.addMsg.awardType==2){
+          this.addMsg.awardRelationId = 0;
+        }
+        this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => {
+            console.log(res,'getList');
+            if (res.data.resultCode === 1) {
+                this.Success(res.data.message);
+                this.outerVisible = false;
+                this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+        }, null);
+    },
+    //修改信息
+    updateData(item){
+      this.addMsg.id=item.id;
+      this.addMsg.lotteryId = item.lotteryId;
+      this.addMsg.awardName = item.awardName;
+      this.addMsg.awardType = item.awardType;
+      this.addMsg.awardRelationId = item.awardRelationId;
+      this.addMsg.awardCount = item.awardCount;
+      this.addMsg.awardStatus = item.awardStatus;
+      this.addMsg.rank = item.rank;
+      this.getAwardRelationId();
+    },
+    //根据奖项类型请求关联Id
+    getAwardRelationId(){
+          let msg = {
+            couponId:0
+          }
+          this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => {
+              if (res.data.resultCode === 1) {
+                  this.awardRelationList = res.data.data;
+              } else {
+                this.Error(res.data.message)
+              }
+          }, null); 
+    },
+    //重置信息
+    resetInfo(){
+        var newMsg = {
+          id:0,
+          lotteryId:0,
+          awardName:'',
+          awardType:1,
+          awardRelationId:'',
+          awardCount:'',
+          awardStatus:1,
+          rank:'',  
+        }
+        this.addMsg = newMsg;
+    },
+    closeChangeMachie(done) {
+      //弹出框关闭初始化弹框内表单
+      done();
+      this.resetForm("addMsg");
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+   }
+};
+</script>
\ No newline at end of file

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue

@@ -21,6 +21,9 @@
         <div v-if="nextShow()">
             <i :class="isHorizontal === true?'iconfont ' + icon.rightZ:'iconfont ' + icon.bottomZ" @click="toNextZ"></i>
         </div>
+        <div v-if="isReset === true">
+            <i title="重置图片位置" :class="'iconfont ' + icon.reset" @click="toReset"></i>
+        </div>
     </div>
 </template>
 
@@ -76,6 +79,11 @@
             isDelete: {
                 type: Boolean,
                 default: true
+            },
+            // 是否重置
+            isReset: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -91,7 +99,8 @@
                     rightY: 'icon-right1',
                     rightZ: 'icon-right',
                     bottomY: 'icon-arrowdown',
-                    bottomZ: 'icon-zhidi'
+                    bottomZ: 'icon-zhidi',
+                    reset: 'icon-zhongzhi'
                 }
             }
         },
@@ -146,6 +155,9 @@
             },
             toDelete: function () {
                 this.$emit('toDelete', this.name, this.index1, this.index2)
+            },
+            toReset: function () {
+                this.$emit('toReset', this.name, this.index1, this.index2)
             }
         }
     }

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -55,7 +55,9 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete">
+                  @toDelete="imgToDelete"
+                  @toReset="resetXY"
+                  :isReset='true'>
                 </vToolBar>
                 <input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic">
               </div>
@@ -495,7 +497,9 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete">
+                @toDelete="imgToDelete"
+                @toReset="resetXY"
+                :isReset='true'>
               </vToolBar>
               <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic">
             </div>
@@ -656,7 +660,9 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete">
+                  @toDelete="imgToDelete"
+                  @toReset="resetXY"
+                  :isReset='true'>
                 </vToolBar>
                 <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic">
               </div>
@@ -933,7 +939,9 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete">
+                @toDelete="imgToDelete"
+                @toReset="resetXY"
+                :isReset='true'>
               </vToolBar>
               <input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic">
             </div>
@@ -1846,6 +1854,18 @@
         blockList.splice(index1,1);
         blockList.push(JSON.parse(nowBlock))
       },
+      // 图片高度重置
+      resetXY: function (name, index1, index2) {
+        let blockList = [];
+        if (name === 'hotel') {
+          blockList = this.hotelObj.list
+        } else if (name === 'viewSpot') {
+          blockList = this.viewSpotObj.list
+        } else if (name === 'restaurant') {
+          blockList = this.restaurantObj.list
+        }
+        this.imgTopReset(name, index1, index2);
+      },
       // 版块删除
       bolckToDelete: function (name, index1, index2) {
         console.log(name, index1)

src/components/temp/activity.vue

+
+<style  lang="less" scoped>
+   @import "../../assets/css/main.less";
+   @import "../../assets/css/cssReset.css";
+</style>
+
+<template>
+  <div>
+  	 	 <leftNav></leftNav>
+  </div>
+</template>
+
+<script>
+    import leftNav from '../public/leftNav.vue'		
+	export default {
+		data (){
+			return{
+				
+			}
+		},
+		components:{
+			leftNav
+		},
+		mounted(){
+			
+		},
+		methods:{
+			
+		}	
+	}
+
+
+
+		
+</script>
\ No newline at end of file

src/plug/index.js

@@ -145,7 +145,8 @@ export default {
           //上传站点
           UploadUrl: locationName.indexOf('oytour') !== -1||locationName.indexOf('viitto')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
           //文件站点
-          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" :  'http://127.0.0.1:8130'
+          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" : 'http://127.0.0.1:8130',
+          javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "https://reborn.oytour.com" : "http://192.168.2.215:9000",
         };
         return obj;
       },
@@ -289,7 +290,51 @@ export default {
             }
           }, faildCall)
       },
-
+      Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
+        if (msg == null || msg == "") {
+            msg = {}
+        }
+        var apiurl = this.domainManager().javaUrl + cmd;
+        var timestamp = (new Date()).valueOf();
+        this.apiurl = apiurl;
+        var token = "";
+        var key = "";
+        let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
+        let uid = userInfo.EmployeeId ? userInfo.EmployeeId : 0
+        if (this.getLocalStorage() != null) {
+            token = this.getLocalStorage().token;
+            key = this.getLocalStorage().SecretKey;
+        }
+        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+        var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+        var postData = {
+            "msg": msg,
+            "timestamp": timestamp,
+            "token": token,
+            "sign": md5Str,
+            "uid": uid
+        }
+        if(localStorage.g && localStorage.g!='undefined'){
+            postData.groupId = parseInt(JSON.parse(localStorage.g).i)
+        }
+        this.$http.post(apiurl, postData, {
+            headers: {
+                'Content-Type': 'application/json',
+                'Referer-Viitto': this.$route.path
+            }
+        })
+        .then(res => {
+            if (res.resultCode == 10000 || res.resultCode == 10001) {
+                this.$router.push({
+                    path: '/login'
+                })
+            } else if (res.resultCode == 10005) {
+                this.$router.go(-1)
+            } else {
+                successCall(res)
+            }
+        }, faildCall)
+      },
       //下载文件
       Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
         var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;

src/router/config.js

@@ -91,6 +91,11 @@ export default {
           name: 'dmc',
           component: resolve => require(['@/components/temp/dmc'], resolve),
         },
+        {  // 营销活动
+          path: '/activity',
+          name: 'activity',
+          component: resolve => require(['@/components/temp/activity'], resolve),
+        },
         {
           path: '/operation',
           name: 'operation',
@@ -2352,7 +2357,14 @@ export default {
               meta: {
                 title: '年度营收报表'
               },
-            }, { // 销售   制作广告
+            }, {
+              path: '/JumpReport',
+              name: 'JumpReport',
+              component: resolve => require(['@/components/FinancialModule/JumpReport'], resolve),
+              meta: {
+                title: '单据明细'
+              },
+            },{ // 销售   制作广告
               path: '/advert',
               name: 'advert',
               component: resolve => require(['@/components/SalesModule/advert'], resolve),
@@ -2726,6 +2738,29 @@ export default {
               meta: {
                 title: '销售提成规则'
               }
+            },
+            {
+              path: '/CouponList',
+              name: 'CouponList',
+              component: resolve => require(['@/components/activity/CouponList'], resolve),
+              meta: {
+                title: '优惠券列表'
+              }
+            },
+            {
+              path: '/LuckyDraw',
+              name: 'LuckyDraw',
+              component: resolve => require(['@/components/activity/LuckyDraw'], resolve),
+              meta: {
+                title: '抽奖列表'
+              }
+            },{
+              path: '/awardList',
+              name: 'awardList',
+              component: resolve => require(['@/components/activity/awardList'], resolve),
+              meta: {
+                title: '奖项列表'
+              }
             }
           ]
         },