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

src/assets/css/summaryLogin.css

@@ -45,7 +45,7 @@
      font-size:18px;
      color:#333333;
  }
- .Summary_login_Div .icon-login-name,.icon-login-password{
+ .Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
     width:16px;
     height:15px;
     display:inline-block;

src/components/FinancialModule/BasicDocuments.vue

@@ -1623,7 +1623,7 @@ export default {
         let allMoney = 0
         this.payMsgList.forEach(x=>{
             allMoney+= x.allMoney;
-            // x.allMoney=(Math.round(x.allMoney * 100)) / 100;
+            x.allMoney=(Math.round(x.allMoney * 100)) / 100;
         })
         if(allMoney.toString().split(".")[1]){
             let num=allMoney.toString().split(".")[1].length;

src/components/FinancialModule/RecPayQuery.vue

@@ -842,6 +842,14 @@ export default {
         if(this.$route.query.Type){
             this.msg.Type = this.$route.query.Type+'';
         }
+        if(this.$route.query.rec){
+            this.msg.AccountType=15;
+            this.msg.TradeWay=4;
+            this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
+            this.msg.BankID=14;
+            this.transactionDate[0]=this.$route.query.StartDate;
+            this.transactionDate[1]=this.$route.query.StartDate;
+        }
     },components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
@@ -949,7 +957,7 @@ export default {
                     this.$message.error(res.data.message);
                 }
                 // this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
-                this.queryInfoInit();
+                // this.queryInfoInit();
                 this.currentPage = parseInt(this.msg.pageIndex);
             },err=>{})
         },
@@ -1049,7 +1057,6 @@ export default {
         },
         getAccountList(i,t){  //收款账户
             let accountList = [];
-            this.msg.BankID="";
             if(t==1){  // 银行
                 this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
                     if(res.data.resultCode == 1) {
@@ -1264,8 +1271,8 @@ export default {
                 QEndDate:this.msg.QEndDate,
                 QStartDate:this.msg.QStartDate,
                 OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
-              Sort:this.msg.Sort,
-              EmployeeId:this.msg.EmployeeId,
+                Sort:this.msg.Sort,
+                EmployeeId:this.msg.EmployeeId,
             }
             this.msg = msg;
         },

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -614,6 +614,7 @@ tr._item_list td:last-child {
   </div>
 </template>
 <script>
+import moment from 'moment'
 import Vue from "vue";
 import XLSX from "xlsx";
 import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
     }
   },
   methods: {
+    goRec(path,rowData){
+      let BankID="";
+      let StartDate="";
+      if(rowData.DataType===6){
+        BankID=14;
+      }
+      if(rowData.DataType===7){
+        BankID=15;
+      }
+      if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
+        StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
+      }
+      this.$router.push({
+        path: "/" + path,
+        query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"}
+      });
+    },
     goUrl(path, id) {
       this.$router.push({
         path: "/" + path,

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -75,7 +75,7 @@
                         <el-form-item :label="$t('fnc.fkduixiang')">
                             <el-select  filterable  v-model='msg.ClientID' >
                                 <el-option v-for='item in ClientAccountList'
-                                    :label='item.AccountAlias'
+                                    :label='`${item.AccountAlias}(${item.AccountHolder})`'
                                     :value='item.ID'
                                     :key='item.ID'>
                                 </el-option>

src/components/Supplier/roomQuery2.vue

@@ -2,22 +2,15 @@
   <div class="roomQuery">
     <div class="query-box" style="border-bottom: none;">
       <ul style="position:relative;">
-
         <li>
           <span>
             <em>月份</em>
-            <!-- <el-date-picker v-model="msg.MonthStr" type="monthrange" range-separator="至" start-placeholder="开始月份"
-              end-placeholder="结束月份">
-            </el-date-picker> -->
-
             <el-date-picker
-              v-model="msg.MonthStr"
-              type="monthrange"
-              range-separator="至"
-              start-placeholder="开始月份"
-              end-placeholder="结束月份">
+              v-model="msg.Month"
+              type="month"
+              placeholder="选择月">
             </el-date-picker>
-          </span>
+        </span>
         </li>
         <li style="position:absolute;right:10px;top:0;">
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
@@ -79,7 +72,7 @@
           TCNUM: '',
           PriceStatus: 0,
           CombinationNum: '',
-          MonthStr: "" //月份字符串
+          Month: "" //月份字符串
         },
         UserInfo: {},
         //分公司类表