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

src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue

@@ -70,7 +70,7 @@
         </el-table-column>
       </el-table>
       </div>
-        <div class="totalMoney-box" v-if="OriginalMoneyThe>0">
+        <div class="totalMoney-box" v-if="OriginalMoneyThe!=0">
           <div>
             <span style="display: inline-block;
               padding: 2px 8px;
@@ -92,7 +92,7 @@
             </div>
           </template>
         </div>
-        <div class="totalMoney-box" v-if="OriginalMoneyClosed>0" :style="{padding: OriginalMoneyThe>0&&isHandlingChargeThe?'0':'10px 0'}">
+        <div class="totalMoney-box" v-if="OriginalMoneyClosed!=0" :style="{padding: OriginalMoneyThe!=0&&isHandlingChargeThe?'0':'10px 0'}">
           <div>
             <span style="display: inline-block;
               padding: 2px 8px;
@@ -189,10 +189,10 @@
           })
           this.OriginalMoney = (OriginalMoneyThe-OriginalMoneyClosed)/100
           this.HandlingChargeMoney = (HandlingChargeMoneyThe-HandlingChargeMoneyClosed)/100
-
+          //支出
           this.OriginalMoneyThe = OriginalMoneyThe/100
           this.HandlingChargeMoneyThe = HandlingChargeMoneyThe/100
-
+          // 收入
           this.OriginalMoneyClosed = OriginalMoneyClosed/100
           this.HandlingChargeMoneyClosed = HandlingChargeMoneyClosed/100
         },
@@ -205,14 +205,14 @@
         let ids
         ids = this.dataList.map(x=>{ return x.FrID})
         let orderObj = {
-          CostType: this.OriginalMoneyThe>0?1547:null,
+          CostType: this.OriginalMoneyThe!=0?1547:null,
           CostType2: this.isHandlingChargeThe?1547:null,
           CostType3: this.isHandlingChargeThe&&this.balanceMoney?114:null,//114转账手续费
           HandlingChargeMoney: this.isHandlingChargeThe?this.HandlingChargeMoneyThe:null,//手续费
           balanceMoney: this.isHandlingChargeThe&&this.balanceMoney?this.balanceMoney:null,//差额
           OtherType: 75,
-          Money: this.OriginalMoneyThe>0?this.OriginalMoneyThe:null,
-          MoneyClosed: this.OriginalMoneyClosed>0?Number(`-${this.OriginalMoneyClosed}`):null,
+          Money: this.OriginalMoneyThe!=0?this.OriginalMoneyThe:null,
+          MoneyClosed: this.OriginalMoneyClosed!=0?Number(`-${this.OriginalMoneyClosed}`):null,
           isVerifyMoney: true,
           ReFinanceIds: ids.join(','),//单号
           ReFinanceId2: 3,//成本

src/components/FinancialModule/accountingWork.vue

@@ -22,6 +22,21 @@
                     ></el-option>
                     </el-select>
                 </span>
+                <span>
+                    <em>线路</em>
+                    <el-select class="w200"
+                    filterable
+                    v-model="msg.LineID"
+                    >
+                    <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
+                    <el-option
+                        v-for="(item,index) in LineList"
+                        :label="item.LineName"
+                        :value="item.LineID"
+                        :key="index+60000"
+                    ></el-option>
+                    </el-select>
+                </span>
                 </li>
                <li>
                     <button class="normalBtn" @click="getList" >查询</button>
@@ -42,6 +57,7 @@
                         <th>{{$t('system.query_company')}}</th>
                         <th>{{$t('fnc.w_ywrenyuan')}}</th>
                         <th>流程</th>
+                        <th>线路</th>
                         <th>{{$t('fnc.w_fzfangxiang')}}</th>
                         <th>{{$t('system.table_operation')}}</th>
                     </tr>
@@ -54,6 +70,9 @@
                         <td>
                             <span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span>
                         </td>
+                        <td>
+                            <span v-for="(i,ix) in item.LineList" :key="ix+7000">{{i.Name}} <span v-if="ix!=item.LineList.length-1">,</span> </span>
+                        </td>
                         <td>
                             <span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
                             <span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
@@ -198,6 +217,24 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="线路">
+                                <el-select
+                                    v-model="addMsg.LineListArr"
+                                    filterable
+                                    multiple
+                                    collapse-tags
+                                    @change="$forceUpdate()"
+                                    :placeholder="$t('pub.pleaseImport')">
+                                    <el-option
+                                        v-for="(item,index) in LineList"
+                                        :key="index+700"
+                                        :label="item.LineName"
+                                        :value="item.LineID">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
                        <el-col :span="6">
                             <el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
                                 <el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
@@ -245,6 +282,7 @@ export default {
                 listArr:[],
                 BranchId:'',
                 Direct:'',
+                LineList:[]
             },  
             type:-1,
             addShow:false,
@@ -299,6 +337,7 @@ export default {
                 Status:'0',
             },
             SingleList:[],
+            LineList:[],
         }
     },created(){
         let userInfo = this.getLocalStorage();
@@ -313,6 +352,7 @@ export default {
         this.tableSize = this.msg.pageSize = parseInt(cH/45);
         this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.getSingleList();
+        this.getLineList();
     },methods:{
         getSingleList(){  // 获取费用类型
 			this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
@@ -321,6 +361,15 @@ export default {
                 }else{}
 			},err=>{})
 		},
+        getLineList(){
+            this.apipost("line_post_GetAllList", {}, res => {
+                if (res.data.resultCode == 1) {
+                this.LineList = res.data.data;
+                } else {
+                this.$message.error(res.data.message);
+                }
+            });
+        },
         switchMethod(t){
             this.msg.pageIndex = 1;
             if(t===1){
@@ -392,9 +441,22 @@ export default {
                     }
                 })      
             })
+            let LineListArr=this.addMsg.LineListArr;
+            let lineArr =[];
+            LineListArr.forEach(item=>{
+                this.LineList.forEach(val=>{
+                    let obj={};
+                    if(item==val.LineID){
+                        obj.Id=val.LineID;
+                        obj.Name=val.LineName;
+                        lineArr.push(obj);
+                    }
+                })      
+            })
                     
             this.addMsg.emList = list4;
             this.addMsg.TemplateList = newArr;
+            this.addMsg.LineList = lineArr;
             this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
                 if(r.data.resultCode==1){
                     this.$message.success(r.data.message);
@@ -478,6 +540,7 @@ export default {
                     this.addMsg = data;
                     this.addMsg.listArr = [];
                     this.addMsg.TemplateListArr = [];
+                    this.addMsg.LineListArr=[];
                     if(data.emList&&data.emList.length>0){
                         data.emList.forEach(x=>{
                             this.remoteMethod(x.emName);
@@ -489,6 +552,11 @@ export default {
                             this.addMsg.TemplateListArr.push(x.Id)
                         })                        
                     }
+                    if(data.LineList&&data.LineList.length>0){
+                        data.LineList.forEach(x=>{
+                            this.addMsg.LineListArr.push(x.Id)
+                        })                        
+                    }
                     this.addMsg.accountant_list = [];
                     this.addShow = true;                    
                 } else {
@@ -510,7 +578,9 @@ export default {
                 TemplateListArr:[],
                 TemplateList:[],
                 BranchId:'',
-                Direct:''
+                Direct:'',
+                LineList:[],
+                LineListArr:[]
             }
             this.CostIdS = [];
             this.searchList = [];

src/components/administrative/empBankAccount.vue

@@ -78,6 +78,10 @@
 				<th>{{$t("ground.zhanghuleibie")}}</th>
 				<th>{{$t("ground.suoshujigou")}}</th>
 				<th>{{$t("fnc.acc")}}</th>
+				<th>{{ $t("fnc.khleixing") }}</th>
+				<th>创建人</th>
+				<th>{{$t("admin.admin_status")}}</th>
+				<th v-if="addMsg.Type==8">{{ $t("admin.admin_operate") }}</th>
 			</tr>
 			<tr v-for="(item,index) in accountList">
 				<td>{{item.OpenBankName}}</td>
@@ -91,6 +95,36 @@
 				<td>{{item.BankName}}</td>
 				<td>{{item.CardNum}}
 					<br/>{{item.AccountHolder}}</td>
+					<td>{{ item.TypeName }}</td>
+					<td>
+          {{item.CreateByName?item.CreateByName:'-'}}
+          <p>{{item.CreateDate?item.CreateDate:'-'}}</p>
+        </td>
+					<td>
+					<span v-if='item.Status!=0' style="color: #E95252;">{{$t('pub.fressSel')}}</span>
+					<span v-if='item.Status==0' style="color: #09D49D;">{{$t('pub.normalSel')}}</span>
+				</td>
+
+				<td class="empBankAccountIcon" v-if="addMsg.Type==8">
+          <el-button-group>
+         
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="绑定"
+              placement="top-start"
+            >
+              <el-button v-if="item.Type == 10"
+                @click="bindData(item.ID)"
+                type="primary"
+                style="background: #09d49d; border-color: #09d49d"
+                icon="iconfont icon-bianji-smal"
+              ></el-button>
+             
+            </el-tooltip>
+           
+          </el-button-group>
+        </td>
 			</tr>
 		</table>
 		</div>
@@ -407,6 +441,33 @@
 					that.$message.info('操作失败')
 				});
 			},
+
+			bindData(id){
+        		let that = this
+				this.$confirm("是否绑定当前付款对象", '提示', {
+					confirmButtonText: that.$t('pub.sureBtn'),
+					cancelButtonText: that.$t('pub.cancelBtn'),
+					type: 'warning'
+				}).then(() => {
+					this.apipost('admin_post_BindEmpBankAccount', {
+						BAId:id,
+						ObjID:this.$route.query.id,
+						Type:this.$route.query.type
+					}, res => {
+						if(res.data.resultCode == 1) {
+							that.$message.success('操作成功')
+							this.outerVisible=false;
+							that.getList();
+						}else{
+              that.$message.info('操作失败')
+            }
+					}, err => {})
+
+				}).catch(() => {
+					that.$message.info('操作失败')
+				});
+				
+			},
 			handleCurrentChange(val) {
 				this.msg.pageIndex = val;
 				this.getList();

src/components/index.vue

@@ -222,9 +222,9 @@
                   机票未绑团查看
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
-                <el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
+                <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
                   <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
-                  订单改价详情
+                  订单改价查看
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
                 <el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
@@ -1247,6 +1247,7 @@
     },
     data() {
       return {
+        ChangeThePriceList: [],
         ChangeThePriceData:[],
         ChangeThePriceVisible: false,//改价提醒
         UnboundDate: {},
@@ -1873,24 +1874,33 @@
       }
 
 
-      // 获取改价提醒
-      if(!localStorage.getItem("ChangeThePriceDataTime")||
-      (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
-        this.GetChangeThePrice()
-      }else{
-        // if(localStorage.getItem("ChangeThePriceData")){
-        //   this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData"))
-        // }
+      // 获取改价提醒  每月1到10号提示
+      let DateTime = new Date();
+      let Year = DateTime.getFullYear()
+      let Month = DateTime.getMonth()+1
+      let Months = Month>9?Month:'0'+Month
+      let StartDate = Year+'-'+Months+'-01'
+      let DateList = []
+      for(let i=0;i<10;i++){
+        DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
       }
-      // 两小时请求一次改价提醒
-      setInterval(()=>{
-        if(!this.ChangeThePriceVisible){
+      this.ChangeThePriceList = DateList.filter(x=>{
+        return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+      })
+      if(this.ChangeThePriceList.length>0){
+        if(!localStorage.getItem("ChangeThePriceDataTime")||
+        (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
           this.GetChangeThePrice()
-        }else{
-          clearInterval()
         }
-      },7200000)
-
+        // 两小时请求一次改价提醒
+        setInterval(()=>{
+          if(!this.ChangeThePriceVisible){
+            this.GetChangeThePrice()
+          }else{
+            clearInterval()
+          }
+        },7200000)
+      }
     },
     created() {
       if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {

src/components/myOrdersAllType/components/allListExaminePrice.vue

-<style scoped>
-  .groupTourOrder_count{
-    display: flex;
-    flex-wrap: wrap;
-
-  }
-  .groupTourOrder_count>div{
-    margin-right: 20px;
-  }
-  .groupTourOrder_count>div:last-child{
-    margin-right: 0;
-  }
-  .groupTourOrder_count_item{
-    max-width: 500px;
-  }
-  .groupTourOrder_count_item>p>span{
-    margin: 0;
-  }
-  .color_red_order{
-    color: red;
-  }
-  .HT_total{
-    display: flex;
-    flex-direction: column;
-    margin: 5px 0;
-  }
-  .HT_total p{
-    width: 100%;
-    display: block;
-  }
-  .HT_total p>span{
-    float: left;
-    display: inline-block;
-    /* width: 25%; */
-    margin-right: 20px;
-  }
-  .HT_total p>span:last-child{
-    margin-right: 0;
-  }
-    .TC_leftSearch>div{
-      padding:  5px 0;
-    }
-    .groupTourOrderByTuan_ico{
-      margin-left: 5px;
-    }
-    .groupTourOrderByTuan_ico>i{
-          display: inline-block;
-          margin: 0 5px 0 0;
-          width: 8px;
-          height: 8px;
-          border-radius: 2px;
-          vertical-align: middle;
-      }
-      .HotelWorkList .has-gutter tr th,
-      .el-table th.is-leaf {
-        background-color: #EAEAEA !important;
-      }
-
-      .HotelWorkList .HW_hotelDialog {
-        width: 900px;
-      }
-
-      .HotelWorkList .Hw_tableOne {
-        width: 100%;
-        height: 40px;
-        background-color: #EAEAEA;
-      }
-
-      .HotelWorkList .Hw_tableOne th {
-        text-align: center;
-      }
-
-      .HotelWorkList .HotelWorkInput .el-input {
-        width: 223px;
-      }
-
-      .HotelWorkList .HworkInput .el-input {
-        width: 210px;
-      }
-      /deep/.query-box li span>em{
-        min-width: 60px;
-      }
-
-    </style>
-
-    <template>
-      <div class="HotelWorkList">
-          <div class="query-box HotelWorkInput" style="border-bottom: none;">
-              <ul>
-              
-                <li>
-                  <span>
-                    <em>审核状态</em>
-                    <el-select v-model='msg.OrderState' class="w200">
-                        <!-- <el-option :value="0" label="不限"></el-option> -->
-                        <el-option v-for='item in OrderStatusList'
-                            :label='item.Name'
-                            :value='item.Id'
-                            :key='item.Id'>
-                        </el-option>
-                    </el-select>
-                  </span>
-                </li>
-                <li >
-                  <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
-                            @click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false"  />
-                </li>
-              
-                <li style="line-height: 30px; padding-left: 30px;">
-                 
-                </li>
-              
-              </ul>
-          </div>
-          <!-- 统计版块 -->
-   
-              <OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
-              <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
-              <el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
-              </el-pagination>
-
-
-      </div>
-    </template>
-    <script>
-      import OrderList from './OrderListExaminePrice.vue';
-      export default {
-        props:['pagesTitle','dataObj'],
-        components: { OrderList },
-        data() {
-          return {
-            CommissionTypeList:[
-              {Name: '不限',Id:'-1'},
-              {Name: '出境提成',Id:'1'},
-              {Name: '国内提成',Id:'2'},
-            ], 
-            employeeMsg:{ // 员工
-                  GroupId:'',
-                  BranchId:-1,
-                  DepartmentId:0,
-                  PostId:0,
-                  IsLeave:0,
-              },
-            showWarningSearch: false,
-            TotalMsg: null,
-            MultipleChoiceList: [ //多选项目
-                {
-                    Name: '机票',
-                    Id: '1'
-                }, {
-                    Name: '签证',
-                    Id: '2'
-                }, {
-                    Name: '地接',
-                    Id: '3'
-                }, {
-                    Name: '套餐',
-                    Id: '4'
-                }, {
-                    Name: '其他',
-                    Id: '5'
-                }
-            ],
-            userInfo: {},
-            HotelList: [],
-            loading: false,
-            isShow: false,
-            outerVisible: false,
-            //订单列表
-            OrderList: [],
-            //默认高度
-            tableHeight: 0,
-            msg:{
-            pageIndex: 1,
-            pageSize: 15,
-            OrderId: "", //订单id
-            OrderState: '0', //订单状态
-            OrderType: "0",//订单类型
-            },
-            total: 0,
-            currentPage: 1,
-            OrderTypeList:[],
-            orderType:[
-              {Name: this.$t('OrderList.orderType.tour'),ID:'1'},
-              {Name: this.$t('OrderList.orderType.guest'),ID:'2'},
-            ],
-            Title:'',
-              OrderStatusList: [
-                { Name: "不限", Id: "0" },
-                { Name: "待审核", Id: "1" },
-                { Name: "已通过", Id: "2" },
-                { Name: "已取消", Id: "3" },
-              ]
-          };
-        },
-        watch: {
-          pagesTitle(val,oldval){
-            this.Title = val
-          },
-          dataObj:{
-            handler(val, oldVal) {
-              this.msg.OrderType = val.tab
-              this.msg.OrderId = val.OrderId
-              this.GetList()
-            },
-            deep: true,
-          }
-        },
-        methods: {
-        
-        
-          //获取酒店订单列表
-          GetList() {
-            this.loading = true
-            let url = "CarSingle_post_GetExaminePriceOrderPageList"
-            this.apipost(url, this.msg,
-              res => {
-                if (res.data.resultCode == 1) {
-                  let data = res.data.data.pageData
-                  this.OrderList = data;
-                  this.total = res.data.data.count;
-                //   this.TotalMsg = res.data.data.StatModel
-                }else {
-                  this.Error(res.data.message);
-                }
-                this.loading = false
-              },
-              err => {this.loading = false}
-            );
-          },
-        
-          handleCurrentChange(val) {
-              this.msg.pageIndex = val;
-              this.GetList();
-          },
-          com_onresize() {
-            //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
-            var contentsHeight = document.body.clientHeight;
-            var h = contentsHeight - 50 - 180 - 40;
-            if (h < 110) {
-              return;
-            }
-            //设置table的行高
-            this.tableHeight = h;
-          },
-        },
-        created() {
-
-          let userInfo=this.getLocalStorage();
-          this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
-          if(this.$route.query.OrderId){
-            this.msg.OrderId=this.$route.query.OrderId
-          
-            this.msg.OrderState = '0'
-          }
-        
-        },
-        mounted() {
-          this.userInfo = this.getLocalStorage();
-          this.GetList();
-          //自适应高度调节
-          this.com_onresize();
-          window.onresize = () => {
-            this.com_onresize();
-          }
-        },
-      };
-
-    </script>