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

src/components/SalesModule/groupInquiry.vue

@@ -786,9 +786,9 @@ export default {
 			let newArr = [];
 			newArr.push(file.file);
 			let path = "/Upload/Temporary/";
-			this.uploadFile(path, newArr, x => {
+			this.UploadSelfFile(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

@@ -2009,11 +2009,11 @@
         newArr.push(file.file)
         let path = '/Upload/Temporary/'
         this.$message.info('上传中...')
-        this.uploadFile(path, newArr, x => {
+        this.UploadSelfFile(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/SalesModule/groupTourOrderByTuan.vue

@@ -2430,10 +2430,10 @@ export default {
 				newArr.push(file.file)
 				let path = "/Upload/Temporary/"
         this.$message.info('上传中...')
-				this.uploadFile(path, newArr, x => {
+				this.UploadSelfFile(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/administrative/Announcement.vue

@@ -240,17 +240,17 @@
 				newArr.push(file.file)
 				let path = "/Upload/Temporary/"
                 this.$message.info('上传中...')
-				this.uploadFile(path, newArr, x => {
+				this.UploadSelfFile(path, newArr, x => {
 					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/forMyApproval.vue

@@ -327,9 +327,10 @@
 		      let newArr=[];
 		      newArr.push(file.file)
 		      let path="/Upload/Temporary/"
-		      this.uploadFile(path,newArr,x=>{
-		      	 this.appMsg.Image.push(x.res.requestUrls[0])
-		      	 this.fileList.push({url:x.res.requestUrls[0]})
+		      this.UploadSelfFile(path,newArr,x=>{
+							let url = this.domainManager().ViittoFileUrl + x.data.FilePath
+		      	 this.appMsg.Image.push(url)
+		      	 this.fileList.push({url:url})
 		      });
 		    },
 		    handleRemove(file){   //删除

src/components/administrative/leaveApproval.vue

@@ -145,10 +145,11 @@
 				let newArr = [];
 				newArr.push(file.file)
 				let path = "/Upload/Temporary/"
-				this.uploadFile(path, newArr, x => {
-					this.submitFileList.push(x.res.requestUrls[0].split("?")[0])
+				this.UploadSelfFile(path, newArr, x => {
+					let url = this.domainManager().ViittoFileUrl + x.data.FilePath
+					this.submitFileList.push(url)
 					this.fileList.push({
-						url: x.res.requestUrls[0].split("?")[0]
+						url: url
 					})
 				});
 			},

src/components/administrative/myApprovalList.vue

@@ -321,9 +321,10 @@
 		      let newArr=[];
 		      newArr.push(file.file)
 		      let path="/Upload/Temporary/"
-		      this.uploadFile(path,newArr,x=>{
-		      	 this.appMsg.Image.push(x.res.requestUrls[0])
-		      	 this.fileList.push({url:x.res.requestUrls[0]})
+		      this.UploadSelfFile(path,newArr,x=>{
+						let url = this.domainManager().ViittoFileUrl + x.data.FilePath
+		      	 this.appMsg.Image.push(url)
+		      	 this.fileList.push({url: url})
 		      	
 		      });
       

src/components/administrative/sendToMeApproval.vue

@@ -325,9 +325,10 @@
 		      let newArr=[];
 		      newArr.push(file.file)
 		      let path="/Upload/Temporary/"
-		      this.uploadFile(path,newArr,x=>{
-		      	 this.appMsg.Image.push(x.res.requestUrls[0])
-		      	 this.fileList.push({url:x.res.requestUrls[0]})
+		      this.UploadSelfFile(path,newArr,x=>{
+						let url = this.domainManager().ViittoFileUrl + x.data.FilePath
+		      	 this.appMsg.Image.push(url)
+		      	 this.fileList.push({url: url})
 		      	
 		      });
       

src/components/index.vue

@@ -2665,9 +2665,10 @@ export default {
       let newArr = [];
       newArr.push(file.file);
       let path = "/Upload/Temporary/";
-      this.uploadFile(path, newArr, x => {
-        this.addDynamicMsg.fileList.push(x.res.requestUrls[0].split("?")[0]);
-        this.imgList.push({ url: x.res.requestUrls[0].split("?")[0] });
+      this.UploadSelfFile(path, newArr, x => {
+        let url = this.domainManager().ViittoFileUrl + x.data.FilePath
+        this.addDynamicMsg.fileList.push(url);
+        this.imgList.push({ url: url });
       });
     },
     handleRemoveImg(file) {