uo

package.json

@@ -11,7 +11,7 @@
     "build": "node --max-old-space-size=4096 build/build.js"
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.0.36",
+    "@riophae/vue-treeselect": "0.0.38",
     "@xkeshi/vue-barcode": "^1.0.0",
     "ali-oss": "^5.3.1",
     "axios": "^0.18.0",
@@ -27,7 +27,7 @@
     "js-md5": "^0.7.3",
     "jspdf": "^1.4.1",
     "lrz": "^4.9.40",
-    "node-sass": "^4.8.3",
+    "node-sass": "^4.11.0",
     "pdfjs-dist": "^2.0.489",
     "pinyin": "^2.8.3",
     "qrcode": "^1.2.2",
@@ -40,7 +40,7 @@
     "vue-quill-editor": "^3.0.6",
     "vue-treeselect": "^1.0.7",
     "vue-waterfall-easy": "^2.4.1",
-    "vue-websocket": "^0.2.2",
+    "vue-websocket": "^0.2.3",
     "vueshowpdf": "^1.1.2",
     "vuex": "^3.0.1",
     "xlsx": "^0.14.1",
@@ -49,14 +49,14 @@
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
-    "babel-core": "^6.22.1",
+    "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.1",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-loader": "^7.1.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-preset-env": "^1.3.2",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
@@ -74,7 +74,7 @@
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
-    "less": "^3.0.1",
+    "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "node-notifier": "^5.1.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
@@ -89,7 +89,7 @@
     "style-loader": "^0.21.0",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.9",
-    "vue-easytable": "^1.7.1",
+    "vue-easytable": "^1.7.2",
     "vue-loader": "^13.3.0",
     "vue-router": "^3.0.1",
     "vue-style-loader": "^3.0.1",

src/assets/css/cssReset.css

@@ -626,4 +626,7 @@ vertical-align:middle
 .column-cell-class-text-red{
     color: red !important
 }
+._height_auto.el-select .el-input{
+    height: auto !important;
+}
 /************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file

src/components/DomesticModule/OrderDetails.vue

@@ -241,8 +241,9 @@ export default {
                 AirlineId:'',
                 FlightNo:'',
                 ClientName:'',
-                Term:'',
+                //Term:'',
                 ParentId:1,
+                ParentId:0,
             },
             AirportNameList:[],
             total:0,  
@@ -256,7 +257,8 @@ export default {
         }
     },
     created(){
-        this.Term = this.msg.Term = this.$route.query.Term;     
+        this.Term  = this.$route.query.Term;    
+        this.msg.ParentId=this.$route.query.ID; 
     },
     mounted(){
         this.getList(this.id);

src/components/DomesticModule/SettlementOrder.vue

@@ -125,7 +125,7 @@
                     <td>{{item.EmName}}<br/>{{item.UpdateDate}}</td>
                     <td>
                         <el-tooltip class="item" effect="dark" content="详情" placement="top">
-                            <el-button type="danger"  class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term)" circle>详</el-button>
+                            <el-button type="danger"  class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term,item.ID)" circle>详</el-button>
                         </el-tooltip>         
                         <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
                             <el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle>收</el-button>
@@ -167,7 +167,8 @@ export default {
                 pageSize:15,
                 sDate:'',
                 eDate:'',
-                IsInter:'-1'
+                IsInter:'-1',
+                ID:0,
             },
             dataList:[],
             noData:false,
@@ -191,6 +192,7 @@ export default {
         let userInfo = this.getLocalStorage();
         this.emID=userInfo.EmployeeId;
         this.RB_Branch_Id = userInfo.RB_Branch_id;
+        this.msg.ID=this.$route.query.id;
     },
     methods:{
         jumpPage(path,id,term,type){
@@ -264,10 +266,11 @@ export default {
                 }
             );            
         },
-        goUrl(path,Term){
-            this.$router.push({name:path,query:{'Term':Term,blank:'y'}})
+        goUrl(path,Term,id){
+            this.$router.push({name:path,query:{'Term':Term,'ID':id,blank:'y'}})
         },
         getList(){
+            console.log(this.msg);
             this.loading = true;
             this.apipost('Domestic_Ticket_post_GetBillPageList',this.msg,r=>{
                 if(r.data.resultCode==1){

src/components/FinancialModule/JumpReport.vue

@@ -168,7 +168,7 @@
                     <template>
                       <el-col :span="4">
                         <el-form-item label="费用类型：">
-                          <el-select  filterable  v-model='msg.CostTypeID'>
+                          <el-select class="_height_auto" filterable multiple v-model='msg.CostTypeIDslist'>
                             <el-option :value="0" label="不限"></el-option>
                             <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
                           </el-select>
@@ -712,7 +712,8 @@ export default {
                 eMoney:'',
                 CurrencyId:'0',
                 CostTypeID:'',
-                CostTypeIDs:'',
+                CostTypeIDs: '',
+                CostTypeIDslist: [],
                 Conditon:'',
                 TCID:'',
                 TradeWay:'0',
@@ -850,7 +851,12 @@ export default {
             this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
         }
        if(this.$route.query.CostIds){
-            this.msg.CostTypeID=parseInt(this.$route.query.CostIds);
+            let arr = this.$route.query.CostIds ? this.$route.query.CostIds.split(',') : []
+            if (arr.length) {
+                arr.forEach(x=>{
+                    this.msg.CostTypeIDslist.push(parseInt(x));
+                })
+            }
         }
     },components: {
         "my-Bill": myBill,
@@ -938,6 +944,13 @@ export default {
             if(!this.msg.Conditon)this.msg.Conditon=1;
             if(!this.msg.TradeWay)this.msg.TradeWay=0;
             if(!this.msg.AccountType)this.msg.AccountType=0;
+            if(this.msg.CostTypeIDslist.length) {
+                this.msg.CostTypeIDs = ''
+                this.msg.CostTypeIDslist.forEach(x=>{
+                    this.msg.CostTypeIDs += x + ','
+                })
+                console.log(this.msg.CostTypeIDs)
+            }
             this.loading= true;
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
@@ -1270,6 +1283,8 @@ export default {
                 eMoney:this.msg.eMoney,
                 CurrencyId:this.msg.CurrencyId,
                 CostTypeID:this.msg.CostTypeID,
+                CostTypeIDs: this.msg.CostTypeIDs,
+                CostTypeIDslist: this.msg.CostTypeIDslist,
                 Conditon:this.msg.Conditon,
                 TCID:this.msg.TCID,
                 TradeWay:this.msg.TradeWay,

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -79,7 +79,11 @@ import Vue from "vue";
 //一月
 Vue.component("YiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>`,
+  template: `
+  <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -109,7 +113,11 @@ Vue.component("YiYueJump", {
 //二月
 Vue.component("ErYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>`,
+  template: `
+   <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -139,7 +147,10 @@ Vue.component("ErYueJump", {
 //三月
 Vue.component("SanYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -169,7 +180,10 @@ Vue.component("SanYueJump", {
 //四月
 Vue.component("SiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -199,7 +213,10 @@ Vue.component("SiYueJump", {
 //五月
 Vue.component("WuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -229,7 +246,10 @@ Vue.component("WuYueJump", {
 //六月
 Vue.component("LiuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -259,7 +279,10 @@ Vue.component("LiuYueJump", {
 //七月
 Vue.component("QiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -289,7 +312,10 @@ Vue.component("QiYueJump", {
 //八月
 Vue.component("BaYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -319,7 +345,10 @@ Vue.component("BaYueJump", {
 //九月
 Vue.component("JiuYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -349,7 +378,10 @@ Vue.component("JiuYueJump", {
 //十月
 Vue.component("ShiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -379,7 +411,10 @@ Vue.component("ShiYueJump", {
 //十一月
 Vue.component("ShiYiYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYi}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object
@@ -409,7 +444,10 @@ Vue.component("ShiYiYueJump", {
 //十二月
 Vue.component("ShiErYueJump", {
   //  团队跳转
-  template: `<span style="cursor: pointer" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>`,
+  template: ` <div>
+  <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>
+  <span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
+  </div>`,
   props: {
     rowData: {
       type: Object

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -581,9 +581,11 @@ import { setTimeout } from "timers";
 Vue.component("TCIDJump", {
   //  团队跳转
   template: `
-  <div >
+  <div>
     <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span> 
+    <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
   </div>
   
   `,
@@ -921,6 +923,15 @@ export default {
             return 0
           }
         },
+        {
+          field: "CompensationMoney",
+          title: "赔偿",
+          formatter: this.moneyFormat,
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },        
         {
           field: "QiTa",
           formatter: this.moneyFormat,
@@ -1559,6 +1570,7 @@ export default {
       if (field === "GuoNeiLianYunJiPiao")
         return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
       if (field === "Visa") return this.priceFormat(rowData.Visa);
+      if (field === "CompensationMoney") return this.priceFormat(rowData.CompensationMoney);
       if (field === "QiTa") return this.priceFormat(rowData.QiTa);
       if (field === "DiJieZhiChu") return this.priceFormat(rowData.DiJieZhiChu);
       if (field === "DiJieShouRu") return this.priceFormat(rowData.DiJieShouRu);

src/components/SalesModule/groupTourOrder.vue

@@ -942,12 +942,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="4">
@@ -2678,10 +2678,10 @@
           Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) +
           Number(this.addMsg.OldPeopleNum)
-        this.addMsg.YSeatNum =
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.OldPeopleNum)
+
+        var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+                    (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+        this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
       },
       getTotalPrice () {
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -157,10 +157,10 @@
 						<el-tooltip   v-else class="item" effect="dark" content="修改备注" placement="top-start">
 			              <el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
 			            </el-tooltip>
-			            <el-tooltip   effect="dark" content="结算"  placement="top-start">
+			            <el-tooltip  v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算"  placement="top-start">
 			               <el-button type="primary"  style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)'  icon="iconfont icon-qian"></el-button>
 			            </el-tooltip>
-			              <el-tooltip   effect="dark" content="旅客名单"  placement="top-start">
+			              <el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1"  effect="dark" content="旅客名单"  placement="top-start">
 			               <el-button v-show='item.visaManagementId>0' type="primary"  style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)'  icon="iconfont icon-bumen"></el-button>
 			             </el-tooltip>
 						  <el-tooltip v-if="item.income<=0&&item.visaOrderStatus==1"  class="item" effect="dark" content="取消" placement="top-start">

src/components/Ticketing/individualTicket.vue

@@ -548,7 +548,7 @@ import moment from 'moment'
     },
     created(){
       if(this.$route.query.id){
-        this.msg.ID=this.$route.query.id;
+        this.msg.Flight_number=this.$route.query.id;
       }
     },
     methods: {