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

src/components/FinancialModule/JumpReport.vue

@@ -813,7 +813,7 @@ export default {
                 {field: 'StatusStr', title: '当前状态',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
                 {field: 'custome-operation', title: '操作',width: 200, titleAlign: 'left',columnAlign:'left',componentName:'table-operation',isResize:true}
             ],
-            pageSize:6,
+            pageSize:5,
             pageIndex:1,
           heightQueryBox:false
         }
@@ -1270,7 +1270,7 @@ export default {
         queryInfoInit(){  // 初始化msg
             let msg = {
                 pageIndex:this.msg.pageIndex,
-                pageSize:6,
+                pageSize:5,
                 FrID:this.msg.FrID==0?'':this.msg.FrID,
                 sDate:this.msg.sDate,
                 eDate:this.msg.sDate,

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -889,6 +889,9 @@ export default {
                     console.log(res)
                     this.shouxufei = res.data.data
                 }, err => {})
+            } else {
+                this.msg.OriginalFee = 0
+                this.msg.Fee = 0
             }
         },
         clearAccBank(){  // 选择账户类型清空数据

src/components/SalesModule/addPassenger.vue

@@ -898,53 +898,6 @@
           this.access_token_ocr = res.data.access_token;
         });
       },
-      //      commonTextDiscernIdCard(){
-      //      	this.loading=true
-      //	        let params= 'detect_direction=true&id_card_side=front&image='+encodeURIComponent(this.imgBase64String)   //base64类型
-      //	        let url = this.BD_COMMON_TEXT_DISCERN_IDCARD + '?access_token=' + this.access_token_ocr;
-      //	        let that=this
-      //	        this.$http({
-      //		       	method: 'post',
-      //		       	url:'https://bird.ioliu.cn/v1?url='+url,
-      //		       	data:params,
-      //		        headers:{
-      //				'Accept':'application/json',
-      //				'Content-Type':'application/x-www-form-urlencoded'
-      //	        	}
-      //		       }).then(res=>{
-      //		       		this.loading=false
-      //		       	    let obj=res.data.words_result
-      //		        	this.addMsg.Nationality=2
-      //		        	for(let key in obj){
-      //		        		switch(key){
-      //		        			case '姓名':
-      //		        			this.addMsg.SurName=obj[key].words.substring(0,1)
-      //		        			this.addMsg.Name=obj[key].words.substring(1,obj[key].words.length)
-      //		        			this.Transformation(this.addMsg.SurName,'SurName')
-      //		        			this.Transformation(this.addMsg.Name,'Name')
-      //		        			break;
-      //		        			case '公民身份号码':
-      //		        			this.addMsg.IdCard=obj[key].words
-      //		        			break;
-      //		        			case '住址':
-      //		        			this.addMsg.AddressDetail=obj[key].words
-      //		        			break;
-      //		        			case '性别':
-      //		        			  obj[key].words=='男'?this.addMsg.Sex='1':this.addMsg.Sex='2'
-      //		        			break;
-      //		        			case '出生':
-      //		        			this.addMsg.Birthday=obj[key].words.substring(0,4)+'-'+obj[key].words.substring(4,6)+'-'+obj[key].words.substring(6,8)
-      //		        			default:
-      //		        			break;
-      //		        		}
-      //		        	}
-      //		        	that.$forceUpdate()
-      //	        },err=>{
-      //	        	this.loading=false
-      //	        })
-      //
-      //      },
-
       // 月份转换
       getMonthWithEn: function (enMonth) {
         enMonth = enMonth.toLowerCase();
@@ -1882,6 +1835,7 @@
               this.VisaStartStatus = this.addMsg.IsVisaFree;
               this.AirStartStatus = this.addMsg.IsNeedAirticket;
               this.SafeStartStatus = this.addMsg.IsNeedSafe;
+              this.zhanchuangTips(obj.Birthday)
               this.$forceUpdate();
               this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
               if ( this.$route.query.isOneDay === 1) {

src/components/SalesModule/groupTourOrder.vue

@@ -2394,7 +2394,7 @@
       //跳转至领取合同
       goContract(item){
         let routeData = this.$router.resolve({
-          name: 'TravelContract',
+          name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
             orderID:item.orderId,

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -4937,7 +4937,7 @@
        //跳转至领取合同
       goContract(item){
         let routeData = this.$router.resolve({
-          name: 'TravelContract',
+          name: 'TravelContractNew',
           query: {
             TCID: item.tcid,
             orderID:item.orderId,

src/components/SalesModule/productQuery.vue

@@ -975,8 +975,8 @@
           TC_Price: '0',
           ManNum: '0',
           ChirdNum: '0',
-          ChirdNoNeedBedNum: '0',
-          ChirdNeedBedNum: '0',
+          ChirdNoNeedBedNum: '',
+          ChirdNeedBedNum: '',
           BabyNum: '0',
           OldPeopleNum: '0',
           SingleRoomNum: '0',
@@ -1187,8 +1187,8 @@
       groupTypeChange: function (val) {
         if (val === '4') {
           this.addMsg.ManNum = 0
-          this.addMsg.ChirdNoNeedBedNum = 0
-          this.addMsg.ChirdNeedBedNum = 0
+          this.addMsg.ChirdNoNeedBedNum = ''
+          this.addMsg.ChirdNeedBedNum = ''
           this.addMsg.BabyNum = 0
           this.addMsg.OldPeopleNum = 0
           this.addMsg.ManNum = 0
@@ -1214,8 +1214,8 @@
           // this.addMsg.ChirdNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
-          this.addMsg.ChirdNoNeedBedNum = 0;
-          this.addMsg.ChirdNeedBedNum = 0;
+          this.addMsg.ChirdNoNeedBedNum = '';
+          this.addMsg.ChirdNeedBedNum = '';
 
           this.addMsg.PreferPrice = 0;
           this.addMsg.SafeNum = 0;
@@ -1229,8 +1229,8 @@
           // this.addMsg.ChirdNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
-          this.addMsg.ChirdNoNeedBedNum = 0;
-          this.addMsg.ChirdNeedBedNum = 0;
+          this.addMsg.ChirdNoNeedBedNum = '';
+          this.addMsg.ChirdNeedBedNum = '';
 
           this.addMsg.PreferPrice = 0;
           this.addMsg.SafeNum = 0;
@@ -1711,7 +1711,7 @@
       },
       getNumber() {
         if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
-          this.addMsg.ChirdNoNeedBedNum = 0
+          this.addMsg.ChirdNoNeedBedNum = ''
           this.$message.error('儿童不占床数不能大于单地接人数！')
           this.$forceUpdate()
           return
@@ -1884,7 +1884,7 @@
         this.addMsg.TC_Price = '0'
         this.addMsg.ManNum = '0'
         this.addMsg.ChirdNum = '0'
-        this.addMsg.ChirdNeedBedNum = '0'
+        this.addMsg.ChirdNeedBedNum = ''
         this.addMsg.BabyNum = '0'
         this.addMsg.OldPeopleNum = '0'
         this.addMsg.SingleRoomNum = '0'
@@ -1940,8 +1940,17 @@
             return;
           }
         }
+        
         //验证人数和机位数 20190807 修改 如果是不是单地接才判断
         if (this.addMsg.GroupType !== '4' && this.addMsg.GroupType !== '3') {
+          if (this.addMsg.ChirdNoNeedBedNum == '') {
+            this.$message.warning('请输入儿童不占床数！如果没有请输入0！')
+            return
+          }
+          if (this.addMsg.ChirdNeedBedNum == '') {
+            this.$message.warning('请输入儿童占床数！如果没有请输入0！')
+            return
+          }
           if ((Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) != Number(
             this.addMsg.YSeatNum) + Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)) {
             this.$message.warning('人数和机位数不相等！')
@@ -1967,6 +1976,7 @@
             this.$message.warning('儿童占床不能大于儿童数！')
             return
           } 
+          
         } 
         // if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
         //   <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
@@ -1987,7 +1997,10 @@
         if(this.addMsg.GroupType == 4){
           this.addMsg.TC_Price = this.SingleDMCPricex;//地接时 本团单价
           this.addMsg.Unit_Price = this.SingleDMCPrice; // 地接时 成交单价
-
+          if (this.addMsg.ChirdNoNeedBedNum == '') {
+            this.$message.warning('请输入儿童不占床数！如果没有请输入0！')
+            return
+          }
         }
 
         let ChirdNum = Number(this.addMsg.ChirdNum)

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -940,28 +940,23 @@
     cursor: pointer;
     width: 60px;
   }
-
-  .RegistrationList .leftSetInfo,
-  .RegistrationList .GO_TPright {
-    float: left;
+  .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
+    float:left;
   }
-
-  .RegistrationList .GO_Title {
+  .RegistrationList .GO_Title{
     display: inline-block;
     margin-top: 10px;
-    padding-right: 10px;
-    font-size: 12px;
+    padding-right:10px;
+    font-size:12px;
     width: 90px;
     text-align: right;
   }
-
-  ._TravelPricePopover .GOScenicDiv {
+  ._TravelPricePopover .GOScenicDiv{
     width: 500px;
     max-height: 400px;
     overflow: auto;
   }
-
-  ._TravelPricePopover table {
+  ._TravelPricePopover table{
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
@@ -971,13 +966,13 @@
     width: 100%;
   }
 
-  ._TravelPricePopover table ._color_666 {
+  ._TravelPricePopover table ._color_666{
     background-color: #ededed;
     color: #666666;
     padding: 5px;
   }
 
-  ._TravelPricePopover table td {
+  ._TravelPricePopover table td{
     background-color: #ffffff;
     padding: 9px 0;
     color: #333333;
@@ -988,7 +983,6 @@
   ._TravelPricePopover table td._d_name {
     background-color: #ededed;
   }
-
   .RegistrationList .SimulateDrop-box {
     width: 230px;
     min-height: 34px;
@@ -997,15 +991,13 @@
     float: left;
     margin-top: 4px;
     border: 1px solid #d1d1d1;
-  }
-
-  .RegistrationList .GO_SimulaDrop {
+}
+  .RegistrationList .GO_SimulaDrop{
     position: absolute;
-    right: 10px;
-    top: 5px;
-    color: #d1d1d1;
+    right:10px;
+    top:5px;
+    color:#d1d1d1;
   }
-
   .RegistrationList .SD_flight {
     display: inline-block;
     height: 24px;
@@ -1014,12 +1006,12 @@
     max-width: 200px;
     white-space: nowrap;
     text-overflow: ellipsis;
-    font-size: 12px;
+    font-size:12px;
     padding: 0 8px;
     line-height: 22px;
     background-color: #f0f2f5;
   }
-
+.RegistrationList .importNameFile.el-dialog--center .el-dialog__body{text-align: center;}
 </style>
 
 <template>
@@ -2183,6 +2175,7 @@
                         <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div>
                         <div @click="lianyunFY(childItem)">联运返佣</div>
                         <div @click="ZhuiJiaTuanKuan(childItem.OrderId)" v-if="RBBranchId == 0">追加团款</div>
+                        <div @click="importNameOrder(childItem.OrderId)" v-if="OrderDataList.OtherOrderList.length == 1 && subItem.List.length == 1">导入旅客名单</div>
                         <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
                           @click='deleteItem(childItem)'>
                           删除
@@ -2553,6 +2546,7 @@
                         设置额外金额</div>
                       <div @click="SetShouSunClick(item.OrderId, item.GuestNum)">设置收损金额</div>
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
+                      <div @click="importNameOrder(item.OrderId)">导入旅客名单</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
                     </div>
                     <el-button slot="reference" type="primary"
@@ -2691,7 +2685,7 @@
                   {{LeaderInfoList.LeaderGuide.Surname}}{{LeaderInfoList.LeaderGuide.Name}}
                 </td>
                 <td>
-                  {{leaderItem.HolidayStr}}
+                  请假
                 </td>
                 <td>
                   {{leaderItem.StartDateStr2}}到{{leaderItem.EndDateStr2}}
@@ -2984,6 +2978,14 @@
       </div>
     </el-dialog>
     <a id='RegistrationList_DownLoad' target="_blank" style="display:none">1不要删除</a>
+    <el-dialog custom-class='w700 importNameFile' title="导入旅客名单" :visible.sync="importNameFile" center>
+      <el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div slot="tip" class="el-upload__tip">只能上传Excel文件</div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -2994,6 +2996,8 @@
   export default {
     data() {
       return {
+        importFileUrl2: '',
+        importNameFile: false,
         HightUnitPrice: "0",
         redBagList: [],
         IsHaveAuth: 0, //是否有权限
@@ -3409,6 +3413,35 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      //上传
+      handleAvatarSuccess(res, file) {
+        if (res.resultCode == 1) {
+          this.Success(res.message);
+          this.outerVisible = false;
+          this.isShow = false;
+          this.fillShow = true;
+          this.importData = res.data;
+          this.getList()
+        } else{
+          this.$message.error(res.message);
+        }
+      },
+      // 上传验证
+      beforeAvatarUpload(file) {
+        return
+        const isJPG = file.type === "application/x-msdownload";
+        if (!isJPG) {
+          this.$message.error("上传文件只能是 excel 格式!");
+        }
+        return isJPG && isLt2M;
+      },
+      // 导入名单
+      importNameOrder(id){
+        let uerInfo = this.getLocalStorage();
+        this.importFileUrl2 = this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=6&OrderId=" + id + "&EmployeeId=" + uerInfo.EmployeeId;
+        this.importNameFile = true;
+      },
       // OP备注赋值
       OPRemark(item) {
         this.apipost('sellorder_post_GetOrderEntity', {
@@ -5069,44 +5102,8 @@
           err => {}
         );
       },
-      getStartOrEndDate(start1, end1, start2, end2) {
-        var startdate1 = new Date(start1.replace("-", "/").replace("-", "/"));
-        var enddate1 = new Date(end1.replace("-", "/").replace("-", "/"));
-        var startdate2 = new Date(start2.replace("-", "/").replace("-", "/"));
-        var enddate2 = new Date(end2.replace("-", "/").replace("-", "/"));
-        //startdate1介于另一个区间之间
-        if (startdate1 >= startdate2 && startdate1 <= enddate2) { 
-          return true;
-        }
-         //enddate1介于另一个区间之间
-        if (enddate1 >= startdate2 && enddate1 <= enddate2) {
-          return true;
-        }
-        //startdate1-enddate1的区间大于另一个区间，且另一个区间在startdate1-enddate1之间
-        if (startdate1 <= startdate1 && enddate1 >= enddate2) {
-          return true;
-        }
-
-        return false;
-      },
       //确定设置领队
       setTheLeader() {
-        let isCked = false;
-        this.LeaderHolidyList.forEach(x => {
-          if (!isCked && this.getStartOrEndDate(this.ConfigData.Config.StartDate, this.ConfigData.Config.EndDate, x.StartDateStr2,x.EndDateStr2)) {
-            isCked = true;
-          }
-        })
-        if (isCked) {
-          var that = this;
-          that.Confirm("该领队在请假期，是否继续?", function () {
-            that.getLeader();
-          })
-        } else {
-          this.getLeader();
-        }
-      },
-      getLeader() {
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost(
@@ -5265,7 +5262,7 @@
       goContract(item) {
         if (item.ContractNum) {
           let routeData = this.$router.resolve({
-            name: 'ElectronicContract',
+            name: 'TravelContractDetail',
             query: {
               TCID: item.TCID,
               orderID: item.OrderId,
@@ -5275,7 +5272,7 @@
           window.open(routeData.href, '_blank')
         } else {
           let routeData = this.$router.resolve({
-            name: 'TravelContract',
+            name: 'TravelContractNew',
             query: {
               TCID: item.TCID,
               orderID: item.OrderId,

src/router/config.js

@@ -3836,7 +3836,22 @@ export default {
                 title: '领队报账'
             }
         },
-        
+        {
+            path:'/TravelContractNew', //新电子合同
+            name: 'TravelContractNew',
+            component: resolve => require(['@/components/TravelContractNew'], resolve),
+            meta: {
+                title: '电子合同'
+            }
+        },
+        {
+            path:'/TravelContractDetail', //新电子合同详情
+            name: 'TravelContractDetail',
+            component: resolve => require(['@/components/TravelContractDetail'], resolve),
+            meta: {
+                title: '电子合同'
+            }
+        },
         {
             path: '/supplierLogin', //供应商登录
             name: 'supplierLogin',