解决冲突

src/components/CarDealerOrder/components/OrderList.vue

@@ -546,6 +546,8 @@
                   <i class="el-icon-check mr"></i>{{$t('objFill.copied')}}
                 </span>
               </div>
+              <span class="cblack fz12 ml mr" v-if="scope.row.OrderTCNUM">
+                <span class="c9e">系统团号：</span>{{ scope.row.OrderTCNUM }} </span>
               <div class="cblack fz12 mr" v-if="false">
                 <span class="">
                   <span class="c9e">{{$t('objFill.petition')}}：</span>

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/FinancialModule/addFinancialDocuments2.vue

@@ -478,7 +478,7 @@
         </div>
         <div class="_explain" v-if="msg.IsUploadPic===1">
           <p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
- 
+
           <div class="_addUpload_box clearfix">
             <template v-for="(file,fIndex) in saveMsg">
               <div v-if="file.Type==3">
@@ -651,7 +651,8 @@
         images: [],
         resultCode: 0,
       }
-    },methods:{
+    },
+    methods:{
       inited (viewer){
         this.$viewer = viewer
       },

src/components/Hotel/roomReservationsDetails.vue

@@ -30,7 +30,7 @@
 
   .roomReservationsDetailsTalbe {
     table-layout: fixed;
-  
+
   }
 
   .roomReservationsDetailsTalbe thead tr th {
@@ -48,8 +48,9 @@
         <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" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
-            @click="saveList(1)" />
+            <!--&&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>
       </ul>
@@ -63,10 +64,10 @@
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
         <thead>
           <tr>
-            <th class="fz14" style="border:none;" >
+            <th class="fz14" style="border:none;">
               {{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
               &nbsp;&nbsp;{{$t('leader.leader_Guide')}}: {{GuideName}} </th>
-            <th class="fz14"  style="border:none;">
+            <th class="fz14" style="border:none;">
               <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
                 style="float:left;margin-left:20px;">
                 <el-popover placement="bottom" popper-class="piliangPop" width="500" trigger="click"
@@ -556,7 +557,8 @@
                       </td>
                     </tr>
                     <tr>
-                      <td width="70" style="text-align:right;">{{$t('pub.yes')}}{{$t('pub.no')}}{{$t('fnc.fukuan')}}：</td>
+                      <td width="70" style="text-align:right;">{{$t('pub.yes')}}{{$t('pub.no')}}{{$t('fnc.fukuan')}}：
+                      </td>
                       <td>
                         <el-select class='w135 sel' v-model='subItem.IsPay' :placeholder="$t('pub.pleaseSel')"
                           :disabled="IsEditHotel==0?true:false">
@@ -720,7 +722,8 @@
             BookNum: 0
           },
         ],
-        ChooseCountry: "651"
+        ChooseCountry: "651",
+        currentUserInfo: {},
       }
     },
     components: {
@@ -784,7 +787,6 @@
       childHotelList(ckedObj) {
         //使用时间
         var oldData = JSON.parse(JSON.stringify(this.list[this.findex].HotelOrderList[this.childIndex]));
-
         var useTime = oldData.CheckInDateStr;
         var hotelId = ckedObj.ID;
         var TCID = oldData.TCID;
@@ -1255,6 +1257,7 @@
       },
     },
     mounted() {
+      this.currentUserInfo = this.getLocalStorage();
       if (this.$route.query.LineId) {
         this.LineId = this.$route.query.LineId;
       }

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)
         });
       },
       //绑定手机