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

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

@@ -1412,35 +1412,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>
@@ -1514,6 +1486,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>
@@ -4001,6 +3974,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/dmc/manager/dmcTotalTable.vue

@@ -228,11 +228,11 @@
                     <br/>
                     <el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
                     <el-popover placement="bottom" width="300" trigger="click">
-                      <el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input>
+                      <el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
                       <p class="alcenter mt10">
                         <input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
                       </p>
-                      <el-button type="primary" slot="reference" @click='ClickNumItem(outItem.NewCombinationNum,outItem.TCIDs)'
+                      <el-button type="primary" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
                         style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
                     </el-popover>
                   </el-button-group>
@@ -243,6 +243,7 @@
               <td colspan="20" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
+                  <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
                   <div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
                   <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
                 </div>
@@ -285,7 +286,7 @@
         colspanTotal: 0,
         //地接团号对象
         NumObj: {
-          newCombinationNum: "",
+          DMCNum: "",
           TCIDs: ""
         }
       }
@@ -443,15 +444,22 @@
           }
         }, err => {})
       },
-      ClickNumItem(newCombinationNum, tcids) {
-        this.NumObj.newCombinationNum = newCombinationNum;
+      ClickNumItem(DMCNum,newCombinationNum, tcids) {
+        if(DMCNum&& DMCNum!="")
+        {
+            this.NumObj.DMCNum = DMCNum;
+        }
+        else
+        {
+            this.NumObj.DMCNum = newCombinationNum;
+        }
         this.NumObj.TCIDs = tcids;
       },
       //保存地接团号
       UpdateCombinationNum() {
         this.loading = true;
         let msg = {
-          newCombinationNum: this.NumObj.newCombinationNum,
+          DMCNum: this.NumObj.DMCNum,
           TCIDs: this.NumObj.TCIDs
         };
         this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {

src/router/config.js

@@ -2357,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),
@@ -2739,6 +2746,21 @@ export default {
               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: '奖项列表'
+              }
             }
           ]
         },