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

src/components/SalesModule/MyCustomerDetail.vue

@@ -54,7 +54,12 @@
 								   	<el-input class='w200' v-model='updateMsg.CustomerName'></el-input>
 								</el-form-item>
 							</el-col>
-							<el-col :span="18">
+							<el-col :span="6">
+									<el-form-item  label="门店名称：">
+								   	<el-input class='w200' v-model='updateMsg.Contact'></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
 							</el-col>
 		      	    	</el-row>
 	      	       <el-row :gutter="20" style='margin-top:13px;'>
@@ -330,6 +335,7 @@
 					Address:'',
 					Country:2,
 					Province:0,
+					Contact:'',
 					City:0,
 					District:0,
 					HousePhotos:[],
@@ -338,7 +344,9 @@
 				},
 				rules:{
 					contactName:[
-					  { required: true, message: '请输入姓名', trigger: 'blur' }
+					  { required: true, message: '请输入门店名称', trigger: 'blur' }
+					],Contact:[
+					  { required: true, message: '请输入联系人名称', trigger: 'blur' }
 					],
 					contactDuty:[
 					  { required: true, message: '请选择职务', trigger: 'change' }
@@ -438,7 +446,8 @@
 					 		this.customerInfo.address=this.customerInfo.address
 					 	}
 					 	this.contact=res.data.data.contact
-					 	this.updateMsg.CustomerName=x.customerName
+						this.updateMsg.CustomerName=x.customerName
+						this.updateMsg.Contact=x.Contact
 					 	this.updateMsg.CustomerId=x.customerId
 					 	this.updateMsg.Address=x.address
 					 	this.updateMsg.Province=x.province

src/components/confirmationOrderDownLoad.vue

@@ -17,8 +17,8 @@
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <el-row>
       <el-col :span="14">
-        <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版PDF"
-          @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
+        <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版PDF_V3"
+          @click="toPDF_V3(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
           @click="toPDF_V2(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
@@ -1000,29 +1000,67 @@
         }
       },
       // 生成pdf
-      toPDF: function (title) {
+      toPDF_V3: function (title) {
         this.pdfLoading = true
-        let pageData = document.getElementById('pdfNode').innerHTML
-        let urlObj = this.domainManager()
+        let urlObj = this.domainManager();
+        let msg = {
+          configId: this.$route.query.configId,
+          cityId: this.$route.query.cityId,
+          tcid: this.$route.query.tcid,
+          orderId: this.$route.query.orderId,
+          FileName: title,
+          //是否显示基础信息
+          isShowBase: this.vshowA ? 1 : 0,
+          //是否显示航班
+          isShowFlight: this.vshowB ? 1 : 0,
+          //是否显示行程特色
+          isShowFeature: this.vshowC ? 1 : 0,
+          //自费、费用包含、费用不含
+          isShowFee: this.vshowE ? 1 : 0,
+          //购物说明，购物安排
+          isShowShop: this.vshowF ? 1 : 0,
+          //重要提示、温馨提示 [订单须知]
+          isShowTip: this.vshowG ? 1 : 0,
+          //是否显示同行备注
+          isShowB2B: this.vshowI ? 1 : 0,
+          //是否显示行程
+          isShowTrip: this.vshowD ? 1 : 0,
+          //是否显示标题
+          isShowTitle: this.vshowL ? 1 : 0,
+          //是否显示旅客名单
+          isShowGuest: this.vshowM ? 1 : 0,
+          //是否显示紧急联系人
+          isShowMan: this.vshowLLR ? 1 : 0,
+          //是否显示团号
+          isShowTCNUM: this.vshowTCNUM ? 1 : 0,
+          //是否显示行程图片
+          isShowTripImage: this.vshowK ? 1 : 0,
+          //是否显示签证信息
+          isShowVisa: this.vshowH ? 1 : 0,
+          //isPc是否PC下载
+          isPc: 2,
+          //模板参数
+          templateId: this.showType,
+          //用户Id
+          UId:this.getLocalStorage().EmployeeId
+        };
         this.$http({
           headers: {
             'Content-Type': 'application/json'
           },
           method: 'post',
-          url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
+          url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo_V3',
           data: {
-            "msg": pageData
+            "msg": msg
           }
         }).then(res => {
           if (res.data.resultCode === 1) {
-            setTimeout(() => {
-              let sign = title
+             let sign = title+"V3"
               const a = document.createElement('a');
               a.setAttribute('download', '');
               a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
                 '.pdf&&fPath=' + res.data.data);
               a.click();
-            }, 1000)
           } else {
             this.$message.error('PDF获取失败');
           }