合并代码！

package.json

@@ -5,11 +5,11 @@
   "author": "VIITTO",
   "private": true,
   "scripts": {
-    "dev": "node --max-old-space-size=8192 node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --progress --config build/webpack.dev.conf.js",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src",
-    "serve" : "node --max_old_space_size=8192 node_modules/.bin/vue-cli-service serve --open",
-    "build": "node --max-old-space-size=8192 build/build.js"
+    "serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
+    "build": "node --max-old-space-size=4096 build/build.js"
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.0.38",

src/assets/common/lang/zh.js

@@ -658,7 +658,14 @@ export const visa = {
   v_yibaoru:'已报入',
   v_houbu:'候补',
   v_yxhoubu:'允许候补',
-  
+  v_byxhoubu:'不允许候补',
+  v_sqtime:'送签日期',
+  v_cqtime:'出签日期',
+  v_kptime:'开票日期',
+  v_EuropeanVisaType:'欧洲签证类型',
+  v_britishVisa:'英国签证',
+  v_EuropeanVisaName:'欧洲签证名称',
+  v_visaInformation:'签证资料',
   
   
   
@@ -735,7 +742,7 @@ export const active = {
   cl_yxjzhiri: '有效截止日',
   cl_sytiaojian: '使用条件',
   cl_huoqufangshi: '获取方式',
-  cl_hqriqi: '获取日期',
+   cl_hqriqi: '获取日期',
   cl_zuofei: '作废',
   cl_syfanwei: '适用范围',
   cl_tongyong: '通用',
@@ -761,6 +768,10 @@ export const active = {
 }
 
 export const fnc = {
+  fnc_tfsrhj: '团费收入合计',
+  fnc_zksr: '直客收入',
+  fnc_thjksr: '同行交客收入',
+  fnc_plattev: '平台收入',  
   acc: '账户',
   accBming: '账户别名：',
   accType: '账户类型：',
@@ -1327,6 +1338,60 @@ export const Operation = {
   Op_zhu:'主',
   Op_lian:'联',
   Op_jietuan:'结团',
+  Op_night:'晚',
+  Op_teamNotice:'出团通知书',
+  Op_downLoadword:'下载WORD行程',
+  Op_PriceInfo:'价格信息',
+  Op_tradePrice:'同业价',
+  Op_directPrice:'直客价',
+  Op_fellowMember:'同行会员',
+  Op_standard:'标准',
+  Op_fellow:'同行',
+  Op_directMember:'直客会员',
+  Op_direct:'直客',
+  Op_baby:'婴儿',
+  Op_spickupPrice:'单地接价格',
+  Op_Income:'增收',
+  Op_childBed:'儿童占床',
+  Op_childSurcharge:'儿童附加费',
+  Op_oldmanSurcharge:'老人附加费',
+  Op_visaPrice:'签证费',
+  Op_singleRoomcha:'单房差',
+  Op_insurance:'保险',
+  Op_zafei:'杂费',
+  Op_jianmian:'减免',
+  Op_childNobed:'儿童不占床',
+  Op_visafeeBack:'退签证费',
+  Op_priceDetail:'查看价格明细',
+  Op_people:'人',
+  Op_takeSeat:'占位',
+  Op_nozhipai:'尚未指派',
+  Op_caozuoop:'操作op',
+  Op_bindNum:'绑定数量',
+  Op_Warmprompt:'温馨提示',
+  Op_registrationList:'报名清单',
+  Op_xilieModyfi:'系列团修改',
+  Op_dangtuanModify:'当团修改',
+  Op_advertising:'广告',
+  Op_remark:'OP备注',
+  Op_moreOperation:'更多操作',
+  Op_shouzhiDetail:'团队收支明细',
+  Op_tripDownLoad:'行程下载',
+  Op_shangjia:'上架',
+  Op_xiajia:'下架',
+  Op_shouruDan:'收入确认单',
+  Op_b2bView:'B2B预览',
+  Op_salelianyun:'分销联运',
+  Op_bentuanMaidian:'本团卖点',
+  Op_wordTrip:'WORD行程',
+  Op_duiwaiRemark:'OP对外备注',
+  Op_duineiRemark:'OP对内备注',
+  Op_dijieRemark:'地接备注',
+  Op_HotelChange:'酒店变更',
+  Op_carType:'车型',
+  Op_choicePlat:'请选择上架平台',
+  Op_salesPlat:'销售平台',
+  Op_scTrip:'上传WORD行程'
 }
 export const rule = {
   company: '请选择公司',
@@ -1429,6 +1494,10 @@ export const rule = {
   qxzsyfangxiang: '请选择使用方向',
   qsrjine: '请输入金额',
   qsrzjine: '请输入总金额',
+  qxzrzshijian: '请选择入职时间!',
+  qsrzqdqq: '请输入正确的qq!',
+  
+  
 }
 
 export const adm={
@@ -1447,7 +1516,80 @@ export const adm={
   adm_ynyyfenqu:"是否应用分区",
   adm_qsrgwname:"请输入岗位名称",
   adm_qxzsfyyfenqu:"请选择是否应用分区",
+  adm_changepd:"修改密码",
+  adm_changeUserInfo:"修改用户信息",
+  adm_bindaccountinfo:"绑定账户信息",
+  adm_newPd:"新密码",
+  adm_Reinput:"再次输入",
+  adm_logintel:"登录手机",
+  adm_Validaccount:"有效账号",
+  adm_logincount:"登录账号",
+  adm_changelogintel:"修改登录手机",
+  adm_staff:"员工",
+  adm_newphone:"新手机号",
+  adm_resetpd:"重置密码",
+  adm_twopdnotsame:"两次密码不一致!",
+  adm_twotelphnotsame:"两次手机号码不一致！",
+  adm_swlizhi:"设为离职",
+  adm_swzaizhi:"设为在职",
+  adm_Rolename:"角色名称",
+  adm_quanxian:"权限",
+  adm_qsrmiaoshu:"请输入描述",
+  adm_qxshezhi:"权限设置", 
+  adm_Bindingattendance:"绑定考勤",
+  adm_title:"标题",
+  adm_Publisher:"发布人",
+  adm_ublicationstatus:"发布情况",
+  adm_tobepublish:"待发布",
+  adm_published:"已发布",
+  adm_Withdrawn:"已撤回",
+  adm_Ceilingsituation:"置顶情况",
+  adm_Noroofset:"未置顶",
+  adm_roofset:"已置顶",
+  adm_theme:"主题",
+  adm_roof:"置顶",
+  adm_exitroof:"取消置顶",
+  adm_shifouroof:"是否置顶?",
   
+  adm_chehui:"撤回",
+  adm_fujian:"附件",
+  adm_download:"下载",
+  adm_content:"内容",
+  adm_content:"上传",
+  adm_fjlist:"附件列表",
+  adm_publish:"发布",
+  adm_qsrgbbiaoti:"请输入公告标题",
+  adm_qsrgbneirong:"请输入公告内容",
+  adm_filenotmoreM:"文件大小不能超过100M！",
+  adm_sfchehui:"是否撤回",
+  adm_chsuccess:"撤回成功",
+  adm_chexit:"取消撤回",
+  adm_xgnotice:"修改公告",
+  adm_noticexiangqing:"公告详情",
+  adm_binded:"已绑定",
+  adm_binding:"未绑定",
+  adm_time:"时间",
+  adm_Jobnumber:"工号",
+  adm_Attendancedate:"考勤日期",
+  adm_sbkqshijian:"上班考勤时间",
+  adm_sbdkshijian:"上班打卡时间",
+  adm_sbdkjieguo:"上班打卡结果",
+  adm_sbdkdizhi:"上班打卡地址",
+  adm_xbkqshijian:"下班考勤时间",
+  adm_xbdkshijian:"下班打卡时间",
+  adm_xbdkjieguo:"下班打卡结果",
+  adm_xbdkdizhi:"下班打卡地址",
+  adm_dkshebei:"打卡设备",
+  adm_timenomorethan:"时间跨度不能超过31天!",
+  adm_time:"时间",
+  adm_exportexcel:"导出报表",
+  adm_Sunday:"星期日",
+  adm_Monday:"星期一",
+  adm_Tuesday:"星期二",
+  adm_Wednesday:"星期三",
+  adm_Thursday:"星期四",
+  adm_Friday:"星期五",
+  adm_Saturday:"星期六",
   
 }
 export const visaT = {
@@ -1496,7 +1638,8 @@ export const visaT = {
   qxzcjka:'请选择出境口岸',
   qxzcjhbh:'请选择出境航班号',
   qtxywx:'请填写英文姓',
-  qsrywx:'请输入中文姓',
+  qsrzwx:'请输入中文姓',
+  qsrywx:'请输入英文姓',
   qtxywm:'请填写英文名',
   qtxzcsrq:'请填选择出生日期',
   qtxzxb:'请填选择性别',

src/assets/css/cssReset.css

@@ -482,6 +482,14 @@ vertical-align:middle
         overflow:auto;
         padding: 0 20px;
     }
+    .My_table_tell .v-table-body-cell{
+        display: block!important;
+        line-height: 30px!important;
+      }
+    .column-cell-class-name-test-red .v-table-body-cell{
+        background-color:#e95252;
+        color:#fff;
+    }
     .column-cell-class-name-test .v-table-body-cell{
         background-color: yellow;
     }

src/components/FinancialModule/FinancialDocuments.vue

@@ -805,7 +805,7 @@ export default {
                 QStartDate:'',
                 UpdateBy:'',
                 Sort:'2',
-                IsSpecial:1
+                IsSpecial:0
             },
             getCompanyMsg:{  // 公司
                 RB_Group_Id:'0',

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1039,7 +1039,7 @@ export default {
             this.picIsShow= true;
             // this.hideFlashMan = true;
           }else{
-              console.log(i.Url)
+              
             if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
               this.previewPDF(i.Url)
             }else{
@@ -1048,7 +1048,7 @@ export default {
           }
         },
         showUpLoadFile(i){  // 预览上传文件
-        console.log(i.Content)
+        
             if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
                 this.previewPDF(i.Content)
             }else{

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -365,7 +365,8 @@ export default {
             EmployeeId:0,
             noData:false,
         }
-    },created(){
+    },
+    created(){
         var date = new Date().Format("yyyy-MM-dd");
         var arr = date.split('-');
         var year = arr[0]; //获取当前日期的年份
@@ -389,11 +390,21 @@ export default {
             month2 = '0' + month2;
         }
         var t2 = year2 + '-' + month2 + '-' + day2;
-        this.defaultMonth[0] = t2;
-    },components: {
+        this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
+        if(this.$route.query.startDate){     
+            this.defaultMonth[0]=this.$route.query.startDate;
+            this.defaultMonth[1]=this.$route.query.endDate;
+        }else{
+            this.defaultMonth[0] = t2;
+        }
+
+
+    },
+    components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
-    },mounted(){
+    },
+    mounted(){
         let userInfo=this.getLocalStorage();
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.EmployeeId = userInfo.EmployeeId;
@@ -416,7 +427,7 @@ export default {
                 this.msg.CStartDate = '2019-01-01';
                 this.msg.QEndDate = '';
             }
-            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1;
+            if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
             if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
             if(!this.msg.EnterID)this.msg.EnterID=0;
             if(!this.msg.OrderId)this.msg.OrderId=0;
@@ -496,7 +507,9 @@ export default {
                 this.msg.CStartDate = '2019-01-01';
                 this.msg.QEndDate = '';
             }
-            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1;
+            if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0){
+                this.msg.RB_Branch_Id=-1;
+            }
             if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
             if(!this.msg.EnterID)this.msg.EnterID=0;
             if(!this.msg.OrderId)this.msg.OrderId=0;

src/components/FinancialModule/RecPayQueryTeamV2.vue

@@ -376,7 +376,13 @@ export default {
             month2 = '0' + month2;
         }
         var t2 = year2 + '-' + month2 + '-' + day2;
-        this.defaultMonth[0] = t2;
+        this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
+        if(this.$route.query.startDate){     
+            this.defaultMonth[0]=this.$route.query.startDate;
+            this.defaultMonth[1]=this.$route.query.endDate;
+        }else{
+            this.defaultMonth[0] = t2;
+        }
     },components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,

src/components/Hotel/HotelManagement.vue

@@ -326,7 +326,7 @@
         </div>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
-          <button @click="goUrl('HotelProductManage2',item)" class="hotelBtn">报价</button>
+          <button @click="goUrl('HotelProductManage2',item)" class="hotelBtn">报价与库存</button>
         </div>
       </div>
     </div>

src/components/Hotel/HotelProductCalendar.vue

@@ -82,34 +82,16 @@
                 } else if (type === 4) {
                     return 'hasStock hasStock_4'
                 }
-                
+                 else if (type === 5) {
+                    return 'hasStock hasStock_5'
+                }
             },
             calendarHide: function () {
                 this.calendar.show = false
                 this.calendar.data = {}
             },
-            // dateChange: function (type, direction) {
-            //     if (type === 'year') {
-            //         if (direction === 'left') {
-            //             this.msg.currentYear--
-            //         } else if (direction === 'right') {
-            //             this.msg.currentYear++
-            //         }
-            //     } else if (type === 'month') {
-            //         let newDate = new Date(this.$calendarUtils.formatDate(this.msg.currentYear, this.msg.currentMonth, 1));
-            //         if (direction === 'left') {
-            //             newDate.setDate(0);
-            //         } else if (direction === 'right') {
-            //             newDate.setDate(32);
-            //         }
-            //         this.msg.currentYear = newDate.getFullYear()
-            //         this.msg.currentMonth = newDate.getMonth()+1
-            //     }
-            //     this.getCalendarDays()
-            // },
             goUrlA: function (type, item) {
                 this.$emit('goEdit', type, item.day)
-                // this.$router.push({ name: 'HotelProductEdit', query: { type: type, HotelId: this.hotelId, day: item.day,blank: 'y', tab: '报价管理'} });
             },
             goUrlHotelTeam:function(item){
                this.$router.push({ name: 'HotelsTeam', query: { HotelId: item.data.HotelId,StartDate:item.data.DayStr, blank: 'y', tab: '酒店相关团'} });
@@ -268,6 +250,9 @@
     .hotelProductCalendar_day>div>.hasStock_4 {
         background-color: #ffffff;
     }
+    .hotelProductCalendar_day>div>.hasStock_5 {
+        background-color: #02F78E;
+    }
     .hotelProductCalendar_day>div>.noStock{
         padding: 30px 0 0 0;
         width: 100%;

src/components/SalesModule/enrollTotalTwo.vue

@@ -448,7 +448,13 @@
           DueinMoney: 0,
           PreferPrice: 0,
           InteriorNum: 0,
-          B2BNum: 0
+          B2BNum: 0,
+          SumPreferPrice: 0,
+          SumIncome: 0,
+          SumRefund: 0,
+          SumPlatformTax: 0,
+          ZaiTu: 0,
+          DaiShou: 0,
         },
         ctlxList: []
       };

src/components/TravelManager/TravelList/OpTripList.vue

@@ -224,7 +224,7 @@
       },
       //获取线路列表
       getLineList() {
-        this.apipost("line_post_GetList", {}, res => {
+        this.apipost("line_post_GetList", {"LineDirection":1}, res => {
           if (res.data.resultCode == 1) {
             this.queryCommonData.LineList = res.data.data;
           }

src/components/TravelManager/TravelList/SaleTripList.vue

@@ -214,7 +214,7 @@
       },
       //获取线路列表
       getLineList() {
-        this.apipost("line_post_GetAllList", {}, res => {
+        this.apipost("line_post_GetLineListExt", {}, res => {
           if (res.data.resultCode == 1) {
             this.queryCommonData.LineList = res.data.data;
           }