Commit 09c344a3 authored by zhengke's avatar zhengke
parents c96c77e3 f0346598
...@@ -710,7 +710,7 @@ export default { ...@@ -710,7 +710,7 @@ export default {
Height: "84", Height: "84",
content: { content: {
fileType: type, fileType: type,
fileUrl: x.res.requestUrls[0].split("?")[0], fileUrl: this.domainManager().ViittoFileUrl + x.data.FilePath,
fileName: name, fileName: name,
fileSize: size fileSize: size
}, },
......
...@@ -1020,8 +1020,8 @@ export default { ...@@ -1020,8 +1020,8 @@ export default {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Type:fileTypeNumber, Type:fileTypeNumber,
Content: x.name, Content: x.data.FilePath,
Url:x.res.requestUrls[0].split("?")[0], Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
}); });
this.$message.success('上传成功'); this.$message.success('上传成功');
}); });
......
...@@ -659,17 +659,17 @@ export default { ...@@ -659,17 +659,17 @@ export default {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
if (this.inUploadTrue) { if (this.inUploadTrue) {
this.inList[this.inUploadIndex].vorcherInos.push({ this.inList[this.inUploadIndex].vorcherInos.push({
Content: x.name, Content: x.data.FilePath,
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0], Url:this.domainManager().ViittoFileUrl + x.data.FilePath,
}) })
} else { } else {
this.outList[this.inUploadIndex].vorcherInos.push({ this.outList[this.inUploadIndex].vorcherInos.push({
Content: x.name, Content: x.data.FilePath,
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0], Url:this.domainManager().ViittoFileUrl + x.data.FilePath,
}) })
} }
this.$message.success('上传成功'); this.$message.success('上传成功');
......
...@@ -818,10 +818,10 @@ export default { ...@@ -818,10 +818,10 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Content: x.name, Content: x.data.FilePath,
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0], Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
}) })
this.$message.success('上传成功'); this.$message.success('上传成功');
}); });
......
...@@ -779,10 +779,10 @@ export default { ...@@ -779,10 +779,10 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Content: x.name, Content: x.data.FilePath,
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0], Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
}) })
this.$message.success('上传成功'); this.$message.success('上传成功');
}); });
......
...@@ -407,8 +407,8 @@ export default { ...@@ -407,8 +407,8 @@ export default {
var path = "/Upload/DMC/"; var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
var str = x.name; var str = x.data.FilePath;
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
this.HotelImageArray.push(obj); this.HotelImageArray.push(obj);
......
...@@ -631,9 +631,9 @@ ...@@ -631,9 +631,9 @@
let path = "/Upload/Temporary/"; let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
this.TemporaryItem.VoucherPicList.push({ this.TemporaryItem.VoucherPicList.push({
id: x.name, id: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
url: x.res.requestUrls[0].split("?")[0] url: this.domainManager().ViittoFileUrl + x.data.FilePath
}) })
}); });
}, },
......
...@@ -1052,8 +1052,8 @@ ...@@ -1052,8 +1052,8 @@
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
//统一图片处理 //统一图片处理
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
var str = x.name; var str = x.data.FilePath;
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
this.DiningImageArray.push(obj); this.DiningImageArray.push(obj);
......
...@@ -788,7 +788,7 @@ export default { ...@@ -788,7 +788,7 @@ export default {
let path = "/Upload/Temporary/"; let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
this.apipost('dmc_get_visa_UploadVisaInformation', { this.apipost('dmc_get_visa_UploadVisaInformation', {
Path: x.name, Path: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
Status: 1, Status: 1,
TCID: this.uploadTCID TCID: this.uploadTCID
......
...@@ -2036,7 +2036,7 @@ ...@@ -2036,7 +2036,7 @@
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0) let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0)
let saveMsg = {} let saveMsg = {}
saveMsg.Path = x.name saveMsg.Path = x.data.FilePath
saveMsg.FileName = file.file.name saveMsg.FileName = file.file.name
saveMsg.Status = 1 saveMsg.Status = 1
saveMsg.OrderId = this.checkedObj.orderId saveMsg.OrderId = this.checkedObj.orderId
......
...@@ -2543,7 +2543,7 @@ export default { ...@@ -2543,7 +2543,7 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
let saveMsg ={} let saveMsg ={}
saveMsg.Path=x.name saveMsg.Path= x.data.FilePath
saveMsg.FileName=file.file.name saveMsg.FileName=file.file.name
saveMsg.Status=1 saveMsg.Status=1
saveMsg.OrderId=this.checkedObj.orderId saveMsg.OrderId=this.checkedObj.orderId
......
...@@ -774,7 +774,7 @@ export default { ...@@ -774,7 +774,7 @@ export default {
let path = "/Upload/Temporary/"; let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
this.apipost('dmc_get_visa_UploadVisaInformation', { this.apipost('dmc_get_visa_UploadVisaInformation', {
Path: x.name, Path: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
Status: 1, Status: 1,
TCID: this.uploadTCID TCID: this.uploadTCID
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
var that=this; var that=this;
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0); 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) => { that.list.forEach((item, index) => {
if (index == that.upIndex) { if (index == that.upIndex) {
item.ShopDetailsList.forEach((subItem,subIndex) => { item.ShopDetailsList.forEach((subItem,subIndex) => {
......
...@@ -314,6 +314,18 @@ ...@@ -314,6 +314,18 @@
<el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="changeV2(addMsg)" maxlength="5" <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="changeV2(addMsg)" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> :placeholder="$t('system.ph_time')"></el-input>
</el-form-item> </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> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp; <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
...@@ -359,6 +371,10 @@ ...@@ -359,6 +371,10 @@
Arrival_stopover_time: "", Arrival_stopover_time: "",
Departure_stopover_time: "", Departure_stopover_time: "",
SeasonType: 0, SeasonType: 0,
//是否同步
synchronization:0,
StartDate:"",
EndDate:""
}, },
SeasonTypeList: [], SeasonTypeList: [],
DataList: [], DataList: [],
...@@ -516,7 +532,10 @@ ...@@ -516,7 +532,10 @@
Stopover_airport: "", Stopover_airport: "",
Arrival_stopover_time: "", Arrival_stopover_time: "",
Departure_stopover_time: "", Departure_stopover_time: "",
SeasonType: 0 SeasonType: 0,
synchronization:0,
StartDate:"",
EndDate:""
}; };
this.addMsg = newMsg; this.addMsg = newMsg;
}, },
...@@ -574,6 +593,14 @@ ...@@ -574,6 +593,14 @@
}, },
//添加 //添加
addGroupGuide() { addGroupGuide() {
if(this.checked)
{
this.addMsg.synchronization=1;
}
else
{
this.addMsg.synchronization=0;
}
this.apipost( this.apipost(
"flight_post_Set", "flight_post_Set",
this.addMsg, this.addMsg,
......
...@@ -155,8 +155,8 @@ export default { ...@@ -155,8 +155,8 @@ export default {
var imgArr = []; var imgArr = [];
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
var str = x.name; var str = x.data.FilePath;
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
imgArr.push(obj.ShowPath); imgArr.push(obj.ShowPath);
......
...@@ -820,7 +820,7 @@ ...@@ -820,7 +820,7 @@
: (file.file.size / 1024).toFixed(0); : (file.file.size / 1024).toFixed(0);
this.saveMsg = []; this.saveMsg = [];
this.saveMsg.push({ this.saveMsg.push({
Path: x.name, Path: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
MD5Sign: file.file.uid, MD5Sign: file.file.uid,
FileSize: fileSize FileSize: fileSize
......
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
// var str = x.res.requestUrls[0]; // var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str); fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name; fileObj.fileName = x.data.FilePath;
item.data.ImaArray.push(fileObj); item.data.ImaArray.push(fileObj);
}); });
}, },
......
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
// var str = x.res.requestUrls[0]; // var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str); fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name; fileObj.fileName = x.data.FilePath;
item.data.ImaArray.push(fileObj); item.data.ImaArray.push(fileObj);
}); });
}, },
......
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
var str = x.res.requestUrls[0]; var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str); fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name; fileObj.fileName = x.data.FilePath
item.data.ImaArray.push(fileObj); item.data.ImaArray.push(fileObj);
}); });
}, },
......
...@@ -244,13 +244,13 @@ ...@@ -244,13 +244,13 @@
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg = [] this.saveMsg = []
this.saveMsg.push({ this.saveMsg.push({
Path: x.name, Path: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
MD5Sign: file.file.uid, MD5Sign: file.file.uid,
FileSize: fileSize, FileSize: fileSize,
FolderId: this.msg.ParentId 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){ downloadSingle(obj){
......
...@@ -527,7 +527,7 @@ ...@@ -527,7 +527,7 @@
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg = [] this.saveMsg = []
this.saveMsg.push({ this.saveMsg.push({
Path: x.name, Path: x.data.FilePath,
FileName: file.file.name, FileName: file.file.name,
MD5Sign: file.file.uid, MD5Sign: file.file.uid,
FileSize: fileSize, FileSize: fileSize,
......
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
var str = x.name; var str = x.name;
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
this.uploadImageFile(obj.Path); this.uploadImageFile(obj.Path);
......
...@@ -260,9 +260,9 @@ ...@@ -260,9 +260,9 @@
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = { var obj = {
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: "", Name: "",
fileName: x.name fileName: x.data.FilePath
}; };
var array = []; var array = [];
array.push(obj); array.push(obj);
......
...@@ -235,9 +235,9 @@ ...@@ -235,9 +235,9 @@
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = { var obj = {
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: "", Name: "",
fileName: x.name fileName: x.data.FilePath
}; };
var array = []; var array = [];
array.push(obj); array.push(obj);
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
this.trafficObj.trafficIntroduce.IntroduceImage = this.trafficObj.trafficIntroduce.IntroduceImage =
this.domainManager().AliUrl + x.name; this.domainManager().ViittoFileUrl + x.data.FilePath;
}); });
}, },
//关闭添加弹窗 //关闭添加弹窗
......
...@@ -108,9 +108,9 @@ ...@@ -108,9 +108,9 @@
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = { var obj = {
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: "", Name: "",
fileName: x.name fileName: x.data.FilePath
}; };
var array = []; var array = [];
array.push(obj); array.push(obj);
......
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = { var obj = {
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: "", Name: "",
fileName: x.name fileName: x.data.FilePath
}; };
var array = []; var array = [];
array.push(obj); array.push(obj);
......
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
this.$message.info("正在上传图片..."); this.$message.info("正在上传图片...");
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var obj = { var obj = {
Url: this.domainManager().AliUrl + x.name, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name: "", Name: "",
fileName: x.name fileName: x.data.FilePath
}; };
var array = []; var array = [];
array.push(obj); array.push(obj);
......
...@@ -961,8 +961,8 @@ ...@@ -961,8 +961,8 @@
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
//统一图片处理 //统一图片处理
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
var str = x.name; var str = x.data.FilePath;
var imgUrl = this.domainManager().AliUrl + str; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
this.TicketCouponsImageArray.push(obj); this.TicketCouponsImageArray.push(obj);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment