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

src/components/Chat/chatEditor.vue

@@ -710,7 +710,7 @@ export default {
                 Height: "84",
                 content: {
                   fileType: type,
-                  fileUrl: x.res.requestUrls[0].split("?")[0],
+                  fileUrl: this.domainManager().ViittoFileUrl + x.data.FilePath,
                   fileName: name,
                   fileSize: size
                 },

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1020,8 +1020,8 @@ export default {
         let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); 
         this.saveMsg.push({
           Type:fileTypeNumber,
-          Content: x.name,
-          Url:x.res.requestUrls[0].split("?")[0],
+          Content: x.data.FilePath,
+          Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
         });
         this.$message.success('上传成功');
       });

src/components/FinancialModule/addCapitalAllocation.vue

@@ -659,17 +659,17 @@ export default {
           let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
           if (this.inUploadTrue) {
             this.inList[this.inUploadIndex].vorcherInos.push({
-              Content: x.name,
+              Content: x.data.FilePath,
               ID:0,
               Type:fileTypeNumber,
-              Url:x.res.requestUrls[0].split("?")[0],
+              Url:this.domainManager().ViittoFileUrl + x.data.FilePath,
             })
           } else {
             this.outList[this.inUploadIndex].vorcherInos.push({
-              Content: x.name,
+              Content: x.data.FilePath,
               ID:0,
               Type:fileTypeNumber,
-              Url:x.res.requestUrls[0].split("?")[0],
+              Url:this.domainManager().ViittoFileUrl + x.data.FilePath,
             })
           }
           this.$message.success('上传成功');

src/components/FinancialModule/addFinancialDocuments.vue

@@ -818,10 +818,10 @@ export default {
             this.UploadSelfFileT(path, newArr, x => { 
                 let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
                 this.saveMsg.push({
-                    Content: x.name,
+                    Content: x.data.FilePath,
                     ID:0,
                     Type:fileTypeNumber,
-                    Url:x.res.requestUrls[0].split("?")[0],
+                    Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.$message.success('上传成功');
             });

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -779,10 +779,10 @@ export default {
             this.UploadSelfFileT(path, newArr, x => {
                 let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
                 this.saveMsg.push({
-                    Content: x.name,
+                    Content: x.data.FilePath,
                     ID:0,
                     Type:fileTypeNumber,
-                    Url:x.res.requestUrls[0].split("?")[0],
+                    Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.$message.success('上传成功');
             });

src/components/Hotel/HotelInfo.vue

@@ -407,8 +407,8 @@ export default {
       var path = "/Upload/DMC/";
       this.UploadSelfFileT(path, newArr, x => {
         var obj = this.$DMCUtils.DMCImageObj();
-        var str = x.name;
-        var imgUrl = this.domainManager().AliUrl + str;
+        var str = x.data.FilePath;
+        var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
         obj.Path = str;
         obj.ShowPath = imgUrl;
         this.HotelImageArray.push(obj);

src/components/LeaderManagement/leaderPay.vue

@@ -631,9 +631,9 @@
         let path = "/Upload/Temporary/";
         this.UploadSelfFileT(path, newArr, x => {
           this.TemporaryItem.VoucherPicList.push({
-            id: x.name,
+            id: x.data.FilePath,
             FileName: file.file.name,
-            url: x.res.requestUrls[0].split("?")[0]
+            url: this.domainManager().ViittoFileUrl + x.data.FilePath
           })
         });
       },      

src/components/Restaurant/restaurantInfoManage.vue

@@ -1052,8 +1052,8 @@
         this.UploadSelfFileT(path, newArr, x => {
           //统一图片处理
           var obj = this.$DMCUtils.DMCImageObj();
-          var str = x.name;
-          var imgUrl = this.domainManager().AliUrl + str;
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
           obj.Path = str;
           obj.ShowPath = imgUrl;
           this.DiningImageArray.push(obj);

src/components/SalesModule/groupInquiry.vue

@@ -788,7 +788,7 @@ export default {
 			let path = "/Upload/Temporary/";
 			this.UploadSelfFileT(path, newArr, x => {
         this.apipost('dmc_get_visa_UploadVisaInformation', {
-          Path: x.name,
+          Path: x.data.FilePath,
           FileName: file.file.name,
           Status: 1,
           TCID: this.uploadTCID

src/components/SalesModule/groupTourOrder.vue

@@ -2036,7 +2036,7 @@
 
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0)
           let saveMsg = {}
-          saveMsg.Path = x.name
+          saveMsg.Path = x.data.FilePath
           saveMsg.FileName = file.file.name
           saveMsg.Status = 1
           saveMsg.OrderId = this.checkedObj.orderId

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2543,7 +2543,7 @@ export default {
 				this.UploadSelfFileT(path, newArr, x => {
 					let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
 					let saveMsg ={}
-					saveMsg.Path=x.name
+					saveMsg.Path= x.data.FilePath
 					saveMsg.FileName=file.file.name
 					saveMsg.Status=1
 					saveMsg.OrderId=this.checkedObj.orderId

src/components/SalesVisa/visaSchedule.vue

@@ -774,7 +774,7 @@ export default {
 			let path = "/Upload/Temporary/";
 			this.UploadSelfFileT(path, newArr, x => {
         this.apipost('dmc_get_visa_UploadVisaInformation', {
-          Path: x.name,
+          Path: x.data.FilePath,
           FileName: file.file.name,
           Status: 1,
           TCID: this.uploadTCID

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -194,7 +194,7 @@
         var that=this;
         this.UploadSelfFileT(path, newArr, x => {
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
-          var fileUrl = x.res.requestUrls[0].split("?")[0];
+          var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
           that.list.forEach((item, index) => {
             if (index == that.upIndex) {
               item.ShopDetailsList.forEach((subItem,subIndex) => {

src/components/Ticketing/flightManagement.vue

@@ -314,6 +314,18 @@
           <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="changeV2(addMsg)" maxlength="5"
             :placeholder="$t('system.ph_time')"></el-input>
         </el-form-item>
+         <el-form-item class="flightMg_info">
+          <el-checkbox v-model="checked">{{$t('system.table_tips_fmgCk')}}</el-checkbox>
+        </el-form-item>
+        <div v-if="checked">
+           <p class="flightMg_info_tips">{{$t('system.table_tips_fmgInfo')}}</p>
+          <el-form-item :label="$t('system.table_begTime')" class='time'>
+             <el-date-picker v-model='addMsg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+          </el-form-item>
+          <el-form-item :label="$t('system.table_overTime')" class='time'>
+               <el-date-picker v-model='addMsg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
@@ -359,6 +371,10 @@
           Arrival_stopover_time: "",
           Departure_stopover_time: "",
           SeasonType: 0,
+          //是否同步
+          synchronization:0,
+          StartDate:"",
+          EndDate:""
         },
         SeasonTypeList: [],
         DataList: [],
@@ -516,7 +532,10 @@
           Stopover_airport: "",
           Arrival_stopover_time: "",
           Departure_stopover_time: "",
-          SeasonType: 0
+          SeasonType: 0,
+          synchronization:0,
+          StartDate:"",
+          EndDate:""
         };
         this.addMsg = newMsg;
       },
@@ -574,6 +593,14 @@
       },
       //添加
       addGroupGuide() {
+        if(this.checked)
+        {
+          this.addMsg.synchronization=1;
+        }
+        else
+        {
+          this.addMsg.synchronization=0;
+        }
         this.apipost(
           "flight_post_Set",
           this.addMsg,

src/components/TravelManager/TravelList/GroupAdvertising.vue

@@ -155,8 +155,8 @@ export default {
             var imgArr = [];
             this.UploadSelfFileT(path, newArr, x => {
                 var obj = this.$DMCUtils.DMCImageObj();
-                var str = x.name;
-                var imgUrl = this.domainManager().AliUrl + str;
+                var str = x.data.FilePath;
+                var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
                 obj.Path = str;
                 obj.ShowPath = imgUrl;
                 imgArr.push(obj.ShowPath);

src/components/TravelManager/TravelQuotationCenter/DirectQuotation.vue

@@ -820,7 +820,7 @@
               : (file.file.size / 1024).toFixed(0);
           this.saveMsg = [];
           this.saveMsg.push({
-            Path: x.name,
+            Path: x.data.FilePath,
             FileName: file.file.name,
             MD5Sign: file.file.uid,
             FileSize: fileSize

src/components/TravelManager/travelLineTrip/hotelTrip_disDirect.vue

@@ -218,7 +218,7 @@
           // var str = x.res.requestUrls[0];
           var fileObj = this.$commonUtils.FileObject();
           fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
-          fileObj.fileName = x.name;
+          fileObj.fileName = x.data.FilePath;
           item.data.ImaArray.push(fileObj);
         });
       },

src/components/TravelManager/travelLineTrip/scienTrip_Direct.vue

@@ -307,7 +307,7 @@
           // var str = x.res.requestUrls[0];
           var fileObj = this.$commonUtils.FileObject();
           fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
-          fileObj.fileName = x.name;
+          fileObj.fileName = x.data.FilePath;
           item.data.ImaArray.push(fileObj);
         });
       },

src/components/TravelManager/travelLineTrip/scienTrip_disDirect.vue

@@ -200,7 +200,7 @@
           var str = x.res.requestUrls[0];
           var fileObj = this.$commonUtils.FileObject();
           fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
-          fileObj.fileName = x.name;
+          fileObj.fileName = x.data.FilePath
           item.data.ImaArray.push(fileObj);
         });
       },

src/components/administrative/Announcement.vue

@@ -244,13 +244,13 @@
 					let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
 					this.saveMsg = []
 					this.saveMsg.push({
-						Path: x.name,
+						Path: x.data.FilePath,
 						FileName: file.file.name,
 						MD5Sign: file.file.uid,
 						FileSize: fileSize,
 						FolderId: this.msg.ParentId
 					})
-					this.uploadList.push({url:x.name,name:file.file.name})
+					this.uploadList.push({url:x.data.FilePath,name:file.file.name})
 				});
 			},	
 			downloadSingle(obj){

src/components/administrative/myDocuments.vue

@@ -527,7 +527,7 @@
 					let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
 					this.saveMsg = []
 					this.saveMsg.push({
-						Path: x.name,
+						Path: x.data.FilePath,
 						FileName: file.file.name,
 						MD5Sign: file.file.uid,
 						FileSize: fileSize,

src/components/commonPage/DMCchooseImg.vue

@@ -280,7 +280,7 @@ export default {
       this.UploadSelfFileT(path, newArr, x => {
         var obj = this.$DMCUtils.DMCImageObj();
         var str = x.name;
-        var imgUrl = this.domainManager().AliUrl + str;
+        var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
         obj.Path = str;
         obj.ShowPath = imgUrl;
         this.uploadImageFile(obj.Path);

src/components/newTravelmanager/TravelTripPreview/fivedayList.vue

@@ -260,9 +260,9 @@
         this.$message.info("正在上传图片...");
         this.UploadSelfFileT(path, newArr, x => {
           var obj = {
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: "",
-            fileName: x.name
+            fileName: x.data.FilePath
           };
           var array = [];
           array.push(obj);

src/components/newTravelmanager/TravelTripPreview/fourdayList.vue

@@ -235,9 +235,9 @@
         this.$message.info("正在上传图片...");
         this.UploadSelfFileT(path, newArr, x => {
           var obj = {
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: "",
-            fileName: x.name
+            fileName: x.data.FilePath
           };
           var array = [];
           array.push(obj);

src/components/newTravelmanager/TravelTripPreview/noScenic.vue

@@ -93,7 +93,7 @@ export default {
       this.$message.info("正在上传图片...");
       this.UploadSelfFileT(path, newArr, x => {
         this.trafficObj.trafficIntroduce.IntroduceImage =
-          this.domainManager().AliUrl + x.name;
+          this.domainManager().ViittoFileUrl + x.data.FilePath;
       });
     },
     //关闭添加弹窗

src/components/newTravelmanager/TravelTripPreview/onedayList.vue

@@ -108,9 +108,9 @@
         this.$message.info("正在上传图片...");
         this.UploadSelfFileT(path, newArr, x => {
           var obj = {
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: "",
-            fileName: x.name
+            fileName: x.data.FilePath
           };
           var array = [];
           array.push(obj);

src/components/newTravelmanager/TravelTripPreview/threedayList.vue

@@ -193,9 +193,9 @@
         this.$message.info("正在上传图片...");
         this.UploadSelfFileT(path, newArr, x => {
           var obj = {
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: "",
-            fileName: x.name
+            fileName: x.data.FilePath
           };
           var array = [];
           array.push(obj);

src/components/newTravelmanager/TravelTripPreview/twodayList.vue

@@ -137,9 +137,9 @@
         this.$message.info("正在上传图片...");
         this.UploadSelfFileT(path, newArr, x => {
           var obj = {
-            Url: this.domainManager().AliUrl + x.name,
+            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             Name: "",
-            fileName: x.name
+            fileName: x.data.FilePath
           };
           var array = [];
           array.push(obj);

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -961,8 +961,8 @@
         this.UploadSelfFileT(path, newArr, x => {
           //统一图片处理
           var obj = this.$DMCUtils.DMCImageObj();
-          var str = x.name;
-          var imgUrl = this.domainManager().AliUrl + str;
+          var str = x.data.FilePath;
+          var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
           obj.Path = str;
           obj.ShowPath = imgUrl;
           this.TicketCouponsImageArray.push(obj);