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

src/components/FinancialModule/BasicDocuments.vue

@@ -1344,10 +1344,14 @@ export default {
           },null)
         },
         jumpPlanPage(path, id){
-            this.$router.push({
-                name: path,
-                query: { id: id, isUpdate: false, blank: 'y'}
-            })
+            this.apipost('dmcstatistics_post_GetTCIDsByOneTCID', {TCID: id}, res=>{
+                if(res.data.resultCode==1){
+                    this.$router.push({
+                        name: path,
+                        query: { id: res.data.data.TCIDs, isUpdate: false, blank: 'y'}
+                    })
+                }
+            }, null)
         },
         jumpPage(path,id,type){
             if(type==1){

src/components/Hotel/HotelProductManage2.vue

@@ -143,6 +143,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+           <el-col :span="6">
+            <el-form-item label="提前还房天数">
+              <el-input-number v-model="msg2.BeforeDay" :precision="2" :min="0"
+                @keyup.native="checkInteger(msg2,'BeforeDay')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="免间数">
+              <el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
+                @keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col
           <el-col :span="6">
             <el-form-item label="标准间成本价">
               <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@@ -355,17 +367,29 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="提前还房天数">
+              <el-input-number v-model="msg.BeforeDay" :precision="2" :min="0"
+                @keyup.native="checkInteger(msg,'BeforeDay')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="免间数">
+              <el-input-number v-model="msg.FreeRoomNum" :precision="2" :min="0"
+                @keyup.native="checkPrice(msg,'FreeRoomNum')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="标准间成本价">
               <el-input-number v-model="msg.CostPrice" :precision="2" :min="0"
-                @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
+                @keyup.native="checkPrice(msg,'CostPrice')" maxlength="10"></el-input-number>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
             <el-form-item label="散客价">
               <el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"
-                @keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
+                @keyup.native="checkPrice(msg,'SanKePrice')" maxlength="10"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -577,7 +601,9 @@
           DateList: [],
           SanKePrice: 0, //散客价
           BatchNumber: 1, //批次号
-          TaxesPrice: 0 //税金
+          TaxesPrice: 0, //税金
+          BeforeDay:0,//提前还房天数
+          FreeRoomNum:0,//免间数
         },
         msg2: {
           Hotel: '0',
@@ -607,7 +633,9 @@
           DateList: [],
           SanKePrice: 0, //散客价
           BatchNumber: 1, //批次号
-          TaxesPrice: 0 //税金
+          TaxesPrice: 0, //税金
+          BeforeDay:0,//提前还房天数
+          FreeRoomNum:0,//免间数
         },
         rules: {
           InventoryType: {
@@ -931,6 +959,8 @@
             this.msg.SanKePrice = data.SanKePrice;
             this.msg.BatchNumber = data.BatchNumber;
             this.msg.TaxesPrice = data.TaxesPrice;
+            this.msg.BeforeDay=data.BeforeDay;
+            this.msg.FreeRoomNum=data.FreeRoomNum;
           }
         })
       },
@@ -1009,6 +1039,8 @@
                 this.msg.SanKePrice = 0;
                 this.msg.BatchNumber = 1;
                 this.msg.TaxesPrice=0;
+                this.msg.BeforeDay=0;
+                this.msg.FreeRoomNum=0;
               } else {
                 this.Error(res.data.message)
               }
@@ -1025,6 +1057,8 @@
         this.msg2.SanKePrice = 0;
         this.msg2.BatchNumber = 1;
         this.msg2.TaxesPrice = 0;
+        this.msg2.BeforeDay=0;
+        this.msg2.FreeRoomNum=0;
       },
       //批量删除
       delete2Reset: function () {
@@ -1039,6 +1073,8 @@
               that.msg2.SanKePrice = 0;
               that.msg2.BatchNumber = 1;
               that.msg2.TaxesPrice = 0;
+              that.msg2.BeforeDay=0;
+              that.msg2.FreeRoomNum=0;
             } else {
               that.Error(res.data.message)
             }
@@ -1047,7 +1083,6 @@
       },
       // 页面编辑保存
       edit2Save: function () {
-        console.log("msg2",this.msg2);
         this.$refs['hotelProductForm2'].validate((valid) => {
           if (valid) {
             this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => {
@@ -1059,6 +1094,8 @@
                 this.msg2.SanKePrice = 0;
                 this.msg2.BatchNumber = 1;
                 this.msg2.TaxesPrice = 0;
+                this.msg2.BeforeDay=0;
+                this.msg2.FreeRoomNum=0;
               } else {
                 this.Error(res.data.message)
               }
@@ -1105,7 +1142,6 @@
       this.initSupplier();
     }
   }
-
 </script>
 
 <style>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -446,7 +446,7 @@
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
         <th>预付合计</th>
-        <th>团号</th>
+        <th width="140">团号</th>
         <th>实际领款</th>
         <th>财务单号</th>
         <th>操作</th>
@@ -454,12 +454,12 @@
       <tr v-for='(item, index) in nav' >
         <td rowspan="2" width="180" v-if="index===0">总金额： {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td>
         <td>{{item.TCNUMS}}</td>
-        <td>
-          <p v-if="item.LeaderGetPrice>0">已领款：{{moneyFormat(item.LeaderGetPrice)}}</p>
+        <td style="display: flex;align-items: center;padding: 5px 20px; height: 40px;">
+          <p style="padding-right: 20px;" v-if="item.LeaderGetPrice>0">已领款：<span style="color: red;">{{moneyFormat(item.LeaderGetPrice)}}</span></p>
           <el-input v-if="item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
         </td>
         <td>
-          <span v-for="(subItem, subIndex) in item.FinanceIds" class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>
+          <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem)">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('DebitNote', subItem)">借支单</span></p>
         </td>
         <td width="80" class="_zhidan">
           <input type="button" v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单" class="normalBtn" @click="goZhiDan(item)" />

src/components/Ticketing/PassengerList.vue

@@ -486,9 +486,9 @@
         let orderObj = {
           OrderID: 0,
           OrderSource: 4,
-          Obj: {},
+          Obj: JSON.parse(this.$route.query.Obj),
           SourceID: this.$route.query.id,
-          TCIDList: [],
+          TCIDList: JSON.parse(this.$route.query.TCIDList),
           isFromPassenger:true,
         }
         this.$router.push({

src/components/Ticketing/TicketManager.vue

@@ -1551,7 +1551,7 @@
                       </div>
                     </li> -->
                     <li v-else-if="item.FinalPayment!=''">
-                      <div @click="goCustomList('PassengerList',item,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
+                      <div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
                         <el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
                           <span>尾</span>
                         </el-tooltip>
@@ -2556,14 +2556,18 @@
         });
       },
       //跳转至旅客名单
-      goCustomList(path, obj, title){
+      goCustomList(path, obj, type, title){
+        console.log(obj.TCIDList)
         this.$router.push({
           name: path,
           query: {
             blank: 'y',
             isFromTk:true,
             id: obj.ID,
-            TCIDList: obj.TCIDList,
+            Obj: JSON.stringify({
+              Type: type
+            }),
+            TCIDList: JSON.stringify(obj.TCIDList),
             companyIDList: obj.OutBranchIdList,
             tab: title
           }

src/components/activity/MemberLevel.vue

 <template>
   <div class="flexOne">
     <div class="query-box">
-      <ul class="user_time_picker"> 
+      <ul class="user_time_picker">
         <li>
-          <input type="button" @click=" " class="hollowFixedBtn" value="查询">
-          <input type="button" @click="outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
+          <span>
+            <em>等级名称</em>
+            <el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>状态</em>
+            <el-select filterable v-model="msg.state">
+              <el-option label="不限" :value="-1"></el-option>
+              <el-option label="正常" :value="1"></el-option>
+              <el-option label="禁用" :value="0"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" value="查询">
+          <input type="button" @click="outerVisible = true,dialogTitle='新增等级',resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
         </li>
       </ul>
     </div>
@@ -13,27 +29,31 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>会员等级</th>
-        <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 in dataList">
-         <td>{{item.rank}}</td>
-         <td>{{item.awardName}}</td>
-         <td>{{item.awardCount}}</td>
-         <td>{{item.awardWinningCount}}</td>
-         <td>223</td>
-         <td>22</td>
+         <td>{{item.name}}</td>
+         <td>
+           <span v-for="son in item.jurisdictionList">
+            {{son.name}}
+           </span>
+         </td>
+         <td>{{item.tradeMoneyReq}}</td>
+         <td>{{item.tradePeopleReq}}</td>
+         <td>{{item.remark}}</td>
+         <td>{{item.state === 1 ? '正常' : '禁用'}}</td>
          <td>
             <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
                 <el-button
                 type="primary"
                 icon="el-icon-edit"
                 circle
-                @click="outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
+                @click="outerVisible=true,dialogTitle='修改等级',updateData(item)"
                 ></el-button>
             </el-tooltip>
          </td>
@@ -48,33 +68,32 @@
       :title="dialogTitle"
       :visible.sync="outerVisible"
       center
-      :before-close="closeChangeMachie"
-    >
+      :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="memberLevel">
-                <el-input v-model="addMsg.memberLevel" class="w217" />
+              <el-form-item label="等级名称" prop="name">
+                <el-input v-model="addMsg.name" class="w217" />
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="等级名称" prop="memberName">
-                <el-input v-model="addMsg.memberName" class="w217" />
+              <el-form-item label="	等级状态" prop="state">
+                <el-select filterable v-model="addMsg.state">
+                  <el-option label="正常" :value="1"></el-option>
+                  <el-option label="禁用" :value="0"></el-option>
+                </el-select>
               </el-form-item>
             </td>
           </tr>
             <td>
-              <el-form-item label="积分" prop="integral">
-                <el-input v-model="addMsg.integral" class="w217" />
+              <el-form-item label="交易金额要求" prop="tradeMoneyReq">
+                <el-input v-model="addMsg.tradeMoneyReq" placeholder="0为无要求" class="w217" />
               </el-form-item>
             </td>
             <td>
-              <el-form-item label="特权" prop="privilege"  >
-                <el-select filterable v-model="addMsg.privilege" class="w217" >
-                  <el-option :label="$t('pub.unlimitedSel')" :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 label="交易人头数要求" prop="tradePeopleReq"  >
+                <el-input v-model="addMsg.tradePeopleReq" placeholder="0为无要求" class="w217" />
               </el-form-item>
             </td>
           </tr>
@@ -107,22 +126,23 @@ export default {
     return {
       //请求
       msg: {
-        lotteryId: '',
+        state: -1,
+        name: '',
       },
       addMsg:{
-          id:0,
-          memberLevel: '',
-          memberName: '',
-          integral: '',
-          privilege: '',
-          standard: '',
-          condition: ''
+        id:0,
+        name: '',
+        state: '',
+        tradeMoneyReq: '',
+        tradePeopleReq: '',
+        remark: '',
+        jurisdictionList: []
       },
      rules:{ 
         memberLevel: [{ required: true, message: '请输入会员等级', trigger: "blur" }],
-        memberName: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
-        integral: [{required: true, message: '请输入积分', trigger: "blur"}],
-        privilege: [{ required: true, message: '请选择特选', trigger: "change" }],
+        name: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
+        tradeMoneyReq: [{required: true, message: '交易金额要求', trigger: "blur"}],
+        tradePeopleReq: [{ required: true, message: '交易人头数要求', trigger: "change" }],
         standard: [{ required: true, message: '请输入升降级标准', trigger: "blur" }],
         condition: [{ required: true, message: '请输入星级有效期延长的条件', trigger: "blur" }],
       },
@@ -134,8 +154,7 @@ export default {
     };
   },
   mounted() {
-    this.msg.lotteryId = this.$route.query.lotteryId;
-    // this.getList();
+    this.getList();
   },
   filters: {
   },
@@ -144,7 +163,7 @@ export default {
     //获取数据
     getList() {
       this.loading = true;
-      this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
+      this.apiJavaPost("/api/member/getmemberrate", this.msg, res => {
         this.loading = false;
         if (res.data.resultCode === 1) {
           this.dataList = res.data.data;

src/components/leaderPay2.vue

@@ -161,7 +161,7 @@
                                 </div>
                             </td>
                             <td>
-                                <template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
+                                <template v-for='(sitem,sindex) in item.DiningSummaryList'>
                                     {{sitem.Remarks}}
                                 </template>
                             </td>

src/router/config.js

@@ -1170,7 +1170,16 @@ export default {
                             meta: {
                                 title: '购物报账'
                             },
-                        }, {
+                        }, 
+                        {
+                            path: '/ShoppingReimbursement2', //分公司购物报账
+                            name: 'ShoppingReimbursement2',
+                            component: resolve => require(['@/components/ShoppingStore/ShoppingReimbursement2'], resolve),
+                            meta: {
+                                title: '分公司购物报账'
+                            },
+                        },
+                        {
                             path: '/ShoppingReimbursementDetails', //购物报账 详情
                             name: 'ShoppingReimbursementDetails',
                             component: resolve => require(['@/components/ShoppingStore/ShoppingReimbursementDetails'], resolve),