解决冲突

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">
@@ -320,6 +330,14 @@
                 </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="原币金额"
               show-overflow-tooltip width="100">
               <template slot-scope="scope">
@@ -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

@@ -651,7 +651,8 @@
         images: [],
         resultCode: 0,
       }
-    },methods:{
+    },
+    methods:{
       inited (viewer){
         this.$viewer = viewer
       },

src/components/Hotel/roomReservationsDetails.vue

@@ -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,7 +64,7 @@
       <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;">
@@ -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/LeaderManagement/leaderManagement.vue

@@ -582,7 +582,7 @@
           <el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input>
         </el-form-item>
         <el-form-item v-if="addMsg.LeaderGuidClass==1" :label="$t('admin.admin_password')">
-          <el-input type="password" v-model="addMsg.EmPassword" class="w210"></el-input>
+          <el-input type="password" v-model="addMsg.EmPassword" class="w210" auto-complete="new-password"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -805,12 +805,6 @@
               message: this.$t('rule.qsrzqsjh'),
             }
           ],
-          // SpareTel: [
-          //   {
-          //     pattern: this.$commonUtils.Regex.el_isInteger,
-          //     message: "请输正确的电话"
-          //   }
-          // ],
           Passport: [{
               required: true,
               message: this.$t('rule.qsrzqhzh'),
@@ -873,10 +867,8 @@
               } else {
                 this.Error(res.data.message);
               }
-              this.loading2 = false
-            },
-            err => {}
-          );
+              this.loading2 = false;
+            });
         }
       },
       //领队账户管理
@@ -936,9 +928,7 @@
             } else {
               that.Error(res.data.message);
             }
-          },
-          err => {}
-        );
+          });
       },
       getCountry() {
         //获取国家
@@ -946,9 +936,7 @@
           "dict_post_Destination_GetCountry", {},
           res => {
             this.countryList = res.data.data;
-          },
-          err => {}
-        );
+          });
       },
       //获取工作类型(值获取领兼地和导游)
       getWorkType() {
@@ -957,14 +945,10 @@
           res => {
             if (res.data.resultCode == 1) {
               res.data.data.forEach(item => {
-                // if (item.Value != 1) {
                 this.workTypeList.push(item);
-                // }
               });
             }
-          },
-          err => {}
-        );
+          });
       },
       //获取中国下面的城市列表
       getCityList() {
@@ -974,9 +958,7 @@
           },
           res => {
             this.cityList = res.data.data;
-          },
-          err => {}
-        );
+          });
       },
       //获取语言
       getLanguage() {
@@ -984,9 +966,7 @@
           "language_post_GetList", {},
           res => {
             this.LanguageList = res.data.data;
-          },
-          err => {}
-        );
+          });
       },
       //获取员工列表获取账号
       getEmployeeList() {
@@ -997,14 +977,9 @@
           PostId: "",
           IsLeave: "0"
         };
-        this.apipost(
-          "admin_get_EmployeeGetList",
-          msg,
-          res => {
+        this.apipost("admin_get_EmployeeGetList", msg, res => {
           this.EmployeeList = res.data.data;
-          },
-          err => {}
-        );
+        });
       },
       //获取公司列表
       getBranchList() {
@@ -1013,14 +988,9 @@
           is_show: "",
           RB_Group_Id: ""
         };
-        this.apipost(
-          "admin_get_BranchGetList",
-          msg,
-          res => {
+        this.apipost("admin_get_BranchGetList", msg, res => {
           this.BranchList = res.data.data;
-          },
-          err => {}
-        );
+        });
       },
       //获取部门
       getDerpartMent(id) {
@@ -1093,9 +1063,7 @@
               if (res.data.resultCode == 1) {
                 that.getList();
               }
-            },
-            err => {}
-          );
+            });
         });
       },
       initAddMsg() {
@@ -1173,9 +1141,7 @@
             }
             this.searchKey(this.addMsg.CityName)
             this.addMsg.EmPassword = "";
-          },
-          err => {}
-        );
+          });
       },
       //弹出框关闭初始化弹框内表单
       closeChangeMachie(done) {

src/components/LeaderManagement/leaderPayTicketDetail.vue

@@ -21,7 +21,8 @@
       <template v-for='(item,index) in dataList'>
         <template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
           <tr v-for="(childItem,childIndex) in subItem.ReimburseList.ReimburseDetailsList">
-            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">{{item.UseTimeStr}}</td>
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">{{item.UseTimeStr}}
+            </td>
             <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
               {{subItem.ScenicName}}
             </td>
@@ -30,9 +31,7 @@
             </td>
             <td>{{childItem.UserNum}}</td>
             <td>
-              <p>
               {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
-              </p>
             </td>
             <td>
               {{moneyFormat(childItem.UnitPrice*childItem.UserNum)}}
@@ -43,7 +42,7 @@
               <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.ReimburseList.ReimburseDetailsList.length">
@@ -52,12 +51,8 @@
             <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 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>
@@ -74,7 +69,7 @@
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         loading: true,
@@ -86,8 +81,11 @@ export default {
       let TCIDs = this.$route.query.TCIDs;
       let date = this.$route.query.date;
       this.getList(TCIDs, date);
-  },created(){
-    this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
+    },
+    created() {
+      this.apipost("financeinfo_post_GetList", {
+        Name: ""
+      }, res => {
         if (res.data.resultCode === 1) {
           let data = res.data.data;
           this.currencyList = data
@@ -97,30 +95,29 @@ export default {
     filters: {},
 
     methods: {
-    getCurrencyStr: function(id){
-      for(let i = 0; i < this.currencyList.length; i++) {
+      getCurrencyStr: function (id) {
+        for (let i = 0; i < this.currencyList.length; i++) {
           if (this.currencyList[i].ID == id) {
             return this.currencyList[i].Name
           }
         }
       },
-    openImg(src){
-      window.open(src, "_blank");
-    },
       //获取数据
       getList(TCIDs, date) {
         this.loading = true;
         this.apipost(
-        "dmcstatistics_post_GetNewLeaderPayMoneyStatics",
-        {TCIDs: TCIDs},
+          "dmcstatistics_post_GetNewLeaderPayMoneyStatics", {
+            TCIDs: TCIDs
+          },
           res => {
             this.loading = false;
             if (res.data.resultCode === 1) {
               let data = res.data.data.ScenicList;
+              console.log("data", data);
               let dataList = [];
-            if(date!=='all') {
-              data.map(x=>{
-                if (x.UseTimeStr == date){
+              if (date !== 'all') {
+                data.map(x => {
+                  if (x.UseTimeStr == date) {
                     dataList.push(x)
                   }
                 })
@@ -128,9 +125,9 @@ export default {
                 dataList = data
               }
               dataList.forEach(x => {
-              x.ScenicStatisticsList.forEach(y=>{
+                x.ScenicStatisticsList.forEach(y => {
                   y.listUrl = []
-                y.ReimburseList.VoucherPicList&&y.ReimburseList.VoucherPicList.forEach(z=>{
+                  y.ReimburseList.VoucherPicList && y.ReimburseList.VoucherPicList.forEach(z => {
                     y.listUrl.push(z.url)
                   })
                 })
@@ -144,5 +141,6 @@ export default {
         );
       },
     }
-};
+  };
+
 </script>

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/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,15 +4,16 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input v-if="IsEditDinner==1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
-              @click="saveList(1)" :disabled="IsDisabled" />
-            <input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" :value="$t('ground.baocuncaogao')"
-              @click="saveList(1)" :disabled="IsDisabled" />
+            <!--v-if="IsEditDinner==1"-->
+            <input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)"
+              :disabled="IsDisabled" />
+            <input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" style="display:none;"
+              :value="$t('ground.baocuncaogao')" @click="saveList(1)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span>
-            <input v-if="EditBtn" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
-              @click="saveList(1)" />
+            <input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30"
+              :value="$t('pub.saveBtn')" @click="saveList(1)" />
           </template>
         </li>
       </ul>
@@ -278,6 +279,7 @@
         findex: 0,
         childIndex: 0,
         LineId: 0,
+        currentUserInfo: {}
       };
     },
     components: {
@@ -515,6 +517,7 @@
       },
     },
     mounted() {
+      this.currentUserInfo = this.getLocalStorage();
       this.CheckAuth();
       this.GetAuth();
       this.TCNUM = this.$route.query.TCNUM;

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -58,6 +58,7 @@
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
           <button class="hollowFixedBtn" @click="method5()">导出</button>
           <input type="button" class="normalBtn" value="批量制佣金单" @click="MoreCreateBill()" />
+          <input type="button" class="normalBtn" value="批量上传附件" @click="UploadAttachment()" />
         </li>
       </ul>
     </div>
@@ -465,12 +466,22 @@
       </template>
 
     </el-dialog>
+    <!-- 批量上传附件 -->
+    <attachments :show="isUploadAttachment"
+    @cancel="isUploadAttachment=false"
+    @success="isUploadAttachment=false,getList();resetPageIndex()"></attachments>
   </div>
 </template>
 <script>
+  import attachments from "./components/attachments.vue";
   export default {
+    components: {
+      attachments
+    },
     data() {
       return {
+        saveUploadMsg: [],
+        isUploadAttachment: false,
         FinanceTypeList: [{
             Name: '全部',
             Id: 0
@@ -554,6 +565,10 @@
       }
     },
     methods: {
+      UploadAttachment(){
+        this.isUploadAttachment = true
+      },
+
       GenerateDocuments(outItem, LeaderId, GuideId) {
         this.isShowFinaceDailog = true
         this.CurrentOutItem = outItem

src/components/ShoppingStore/components/attachments.vue

+<template>
+  <div>
+    <el-dialog :title="saveUploadMsg.length>0?'批量上传附件/已传'+saveUploadMsg.length:'批量上传附件'"
+      :visible.sync="isUploadAttachment" width="780px"
+    :close-on-click-modal="false"
+    :show-close="false" @close="cancel">
+
+    <div class="UploadMsg-box">
+      <div :class="[saveUploadMsg.length>0?'':'UploadMsgGrow']" style="text-align: center;">
+        <el-upload
+        class="upload-demo"
+        drag
+        accept="image/jpeg,image/jpg, image/png, image/bmp"
+        action=""
+        :http-request="uploadFileBtn"
+        multiple
+        :show-file-list="false">
+        <i class="el-icon-upload" style="font-size: 30px;"></i>
+        <div class="el-upload__text">文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">只能上传jpg/png文件</div>
+      </el-upload>
+      </div>
+        <template v-for="(item,index) in saveUploadMsg">
+          <div class="UploadMsg-list">
+            <el-image
+            style="width: 100%; height: 80px;border-radius: 5px;"
+            :src="item.DMCOPCredentials"
+            fit="cover"
+            :initial-index="index"
+            :preview-src-list="saveUploadMsg.map(x=>{return x.DMCOPCredentials})"></el-image>
+            <div class="UploadMsg-text">
+              <el-tooltip class="item" effect="dark" :content="item.TCID" placement="top">
+                <p>{{item.TCID}}</p>
+              </el-tooltip>
+            </div>
+            <i class="UploadMsg-icon el-icon-circle-close" @click="handleRemove(index)"></i>
+          </div>
+        </template>
+    </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="cancel" :disabled="loading">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="saveAttachments" :loading="loading">{{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  props:["show"],
+  data() {
+    return {
+      saveUploadMsg: [],
+      loading: false,
+      isUploadAttachment: false,
+      imgLength: 0
+    }
+  },
+  mounted() {
+
+  },
+  watch: {
+    show:{
+      handler(newValue) {
+        if(newValue==true) this.isUploadAttachment = true
+      },
+      deep: false,
+      immediate: true
+    }
+  },
+  methods: {
+    saveAttachments() {
+      if(this.saveUploadMsg.length==0) return this.$message.error('请上传附件');
+      this.loading = true
+      this.apipost('ShoppingInfo_Post_ImportShopFile',this.saveUploadMsg, res => {
+        if(res.data.resultCode == 1) {
+          this.cancel()
+          this.$emit('success')
+        }else{
+          this.$message.error(res.data.message)
+        }
+        this.loading = false
+      }, err => {})
+    },
+    cancel() {
+      this.imgLength = 0
+      this.saveUploadMsg = []
+      this.isUploadAttachment = false
+      this.$emit('cancel')
+    },
+    uploadFileBtn(file) { //上传
+        // if(file.file.size > 1024 * 1024 * 10) {
+        //  this.$message.warning(this.$t('tips.wjdxbncgsz'))
+        //   return
+        // }
+        //  1 文档  2 数据 3 图片
+        if(file) this.imgLength++
+        let typeArr=[
+          {stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
+          {stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
+        ]
+        let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
+        let fileTypeNumber = 2;
+        let typeOk  = false;
+        typeArr.forEach(x=>{
+          if(x.stringArr.indexOf(ft)!='-1')
+          {
+            fileTypeNumber=x.type;
+            typeOk = true;
+          }
+        })
+        if (!typeOk) return this.$message.error('请上传图');
+        let newArr = [];
+        newArr.push(file.file)
+        let path = "/Upload/RegimentAttachment/"
+        if(this.imgLength==1) this.$message.info(this.$t('tips.shangchuanzhong'))
+        this.UploadSelfFileT(path, newArr, x => {
+          let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
+          let SourceFileName = x.data.SourceFileName.split('.')
+          this.saveUploadMsg.push({
+            DMCOPCredentials: this.domainManager().ViittoFileUrl + x.data.FilePath,
+            TCID: SourceFileName[0]
+          })
+          if(this.imgLength>0) this.imgLength--
+          if(!this.imgLength) this.$message.success(this.$t('tips.scchenggong'))
+        });
+    },
+    handleRemove(index) {
+      this.saveUploadMsg.splice(index,1)
+    },
+  }
+}
+</script>
+<style scoped>
+  .UploadMsg-box{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .UploadMsg-list{
+    width: 110px;
+    /* height: 80px; */
+    position: relative;
+    border-radius: 3px;
+    /* overflow: hidden; */
+    margin: 0 6px 13px 6px;
+  }
+  .UploadMsg-text{
+    width: 100%;
+    height: 20px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+  }
+  .UploadMsg-icon{
+    color: #409eff;
+    position: absolute;
+    right: 0;
+    top: -10px;
+    z-index: 2;
+    cursor: pointer;
+    font-size: 20px;
+  }
+  .UploadMsgGrow{
+    width: 100%;
+  }
+  /deep/.UploadMsg-box .el-upload-dragger{
+    width: 110px;
+    height: 80px;
+    padding: 0 5px;
+  }
+  /deep/.UploadMsg-box .el-upload-dragger .el-icon-upload{
+    margin: 0;
+  }
+  /deep/.UploadMsg-box .el-upload__tip{
+    margin-top: 0;
+    margin-bottom: 7px;
+  }
+  /deep/.UploadMsg-box .el-upload-dragger .el-icon-upload{
+    line-height: 35px;
+  }
+</style>

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/BusInfo.vue

@@ -437,10 +437,12 @@
           </el-table-column>
         </el-table>
         <div class="upBtnList">
-          <input v-if="IsEditBus==0" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
-            @click="SaveList(1)" :disabled="disButton" :value="$t('ground.baocuncaogao')" />
-          <input v-if="IsEditBus==1" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
+
+          <input v-if="isShowBtn==0" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
             @click="SaveList(1)" :disabled="disButton" :value="$t('pub.saveBtn')" />
+
+          <input v-if="isShowBtn==1&&currentUserInfo.EmployeeId==615" type="button" class="normalBtn"
+            :class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" :value="$t('pub.saveBtn')" />
           <span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
             {{$t('ground.xzdanbuneng')}}
           </span>
@@ -575,6 +577,7 @@
         isSubmit: true,
         isShowBtn: 1, //1禁用高速费，成本费，高速付款方式文本框
         IsEditBus: 0, //车辆修改权限
+        currentUserInfo: {},
       };
     },
     methods: {
@@ -642,7 +645,6 @@
               Id: obj.BusType,
             },
             response => {
-
               if (response.data.resultCode == 1) {
                 let busTypeObj = response.data.data;
                 if (busTypeObj) {
@@ -672,7 +674,6 @@
             },
             null
           );
-
         }
       },
       AddSubItem(item) {
@@ -888,6 +889,7 @@
 
     },
     mounted() {
+      this.currentUserInfo = this.getLocalStorage();
       this.GetAuth();
       this.GetUseTypeList();
       this.GetAirportPickUpList();

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/components/sale/ExpectedCommission.vue

@@ -512,7 +512,7 @@
         newRlistAll:[],
         DomesticLine:{},
         IsYearBonus:false,
-        AnnualBonus:{
+        AnnualBonus:{//年终奖
           type:3,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -521,7 +521,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        OtherProfit:{
+        OtherProfit:{//其他毛利润
           type:2,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -530,7 +530,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        OtherLine:{
+        OtherLine:{//其他人头奖励
           type:1,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -539,7 +539,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        EuropeProfit:{
+        EuropeProfit:{//欧洲毛利润
           type:2,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -548,7 +548,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        EuropeLine:{
+        EuropeLine:{//欧洲人头奖励
           type:1,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -557,7 +557,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        JapaneseProfit:{
+        JapaneseProfit:{//日本毛利润
           type:2,
           AvgLureNum:0,
           AvfOrderNum:0,
@@ -566,7 +566,7 @@
           CommissionProfit: 0,
           CommissionRateList:[]
         },
-        JapaneseLine:{
+        JapaneseLine:{//日本人头奖励
           type:1,
           AvgLureNum:0,
           AvfOrderNum:0,

src/components/sale/components/progressComm.vue

@@ -73,7 +73,7 @@
       <div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
       class="relative-position">
             <el-progress :text-inside="true" :stroke-width="20"
-            :percentage="setItemProgress(item)"
+            :percentage="setItemProgress(item,index)"
             :status="setItemStatus(item)"
             :format="setItemText(item)"
             :text-color="(commissionratioList.type==2&&commissionratioList.CommissionProfit>=item.StartValue)||
@@ -162,14 +162,18 @@
     },
     methods: {
       // 设置进度
-      setItemProgress(data) {
+      setItemProgress(data,index) {
+        let oEndValue
+        let length = this.commissionratioList.CommissionRateList.length-1
+        if(index>0) oEndValue = this.commissionratioList.CommissionRateList[index-1].EndValue
         //let length = this.commissionratioList.CommissionRateList.length
         //let EndValue = this.commissionratioList.CommissionRateList[length-2].EndValue
         //let Rate = this.commissionratioList.CommissionRateList[length-1].Rate
         if(this.commissionratioList.type==2){
           if(this.commissionratioList.CommissionProfit
           &&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
-            return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
+            if(this.commissionratioList.CommissionProfit>oEndValue&&index==length) return 100
+            else return this.commissionratioList.CommissionProfit>oEndValue&&index==length?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
           }else{
             if(this.commissionratioList.CommissionProfit!=0){
               return 100
@@ -179,9 +183,11 @@
           if(this.commissionratioList.type==1
           &&this.commissionratioList.AvgLureNum>=data.StartValue
           &&this.commissionratioList.AvgLureNum<=data.EndValue){
-            return (this.commissionratioList.AvgLureNum/data.EndValue)*100
+            if(this.commissionratioList.AvgLureNum>oEndValue&&index==length) return 100
+            else return (this.commissionratioList.AvgLureNum/data.EndValue)*100
           }else if(this.commissionratioList.type==3&&this.commissionratioList.AvfOrderNum){
-            return (this.commissionratioList.AvfOrderNum/data.StartValue)*100
+            if(this.commissionratioList.AvfOrderNum<3) return 0
+            else return (this.commissionratioList.AvfOrderNum/data.StartValue)*100
           }else{
             if(this.commissionratioList.AvgLureNum>=data.StartValue){
               return 100