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

src/components/activity/PersonnelManagement.vue

@@ -355,11 +355,11 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 
-.personTable .el-table--border::after, .personTable .el-table--group::after, .personTable .el-table::before{
+/* .personTable .el-table--border::after, .personTable .el-table--group::after, .personTable .el-table::before{
   background-color: transparent;
-}
+} */
 .personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 5px;
@@ -370,19 +370,18 @@ export default {
   background: #fff;
   padding: 2px
 }
-.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
+/* .personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb {
   height:4px;
   width: 4px;
   background:#6A0404;
  border-radius:5px;
-}
-.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-track {
+} */
+/* .personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-track {
   -webkit-box-shadow: inset 0 0 2px #6A0404;
   border-radius:5px;
   background: transparent;
-}
-
+} */
+/* 
 .personTable .el-table--striped .el-table__body tr.el-table__row--striped.current-row td, 
 .personTable .el-table__body tr.current-row>td, 
 .personTable .el-table__body tr.hover-row.current-row>td, 
@@ -401,7 +400,7 @@ export default {
 .personTable .el-table tbody tr:hover td:first-child{
     color:#fff!important;
     background:rgba(193,39,45,0.5)
-}
+} */
 .personTable .el-table tbody td:first-child{
     background:rgba(255,255,255,0.5);
 }

src/components/dmc/manager/dmcTotalTable.vue

@@ -284,6 +284,9 @@
               <td>
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
                   @click="DownLoadGuestList(item,outItem,index)">出境名单</a>
+             
+                 <a style="text-decoration:underline;cursor:pointer;margin-top:5px;display:inline-block;" title="点击下载电话名单"
+                  @click="DownLoadGuestTelList(item,outItem,index)">电话名单</a>
               </td>
               <td>
                 <div class="fz16 fbold linkspan">
@@ -1041,19 +1044,18 @@
         }, err => {})
       },
       //下载旅客名单
-      DownLoadGuestList(item, outItem,index) {
+      DownLoadGuestList(item, outItem, index) {
         this.loading = true;
-        var nDmcNum=outItem.NewCombinationNum;
-        if(outItem.PriceCommonList.length>1)
-        {
-          var NIndex=index+1;
-          nDmcNum= nDmcNum.replace(/^\s*|\s*$/g,"")+NIndex;
+        var nDmcNum = outItem.NewCombinationNum;
+        if (outItem.PriceCommonList.length > 1) {
+          var NIndex = index + 1;
+          nDmcNum = nDmcNum.replace(/^\s*|\s*$/g, "") + NIndex;
         }
         //导出报表
         let msg = {
           TCID: item.TCID,
-          DMCNum:nDmcNum,
-          InOut:item.InOut
+          DMCNum: nDmcNum,
+          InOut: item.InOut
         };
         var fileName = "出境名单表.doc";
         if (item.TCNUMS != null) {
@@ -1065,6 +1067,30 @@
             this.loading = false;
           });
       },
+      //下载电话名单
+      DownLoadGuestTelList(item, outItem, index) {
+        this.loading = true;
+        var nDmcNum = outItem.NewCombinationNum;
+        if (outItem.PriceCommonList.length > 1) {
+          var NIndex = index + 1;
+          nDmcNum = nDmcNum.replace(/^\s*|\s*$/g, "") + NIndex;
+        }
+        //导出报表
+        let msg = {
+          TCID: item.TCID,
+          DMCNum: nDmcNum,
+          InOut: item.InOut
+        };
+        var fileName = "电话名单.doc";
+        if (item.TCNUMS != null) {
+          fileName =
+            "【" + item.TCNUMS + "电话名单.doc";
+        }
+        this.GetLocalFile("travel_get_GetTravelGuestTelExport", msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
       //跳转手配书
       GoShoupei(outItem) {
         this.$router.push({

src/components/index.vue

@@ -899,7 +899,7 @@
       </div>
       <div style="text-align:center">
         <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
-        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/11" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
+        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/12" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
       </div>
       </div>      
      </div>
@@ -907,6 +907,7 @@
 </template>
 
 <script>
+
 import util from "../utils";
 import config from "../configs";
 import pageUtil from "../utils/page";
@@ -930,7 +931,7 @@ export default {
   data() {
     return {
       tsState:false,
-      tsNumber:3,
+      tsNumber:4,
       saleRnkShow: false,
       dialogTitleNot: '',
       outerVisibleNot: false,

src/components/personalCenter/index.vue

@@ -104,6 +104,7 @@
               <div class="per-tab">
                 <table>
                   <thead>
+                    <th>编号</th>
                     <th>别名</th>
                     <!-- <th>户名</th> -->
                     <!-- <th>开户行</th>
@@ -115,6 +116,7 @@
                   </thead>
                   <tbody>
                     <tr v-for="(item, index) in rList" :key="index">
+                      <td class="bold">{{item.ID}}</td> 
                       <td class="bold">{{item.Alias}}</td> 
                       <!-- <td class="bold">{{item.OpeningBank}}</td>
                       <td>{{item.BackNo | PNumber}}</td> -->

src/components/systemManagement/Manfunds.vue

@@ -117,6 +117,12 @@
   <div class="flexOne currentManage">
        <div class="query-box">
            <ul>
+               <li>
+                   <span>
+                       <em>编号</em>
+                       <el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" v-model="msg.ID"></el-input>
+                   </span>
+               </li>
                <li>
                    <span>
                        <em>银行账户</em>
@@ -190,6 +196,7 @@
           
            <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
                 <tr>
+                    <th>编号</th>
                     <th>别名</th>
                     <th>户名</th>
                     <th>开户行</th>
@@ -204,6 +211,7 @@
                     <th>操作</th>
                 </tr>
                 <tr v-for="(item,index) in DataList" :key="index">
+                    <td>{{item.ID}}</td>
                     <td>{{item.Alias}}</td>
                     <td>{{item.AccountName}}</td>
                     <td>{{item.OpeningBank}}</td>
@@ -321,6 +329,13 @@
             this.getList();
         },
 		methods: {
+            checkInt(obj){
+            //    obj.value = obj.value.replace(/[^/d.]/g,""); 
+
+                //必须保证第一位为数字而不是. 
+
+                // obj.value = obj.value.replace(/^/./g,""); 
+            },
             AddR(item){
                 this.form.ID=item.ID;
                 this.form.AccountName=item.AccountName;