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

src/components/FinancialModule/BasicDocuments.vue

@@ -904,7 +904,7 @@
             @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">{{$t('objFill.dxcdd')+':'+GetDetail.ReFinanceId}}</div>
           <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
-            {{$t('objFill.chdd')+':'+GetDetail.ReFinanceId}}</div>
+            {{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</div>
 
           <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
                         @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{$t('objFill.dxxstcxq')}}</div>

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -103,7 +103,7 @@
                 </el-form-item>
               </el-col>
               <template v-if="!heightQueryBox">
-                <el-col :span="8">
+                <el-col :span="5">
                   <el-form-item label="发团日期：">
                     <el-date-picker class="h34"
                                     v-model="missionDate"
@@ -112,6 +112,16 @@
                                     value-format="yyyy-MM-dd">
                     </el-date-picker>
                   </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="交易日期：">
+                    <el-date-picker class="h34"
+                                    v-model="tradeDate"
+                                    @change="timeTradeAdd()"
+                                    type="daterange"
+                                    value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </el-form-item>
                 </el-col>
                       <el-col :span="4">
                         <el-form-item label="结算状态：">
@@ -125,7 +135,7 @@
                         </el-form-item>
                     </el-col>
               </template>
-              <el-col :span="12">
+              <el-col :span="8">
                         <span style="margin-left: 20px; font-size: 12px;">注：合并结算的单据需要币种一致，此处均验证原币金额</span>
                     </el-col>
                 </el-row>
@@ -294,7 +304,7 @@
                 </template>
               </template>
               </el-table-column>
-              <el-table-column prop="" label="交易方式" show-overflow-tooltip width="300">
+              <el-table-column prop="" label="交易方式" show-overflow-tooltip :width="msg.IsSelectNormal==2?300:200">
                 <template slot-scope="scope">
                     <div>
                     <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
@@ -318,6 +328,14 @@
                     </div>
                 </template>
                 </el-table-column>
+                <el-table-column
+              prop=""
+              label="交易日期"
+              show-overflow-tooltip width="100">
+              <template slot-scope="scope">
+                {{scope.row.TradeDate}}
+              </template>
+              </el-table-column>
               <el-table-column
               prop=""
               label="原币金额"
@@ -608,6 +626,8 @@
             QEndDate:'',
             Status:'-1',
             IsSelectNormal: '1',//0不限 1只看未计算 2只看已结算
+            sTradeDate:'',
+            eTradeDate:''
         },
         getCompanyMsg:{  // 公司
             RB_Group_Id:'0',
@@ -617,6 +637,7 @@
         accountList:[],            
         CompanyList:[],                   
         missionDate:[],   
+        tradeDate:[],
         GetAccountType:[],         
         loading:false,
         currentPage:1,
@@ -800,6 +821,16 @@
             this.msg.QStartDate = this.missionDate[0];
             this.msg.QEndDate = this.missionDate[1];
         },
+        timeTradeAdd(){  // 日期格式
+          //发团日期
+            if(!this.tradeDate){
+                this.msg.sTradeDate = '';
+                this.msg.eTradeDate = '';
+                return
+            }
+            this.msg.sTradeDate = this.tradeDate[0];
+            this.msg.eTradeDate = this.tradeDate[1];
+        },
         queryInfoInit(){  // 初始化msg
             let msg = {
                 pageIndex:this.msg.pageIndex,

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -933,7 +933,7 @@
               {{$t('objFill.dxcdd')+':'+GetDetail.ReFinanceId}}</div>
             <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderOP':'CarDealerOrder')">
-              {{$t('objFill.chdd')+':'+GetDetail.ReFinanceId}}</div>
+              {{$t('objFill.chdd')+':'+GetDetail.TCNUM}}</div>
             <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
               @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{$t('objFill.dxxstcxq')}}</div>
             <div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"

src/components/Hotel/roomReservationsDetails.vue

@@ -48,7 +48,8 @@
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
             @click="saveList(1)" />
-          <input v-if="IsOperation==1&& EditBtn &&currentUserInfo.EmployeeId==615" type="button"
+            <!--&&currentUserInfo.EmployeeId==615-->
+          <input v-if="IsOperation==1&& EditBtn " type="button"
             class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
         </li>

src/components/LeaderManagement/CarDetails.vue

 <template>
   <div class="flexOne" style="min-width: 1200px;">
-
     <!-- 表格 -->
     <div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
@@ -13,10 +12,10 @@
           <th>用车方式</th>
           <th>出发地</th>
           <th>目的地</th>
-          <th>{{$t('fnc.jine')}}</th>
+          <th>实付金额</th>
           <th>币种</th>
           <th>支付方式</th>
-          <th>附件</th>
+          <th style="width:150px;">附件</th>
           <th>{{$t('pub.pubRemark')}}</th>
         </tr>
         <tr>
@@ -45,7 +44,7 @@
             </td>
             <td class="fz12">
               <p v-for="(s,index) in item.ReimburseList.ReimburseDetailsList" :key="index+800">
-                {{s.UnitPrice}}
+                {{s.UnitPrice*s.UserNum}}
               </p>
             </td>
             <td>{{urrencyTypeObj[item.ReimburseList.CurrencyId]}}</td>
@@ -54,12 +53,12 @@
               <p v-if="item.ReimburseList.SettlementType==2">公司结算</p>
             </td>
             <td>
-              <div v-if="item.ReimburseList.VoucherPicList.length">
-                <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex">
+              <template v-if="item.ReimburseList.VoucherPicList.length">
+                <div v-for="(vou, vouIndex) in item.ReimburseList.VoucherPicList" :key="vouIndex" >
                   <el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="item.listUrl">
                   </el-image>
                 </div>
-              </div>
+              </template>
               <div v-else>
                 无
               </div>
@@ -70,34 +69,23 @@
         </tbody>
       </table>
     </div>
-    <!-- <el-pagination 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 payURL from "../commonPage/payURL.vue";
-  import moment from "moment";
   export default {
     data() {
       return {
         msg: {
-          TCIDs: ''
-
+          TCIDs: '',
+          date: "",
         },
         dataList: [],
         loading: false,
-        total: 0,
-        currentPage: 1,
-        showID: -1,
-        companyList: [],
-        employeeList: [],
         urrencyTypeObj: {},
       };
     },
     components: {},
     created() {
-      let userInfo = this.getLocalStorage();
       this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
       this.msg.date = this.$route.query.date ? this.$route.query.date : "";
       this.financeinfo_post_GetList();
@@ -110,35 +98,10 @@
           if (res.data.resultCode == 1) {
             let data = res.data.data;
             data.map(item => {
-              this.urrencyTypeObj[0] = "不限";
               this.urrencyTypeObj[item.ID] = item.Name;
             });
-          } else {
-
           }
-        }, err => {})
-      },
-
-      goUrl: function (name, path, id) {
-        this.$router.push({
-          name: path,
-          query: {
-            id: id,
-            blank: "y",
-            tab: name
-          }
-        });
-      },
-      openImg(src) {
-        window.open(src, "_blank");
-      },
-      handleCurrentChange(val) {
-        this.msg.pageIndex = val;
-        this.getList();
-      },
-      resetPageIndex() {
-        this.msg.pageIndex = 1;
-        this.currentPage = 1;
+        })
       },
       getList() {
         this.loading = true;
@@ -168,7 +131,7 @@
           } else {
             this.Error(res.data.message);
           }
-        }, err => {})
+        })
       },
     },
     mounted() {
@@ -185,7 +148,6 @@
     color: #333;
     border-bottom: 1px solid #cccccc;
     border-right: 1px solid #cccccc;
-    /* border-collapse: collapse; */
   }
 
   .groupTourOrderSearchTable tr th {

src/components/LeaderManagement/DinningDetails.vue

 <template>
   <div class="flexOne" style="min-width: 1200px;">
-
     <!-- 表格 -->
     <div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
@@ -12,7 +11,7 @@
           <th>用餐人数</th>
           <th>单价</th>
           <th>{{$t('fnc.jine')}}</th>
-          <th>实付</th>
+          <th>实付金额</th>
           <th>币种</th>
           <th>支付方式</th>
           <th>附件</th>
@@ -48,24 +47,23 @@
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 {{diningTotalPrice2(subItem, subItem.ReimburseList.ReimburseDetailsList)}}
               </td>
+              <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                {{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
+              </td>
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 <span v-if="subItem.PayStyle === 1">现付</span>
                 <span v-else-if="subItem.PayStyle === 2">公司结算</span>
                 <span v-else-if="subItem.PayStyle === 3">预付</span>
                 <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
                 <span v-else></span>
-                </br>
+                <br />
                 <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
               </td>
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
-                {{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
-              </td>
-              <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
                 <div v-if="subItem.ReimburseList.VoucherPicList.length">
                   <div v-for="(vou, vouIndex) in subItem.ReimburseList.VoucherPicList" :key="vouIndex">
                     <el-image style="width: 20px;height: 20px;" :src="vou.url" :preview-src-list="subItem.listUrl">
                     </el-image>
-                    <!-- <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt=""> -->
                   </div>
                 </div>
                 <div v-else>
@@ -87,21 +85,16 @@
     data() {
       return {
         msg: {
-          TCIDs: ''
+          TCIDs: '',
+          date: ""
         },
         dataList: [],
         loading: false,
-        total: 0,
-        currentPage: 1,
-        showID: -1,
-        companyList: [],
-        employeeList: [],
         urrencyTypeObj: {},
       };
     },
     components: {},
     created() {
-      let userInfo = this.getLocalStorage();
       this.msg.TCIDs = this.$route.query.TCIDs ? this.$route.query.TCIDs : "";
       this.msg.date = this.$route.query.date ? this.$route.query.date : "";
       this.financeinfo_post_GetList();
@@ -125,6 +118,7 @@
         }
         return this.moneyFormat(totalPrice)
       },
+      //计算实付金额
       diningTotalPrice2(sObj, obj) {
         let totalPrice = 0
         obj.forEach(x => {
@@ -139,34 +133,10 @@
           if (res.data.resultCode == 1) {
             let data = res.data.data;
             data.map(item => {
-              this.urrencyTypeObj[0] = "不限";
               this.urrencyTypeObj[item.ID] = item.Name;
             });
-          } else {
-
           }
-        }, err => {})
-      },
-      goUrl: function (name, path, id) {
-        this.$router.push({
-          name: path,
-          query: {
-            id: id,
-            blank: "y",
-            tab: name
-          }
-        });
-      },
-      handleCurrentChange(val) {
-        this.msg.pageIndex = val;
-        this.getList();
-      },
-      resetPageIndex() {
-        this.msg.pageIndex = 1;
-        this.currentPage = 1;
-      },
-      openImg(src) {
-        window.open(src, "_blank");
+        })
       },
       getList() {
         this.loading = true;
@@ -198,7 +168,7 @@
           } else {
             this.Error(res.data.message);
           }
-        }, err => {})
+        })
       },
     },
     mounted() {
@@ -225,7 +195,6 @@
     color: #333;
     border-bottom: 1px solid #cccccc;
     border-right: 1px solid #cccccc;
-    /* border-collapse: collapse; */
   }
 
   .groupTourOrderSearchTable tr th {

src/components/PersonalInfoSet.vue

@@ -1089,7 +1089,7 @@
         newArr.push(file.file);
         let path = "/Sale/Uploadvideo/";
         this.UploadFileToAli2024(path, newArr, x => {
-          console.log("UploadFileToAli2024", x)
+          //console.log("UploadFileToAli2024", x)
         });
       },
       //绑定手机

src/components/TravelContractDetail.vue

@@ -1201,7 +1201,6 @@
       getList() {
         this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
           if (res.data.resultCode === 1) {
-            console.log("travelcontract_post_GetContractInfoService_details", res.data.data);
             this.dataList = res.data.data;
           } else {
             this.Error(res.data.message);

src/components/TravelContractNew.vue

@@ -1711,7 +1711,6 @@
           (res) => {
             if (res.data.resultCode === 1) {
               var tempObj = res.data.data;
-              console.log("travelcontract_post_GetContractInfoService", tempObj);
               this.CtObj = tempObj;
               this.guestList = tempObj.allGuestList;
               this.CtObj.tcid = this.$route.query.TCID;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2169,7 +2169,6 @@
           msg,
           res => {
             if (res.data.resultCode == 1) {
-              console.log("admin_get_BranchGetList",res.data.data);
               this.queryCommonData.BranchList = res.data.data;
               this.queryCommonData.BranchList.forEach(x => {
                 x.isShow = false;
@@ -2504,7 +2503,6 @@
           res => {
             if (res.data.resultCode == 1) {
               this.queryCommonData.companyList = res.data.data;
-              console.log("sellorder_post_GetBranchList",res.data.data);
             }
           },
           err => {}

src/components/busManagement/JapanBusOrderMonthStatistics.vue

@@ -99,7 +99,6 @@
         this.headerList = [];
         this.apipost('JapanCar_get_GetJapanOrderCarConfirmPageList', this.msg, res => {
           this.loading = false;
-          console.log("JapanCar_get_GetJapanOrderCarConfirmPageList", JSON.parse(JSON.stringify(res.data)));
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             var tempArray = res.data.data.pageData;
@@ -113,19 +112,7 @@
                   })
                 });
               }
-              // tempArray.forEach(item => {
-              //   item.OrderDayCalendar.forEach(subItem => {
-              //     item[subItem.UseDateStr] = {
-              //       BusContent: subItem.BusContent,
-              //       EndCity: subItem.EndCity,
-              //       StartCity: subItem.StartCity,
-              //       UseDateStr: subItem.UseDateStr,
-              //       UseState: subItem.UseState,
-              //     };
-              //   });
-              // });
             }
-            console.log("tempArray", tempArray)
             this.DataList = tempArray;
           } else {
             this.Error(res.data.message);

src/components/platformModule/menuManagement.vue

@@ -40,7 +40,8 @@
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
+          <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')"
+            @click="resetPageIndex(),getList()" />
           <input type="button" @click="outerVisible = true,dialogTitle='新增权限菜单',clearMessage();" class="normalBtn"
             :value="$t('pub.addBtn')" />
         </li>

src/plug/index.js

@@ -1173,7 +1173,9 @@ export default {
                 .then(res => {
                   successCall(res);
                 }).catch(function (reason) {
-                  that.$refs['my-upload'].clearFiles();
+                  if (that.$refs['my-upload']) {
+                    that.$refs['my-upload'].clearFiles();
+                  }
                   that.$message.error('上传失败！');
                   that.MsgBus.$emit('UploadSelfFileErr')
                 });