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

src/components/Complaints/AddComplaints.vue

@@ -126,7 +126,7 @@
       <p>投诉情况</p>
       <div class="AC_complaintList">
         <div class="t">主题内容：</div>
-        <ul>
+        <ul style="width:90%;">
           <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
@@ -134,7 +134,7 @@
       </div>
       <div class="AC_complaintList">
         <div class="t">严重程度：</div>
-        <ul>
+        <ul style="width:90%;">
           <li v-for="subItem in severityList" @click="getServerity(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
@@ -234,10 +234,10 @@
               this.EditMsg.LineID = this.PriceInfo.LineID;
               this.EditMsg.LineteamId = this.PriceInfo.LineteamId;
             }
-            this.ExitCount = res.data.data.ExitCount;
-            if(this.ExitCount>0){
-              this.Error("该订单已存在投诉");
-            }
+            // this.ExitCount = res.data.data.ExitCount;
+            // if(this.ExitCount>0){
+            //   this.Error("该订单已存在投诉");
+            // }
           } else {
             this.Error(res.data.message)
           }

src/components/Complaints/ComplaintsManage.vue

@@ -203,6 +203,7 @@
           <td>{{getTimeConsuming(item,2)}}</td>
           <td>
             <span class="CM_detail" @click="goUrl('ComplaintsDetail',item.ID,item.OrderID,'投诉详情')">详情</span>
+            <span class="CM_detail" @click="delComplaints(item.ID,item.CreateBy)">删除</span>
           </td>
         </tr>
       </table>
@@ -438,6 +439,29 @@
         var fileName = "投诉报表.xls";
         this.GetLocalFile("get_complain_GetExport", msg, fileName);
       },
+      //删除
+      delComplaints(ID,UserID){
+        let userInfo = this.getLocalStorage();
+        if(userInfo.EmployeeId==UserID){
+          var that = this;
+          that.Confirm("是否删除?", function () {
+            var msg = {
+              ID : ID
+            };
+            that.apipost(
+              "conplain_post_Remove",msg,res => {
+                if (res.data.resultCode == 1) {
+                  that.Success(res.data.message);
+                  that.getList();
+                }
+              },
+              null
+            );
+          });
+        }else{
+          this.Error('只能删除自己创建的单据');
+        }
+      }
     },
     mounted () {
       this.getLineList()

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -855,7 +855,7 @@ export default {
       }, err => {})
     },
     upLoadFuJian: function() {
-        if (this.saveMsg.length===0) return this.$message.error('请上传图片！');
+        if (this.saveMsg.length===0) return this.$message.error('请上传文件！');
         let msg = {
           FrID: this.ID,
           vorcherInos: this.saveMsg

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1718,10 +1718,10 @@ export default {
                   x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
                   newData.push(x);
                 } else {
-                  x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total);
-                  x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total);
-                  x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total);
-                  x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total);
+                  // x.MaoLiRate = this.total===0 ? 0 : parseFloat(x.MaoLiRate/this.total);
+                  // x.AverageIncome = this.total===0 ? 0 : parseFloat(x.AverageIncome/this.total);
+                  // x.AverageCost = this.total===0 ? 0 : parseFloat(x.AverageCost/this.total);
+                  // x.AverageProfit = this.total===0 ? 0 : parseFloat(x.AverageProfit/this.total);
                   x.LineName = "合计";
                   x.TCID = "";
                   x.TCNUM = "";

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -580,6 +580,7 @@ export default {
         LineId:"",
         QStartDate: "",
         QEndDate: "",
+        EmployeeId:''
       },
       getCompanyMsg: {
         // 公司
@@ -904,6 +905,7 @@ export default {
     },
     method5: function() {
        this.loading = true;
+       this.msg.EmployeeId=this.userId;
       this.GetLocalFile(
         "financestatistics_post_OutToExcelTravelMonthReportList",
         this.msg,

src/components/FinancialModule/invoicesManagerDetail.vue

-<style scoped>
+<style>
 .page_iisMgdetail {
   width: 830px;
   background-color: white;
@@ -16,22 +16,22 @@
   top: 10px;
   font-size: 14px;
 }
-.page_iisMgdetail .page_iisMgadd_table {
+.page_iisMgdetail .page_iisMgdetail_table {
   width: 100%;
   font-size: 14px;
   text-align: center;
 }
-.page_iisMgdetail .page_iisMgadd_table td {
+.page_iisMgdetail .page_iisMgdetail_table td {
   padding: 10px;
 }
-.page_iisMgdetail .page_iisMgadd_table .page_iisMgadd_bank td._bank_td{
+.page_iisMgdetail .page_iisMgdetail_table .page_iisMgdetail_bank td._bank_td{
   width: 679px;
 }
 .iis_save{
   text-align: right;
   padding: 10px 0 0 0;
 }
-.page_iisMgdetail .page_iisMgadd_table tr td.font-weight{
+.page_iisMgdetail .page_iisMgdetail_table tr td.font-weight{
   font-weight: 800;
 }
 .page_iisMgdetail .cursorpointer{
@@ -140,6 +140,75 @@
   justify-content: center;
   display: flex;
 }
+.page_iisMgdetail ._addUpload_tips {
+  margin-top: 20px;
+  font-size: 12px;
+  color: #999999;
+}
+.page_iisMgdetail ._addUpload_box {
+  display: block;
+  margin-top: 15px;
+}
+.page_iisMgdetail ._addUpload_box img {
+  width: 100%;
+  height: 100%;
+}
+.page_iisMgdetail ._addUpload_box > div {
+  float: left;
+  width: 138px;
+  height: 92px;
+  border: 1px dashed rgba(210, 210, 210, 1);
+  border-radius: 2px;
+  cursor: pointer;
+  margin-bottom: 10px;
+  padding: 5px;
+  margin-right: 10px;
+  position: relative;
+}
+.page_iisMgdetail ._addUpload_box > div:hover {
+  background-color: #f5f5f5;
+}
+.page_iisMgdetail ._addFile_name {
+  padding-left: 15px;
+  max-width: 450px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.page_iisMgdetail ._addUpload_box .icon-guanbi1 {
+  font-size: 12px;
+  color: white;
+  display: inline-block;
+  margin-left: 15px;
+  position: absolute;
+  right: -6px;
+  top: -9px;
+  background-color: #f56c6c;
+  border-radius: 50%;
+  height: 20px;
+  width: 20px;
+  text-align: center;
+  line-height: 20px;
+}
+.page_iisMgdetail ._addUpload_box .icon-guanbi1:hover {
+  font-size: 12px;
+  color: #c94052;
+}
+.page_iisMgdetail ._addUpload_box .icon-excel,
+.page_iisMgdetail ._addUpload_box .icon-pdf {
+  text-align: center;
+  font-size: 38px;
+  color: green;
+  line-height: 75px;
+}
+.page_iisMgdetail .el-upload-dragger {
+    font-size: 28px;
+    color: #8c939d;
+    width: 126px;
+    height: 80px;
+    line-height: 41px;
+    text-align: center;
+}
 </style>
 <template>
   <div class="page_iisMgdetail" v-loading="loading">
@@ -155,7 +224,7 @@
     <table
       data-v-ca5157c2
       border="1"
-      class="page_iisMgadd_table"
+      class="page_iisMgdetail_table"
       style="border-collapse: collapse;"
     >
       <tr>
@@ -184,7 +253,7 @@
           <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span> 
         </td>
       </tr>
-      <tr class="page_iisMgadd_bank">
+      <tr class="page_iisMgdetail_bank">
         <td>{{$t('ios.dzyinhang')}}</td>
         <td colspan="3" class="_bank_td">
           {{orderList. AccountNumber}}
@@ -302,7 +371,7 @@
             </span>
             <span class="cursorpointer" @click="fujianShow = false">收起 <i class="iconfont icon-gengduo"></i></span>
           </p>
-          <div class="_addUpload_box" v-if="fujianShow">
+          <div class=" clearfix" v-if="fujianShow">
             <div style="width:100%;" v-if="FuImgList.length>0">
               <el-carousel trigger="click" height="293px" width="440px" :interval="5000">
                 <el-carousel-item style="height: 293px;" v-for="item in FuImgList" :key="item">
@@ -310,7 +379,7 @@
                 </el-carousel-item>
               </el-carousel>
             </div>
-            <div class="clearfix bg_white" v-if="detail.ApplyPics && detail.ApplyPics.length">
+            <div class="clearfix" v-if="detail.ApplyPics && detail.ApplyPics.length">
               <template v-for="(file,fIndex) in detail.ApplyPics" v-if="file.Type==='1'">
                 <div class="_wenjian" @click="showUpLoadFile(file)">
                   <p v-if="file.Type==='1'" class="_wenjian_P iconfont" :class="file.Url.substring(file.Url.lastIndexOf('.')+1,file.Url.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></p>
@@ -319,6 +388,36 @@
             </div>
           </div>
         </div>
+        <div v-else-if="!detail.ApplyPics && EmployeeId === detail.CreateBy">
+          <div class="_addUpload_box _addUpload_box_btm clearfix" >
+            <template v-for="(file,fIndex) in saveMsg">
+              <div v-if="file.Type==3">
+                <div style="width:100%;height:100%;overflow: hidden;">
+                  <img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)">
+                </div>
+                <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
+              </div>
+              <div v-if="file.Type==1">
+                <div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
+
+                </div>
+                <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
+              </div>
+            </template>
+          </div>
+          <div style="margin-top: 80px;">
+            <div class="_pic_upload" >
+              <el-upload
+                drag
+                :http-request="uploadFileBtn"
+                :multiple="true"  :show-file-list="false"  action="">
+                <i class="el-icon-plus avatar-uploader-icon"></i>
+                <div class="el-upload__text">点击/拖拽上传</div>
+              </el-upload>
+            </div>
+            <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
+          </div>
+        </div>
         <div class="querenhan">
           <p >确认函</p>
           <div style="width:100%;" >
@@ -380,9 +479,59 @@ export default {
         title:false
       },
       fujianShow:true,
+      saveMsg: [],
     };
   },
   methods: {
+    uploadFileBtn(file) { //上传
+      if(file.file.size > 1024 * 1024 * 10) {
+        this.$message.warning('文件大小不能超过10M！')
+        return
+      }
+      //  1 文档  2 数据 3 图片
+      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('请上传图片、word、excel类型的文件！');
+      let newArr = [];
+      newArr.push(file.file)
+      let path = "/Upload/Temporary/"
+      this.$message.info('上传中...')
+      this.UploadSelfFileT(path, newArr, x => {
+        let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); 
+        this.saveMsg.push({
+          Type: fileTypeNumber,
+          Content: x.data.FilePath,
+          Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+        });
+        this.$message.success('上传成功');
+      });
+    },
+    upLoadFuJian: function() {
+      if (this.saveMsg.length===0) return this.$message.error('请上传文件！');
+      let msg = {
+        ID: this.msg.ID,
+        ApplyPics: this.saveMsg
+      };
+      this.apipost('InvoiceApply_get_UpdateInvoiceApplyInfo', msg, res=>{
+        if (res.data.resultCode===1) {
+          this.getDetail(this.msg.ID)
+        } else {
+          this.$message.error(res.data.message);
+        }
+      }, null)
+    },
     showUpLoadFile(i){  // 预览上传文件
       if(i.Url.substring(i.Url.lastIndexOf('.')+1,i.Url.length).toUpperCase()=='PDF'){
         this.previewPDF(i.Url)

src/components/Hotel/roomReservationsDetails.vue

@@ -490,7 +490,20 @@
       //单条保存
       SaveSingle(item) {
         item.HotelOrderState = 1;
-        this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
+        this.list.forEach(item => {
+          item.HotelOrderList.forEach(subItem => {
+            subItem.OrderDetailsList.forEach(y => {
+              y.HouseTypeCount = parseInt(y.HouseTypeCount);
+              y.UnitPrice = parseInt(y.UnitPrice);
+              y.HotelDiscount = parseInt(y.HotelDiscount);
+              if (y.BookNum == "") {
+                y.BookNum = 0;
+              }
+            })
+          });
+        })
+        let mag={TotalList:this.list,SingleItem:item};
+        this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
             this.getList();

src/components/systemManagement/currencyManagement.vue

@@ -161,6 +161,7 @@
                     <th>{{$t('fnc.chushihuilv')}}</th>
                     <th>{{$t('fnc.benqihuilv')}}</th>
                     <th>{{$t('fnc.danqgianhuilv')}}</th>
+                    <th>上调汇率</th>
                     <th>{{$t('fnc.zjjiner')}}</th>
                     <th>{{$t('system.table_operation')}}</th>
                 </tr>
@@ -178,6 +179,7 @@
                         <span>{{item.CurrentRate}}</span>
                         <span :class="item.IsStandardCurrency!=1?'':'display_none'" @click="getCurrentRate(item.ID,index)" class="iconfont icon-qiehuan"></span>
                     </td>
+                    <td>{{item.ExchangeRates}}</td>
                     <td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td>
                     <td>
                         <el-button-group size='mini'>
@@ -233,6 +235,11 @@
                                 <el-input v-model="addMsg.Rate" disabled class="w135"></el-input>
                             </el-form-item>                        
                         </li>
+                        <li>
+                            <el-form-item label="上调汇率" prop="ExchangeRates">
+                                <el-input v-model="addMsg.ExchangeRates"  class="w135"></el-input>
+                            </el-form-item>                        
+                        </li>
                         <li>
                             <el-form-item :label="$t('fnc.sfbenweibi')+ '：'">
                                 <el-switch v-model="addMsg.IsStandardCurrency"
@@ -246,7 +253,7 @@
             </el-form>
             <div>
                 <ul class="clearfix" style="text-align: right;">
-                    <li class="_add_saveBtn"style="float: initial;" >
+                    <li class="_add_saveBtn" style="float: initial;" >
                         <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>                            
                         <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
                     </li>
@@ -288,7 +295,7 @@
             </el-form>
             <div>
                 <ul class="clearfix" style="text-align: right;"> 
-                    <li class="_add_saveBtn"style="float: initial;" >
+                    <li class="_add_saveBtn" style="float: initial;" >
                         <button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
                         <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>                            
                     </li>
@@ -312,7 +319,8 @@
                     Name:'',
                     IsStandardCurrency:'0',
                     Code:'',
-                    Rate:''
+                    Rate:'',
+                    ExchangeRates:''
                 },
                 SetProfitLossMsg:{
                     ID:0,

src/router/config.js

@@ -1996,6 +1996,14 @@ export default {
                                 title: '报名统计'
                             },
                         },
+                        { // 票务 联运报名统计
+                            path: '/enrollTotalForAirUnion',
+                            name: 'enrollTotalForAirUnion',
+                            component: resolve => require(['@/components/SalesModule/enrollTotalForAirUnion'], resolve),
+                            meta: {
+                                title: '团队联运订单查询'
+                            },
+                        },
                         { // 销售 少价管理
                             path: '/Lowpricemanagement',
                             name: 'Lowpricemanagement',