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

src/assets/common/lang/zh.js

@@ -1743,7 +1743,8 @@ export const visaT = {
   qxzzzdqzlx:'请选择正确的签证类型！',
   qxzxybddry:"请选择需要绑定的人员",
   v_Othervisas: '其他',
-  dxzhanghu: '对象账户'
+  dxzhanghu: '对象账户',
+  guazdanju: '挂账单'
 }
 import invoicesManager from './H/h-invoicesManager'
 export const ios = invoicesManager
\ No newline at end of file

src/assets/css/salefeture2.css → src/assets/css/sale_pdf.css

+ 
+.travelControlTrip *{
+    page-break-inside: avoid;
+}
+.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
+.travelControlTrip .trip-box{
+    page-break-after: always;
+}
+ .travelControlTrip .logo-div{width: 100%;text-align: center;}
+    .travelControlTrip .logo-div>img{
+        width: 100%;
+    }
+.travelControlTrip .footer-div{text-align: center;padding: 25px 0; border-top: 1px solid #eee;}
+.travelControlTrip .website{text-align: center; font-size: 12px; color: #e73e6d; margin-top: 10px; }
+.travelControlTrip .website .website-line{height: 1px; background: #f1f1f1; transform: rotateX(60deg);}
+.travelControlTrip .trip-adviser{background: #f7f7f7; font-size: 14px; color: #000000; line-height: 30px;margin: 10px 0 0 0; padding: 10px 20px;}
+.travelControlTrip .trip-adviser>p{margin: 10px 0 0 0;font-size: 18px;}
+.travelControlTrip .website span{top:-10px; position: relative; background: #fff; padding: 0 15px; font-size: 13px; color: #EE4454;}
+.travelControlTrip .trip-nav-title{font-size: 22px; text-align: center;margin: 0px;}
+.travelControlTrip .module-title{text-align: center; font-size: 18px; color: #333; padding-top: 30px; padding-bottom: 30px;}
+.travelControlTrip .module-title h2{font-weight: normal;font-size: 18px;margin: 0px;}
+.template-box .travelSpecial{padding-top: 0px;}
+.travelControlTrip .module-title .short-line{width: 32px; height: 2px; background: #e73e6d; margin: 12px auto;}
+.travelControlTrip .module-title .english-title{font-family: arial; font-size: 12px; color: #ccc;}
+.travelControlTrip .module-title .long-line{width: 100%; height: 1px; background: #f1f1f1; margin: 35px 0; transform: rotateX(60deg) /*解决pdf打印线条过粗*/;}
+.travelControlTrip .essential{display: flex;  flex-direction: row; flex-wrap: wrap; margin-bottom: 40px;}
+.travelControlTrip .essential-item{width:320px; height:100px;  box-sizing: border-box;padding-left: 20px;}
+.travelControlTrip .essential-item img{float: left; margin-right:12px; width: 66px; height: 66px; border-radius: 38px;}
+.travelControlTrip .essential-item p.pkey{font-size: 14px; color: #000; margin:10px 0 0 0; }
+.travelControlTrip .essential-item p.pvalue{font-size: 18px; color: #000; margin-top:5px;  }
 .detail-box .left-team-box{
     height: 465px;
     overflow-y: auto;

src/components/FinancialModule/FinancialDocuments.vue

@@ -170,9 +170,10 @@
                             <el-option key="0" value="0" :label="$t('pub.unlimitedSel')"></el-option>
                             <el-option key="1" value="1" :label="$t('restaurant.res_income')"></el-option>
                             <el-option key="2" value="2" :label="$t('restaurant.res_outcome')"></el-option>
-                            <el-option key="2" value="5" :label="$t('fnc.yingshou')"></el-option>
-                            <el-option key="2" value="6" :label="$t('fnc.yingfu')"></el-option>
-                            <el-option key="2" value="4" :label="$t('fnc.zjdiaobo')"></el-option>
+                            <el-option key="3" value="5" :label="$t('fnc.yingshou')"></el-option>
+                            <el-option key="4" value="6" :label="$t('fnc.yingfu')"></el-option>
+                            <el-option key="5" value="4" :label="$t('fnc.zjdiaobo')"></el-option>
+                            <el-option key="6" value="7" :label="$t('visaT.guazdanju')"></el-option>
                         </el-select>
                     </span>
                 </li>
@@ -416,12 +417,15 @@
                             popper-class="detailsIT_Journal"
                             placement="bottom-start"
                             trigger="click">
-                                <template v-if="item.Type!=1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
                                     <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
                                 </template>
                                 <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
                                     <my-RVB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
                                 </template>
+                                <template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                    <my-GZ-Bill :ID="item.FrID" :width="'1000px'"  :color="colorSon"></my-GZ-Bill>
+                                </template>
                                 <template v-else-if="item.Is_Merge===1&&item.modelShow">
                                   <my-HB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-HB-Bill>
                                 </template>
@@ -662,6 +666,7 @@
 import myBill from "./FinancialSubmodule/BillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
+import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 export default {
     data(){
         return{
@@ -817,6 +822,7 @@ export default {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
         "my-HB-Bill":myhrBill,
+        "my-GZ-Bill": myGZBill,
     },mounted(){
         let userInfo=this.getLocalStorage();
         let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
@@ -1392,6 +1398,9 @@ export default {
             } else if (type === 4) {
                 path = 'addCapitalAllocation'
                 this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
+            } else if (type === 7) {
+                path = 'addFinancialGZDocuments'
+                this.$router.push({ name: path,query:{"FrID":id,"edit":1,blank:'y',tab:'修改财务单据'} })
             }
             // this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
         }

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -109,8 +109,8 @@
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span>
                 </p>
-                <p v-if="(GetDetail.Type==2 || GetDetail.Type==6) && GetDetail.IsPublic !== 3" style="max-width: 500px">
-                    <span>{{$t('visaT.dxzhanghu')}}：</span>
+                <p v-if="GetDetail.Type==2 || GetDetail.Type==6" style="max-width: 500px">
+                    <span>{{$t('fnc.fkzhanghu')}}：</span>
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:$t('fnc.no')}}</span>
                 </p>

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -357,7 +357,7 @@
       <button class="normalBtn" @click="dialogFormVisible2 = true">{{$t('ios.tonggei')}}</button>
       <button class="hollowFixedBtn" @click="dialogFormVisible = true">{{$t('ios.jujue')}}</button>
     </div>
-    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && EmployeeId === detail.CreateBy && EmployeeId === 1">
+    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1 && (EmployeeId === detail.CreateBy || EmployeeId === 1)">
       <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
     </div>
     <div class="imd_img_box">

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -553,7 +553,7 @@
                     </span>
                     <el-dropdown-menu slot="dropdown" class="TC-dropdown">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">团队收支明细</el-dropdown-item>
-                      <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
+                      <el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item.TCID,item.ID,item.StartCityID)">行程下载</el-dropdown-item>
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
@@ -900,7 +900,6 @@
                   });
                 }
               });
-              console.log(this.queryCommonData.dataList,'dataList');
             }
           },
           err => {}

src/components/administrative/ExaminationStatistics.vue

@@ -292,7 +292,7 @@ export default {
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
-        width: 80,
+        width: 70,
         orderBy: "",
         formatter: function(rowData, rowIndex, pagingIndex, field) {
           return `<span>${rowData.leaveEarlyCount <= 0 ? '' : rowData.leaveEarlyCount}</span>`
@@ -316,12 +316,24 @@ export default {
         titleAlign: "left",
         columnAlign: "left",
         isResize: true,
-        width: 80,
+        width: 90,
         orderBy: "",
         formatter: function(rowData, rowIndex, pagingIndex, field) {
           return `<span>${rowData.lllegalModifyRemarkCount <= 0 ? '' : rowData.lllegalModifyRemarkCount}</span>`
         }
       };
+      let AppletOrderCount = {
+        field: "appletOrderCount",
+        title: "报名确认单数",
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80,
+        // orderBy: "",
+        formatter: function(rowData, rowIndex, pagingIndex, field) {
+          return `<span>${rowData.appletOrderCount <= 0 ? '' : rowData.appletOrderCount}</span>`
+        }
+      };
       let discountPrice = {
         field: "discountPrice",
         title: "少价金额",
@@ -340,6 +352,7 @@ export default {
       this.columns.push(userName);
       this.columns.push(periods);
       this.columns.push(LllegalModifyRemarkCount);
+      this.columns.push(AppletOrderCount);
       this.columns.push(rejectCount);
       this.columns.push(receivedPeopleCount);
       this.columns.push(orderCount);
@@ -378,9 +391,12 @@ export default {
         if(param.uncollected!=''){
           this.msg.OrderBy='a.Uncollected '+param.uncollected
         }
-        if(param.LllegalModifyRemarkCount!=''){
+        if(param.lllegalModifyRemarkCount!=''){
           this.msg.OrderBy='a.LllegalModifyRemarkCount '+param.lllegalModifyRemarkCount
         }
+        if(param.appletOrderCount!=''){
+          this.msg.OrderBy='a.AppletOrderCount '+param.appletOrderCount
+        }
         //this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
         this.getList();
       // }else{

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -896,6 +896,12 @@
                 )
               };
             }
+            this.queryFlightAirListData.forEach(subItem=>{
+                 if(subItem.FlightDate==objItem.StartDate)
+                 {
+                   objItem.AirTicketId=subItem.AirLineTicketId
+                 }
+              });
             this.returnPriceList.push(objItem);
             this.initDatePickerCheched();
             this.returnPriceList.sort(
@@ -1323,7 +1329,6 @@
             this.returnPriceList.forEach(x => {
               if (x.TCID == this.modifyTcid) {
                 priceList = [];
-                // x.TCID = 0;
                 x.ConfigID = 0;
                 priceList.push(x);
               }
@@ -1338,7 +1343,6 @@
               this.priceData = this.returnPriceList[index];
               x["Checked"] = true;
               this.chooseDay = this.priceData.StartDate;
-
             } else {
               x["Checked"] = false;
             }

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -572,7 +572,7 @@
         dinnerObj.UseDinnerType = useDinnerType
         dinnerObj.DinnerName = dinnerName
         dinnerObj.BreakfastUseType = 0
-        dinnerObj.DayNum = dayNum
+        dinnerObj.DayNum = dayNumdayNum
         return dinnerObj
       },
       firstLoadConfigInfo() {
@@ -640,7 +640,7 @@
 
                 this.FeatureData.Subtitle = tempData.LtName
                 this.FeatureData.LineName = tempData.LineName
-                this.FeatureData.DayList = tempData.DayList
+                this.FeatureData.DayList = tempData.DayList2
 
                 this.ConfigId = tempData.ID
                 //HK 2019-01-08添加 NewConfigId B2B预览使用