|
|
@@ -237,6 +237,7 @@
|
|
|
:multiple="true"
|
|
|
:on-change="handleChange"
|
|
|
:on-remove="handleRemove"
|
|
|
+ :on-preview="handlePreview"
|
|
|
name="files"
|
|
|
>
|
|
|
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
|
|
|
@@ -610,35 +611,40 @@ export default {
|
|
|
DiId: that.DiId,
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
-
|
|
|
if (res.data.code == 200) {
|
|
|
- var dataList = res.data.data
|
|
|
- that.OpOfficialActivitiesDto.id = dataList.id
|
|
|
- that.OpOfficialActivitiesDto.diId = dataList.diId
|
|
|
- that.OpOfficialActivitiesDto.type = dataList.type
|
|
|
- that.OpOfficialActivitiesDto.client = dataList.client
|
|
|
- that.OpOfficialActivitiesDto.date = dataList.date
|
|
|
- that.OpOfficialActivitiesDto.time = dataList.time
|
|
|
- that.OpOfficialActivitiesDto.address = dataList.address
|
|
|
- that.OpOfficialActivitiesDto.contact = dataList.contact
|
|
|
- that.OpOfficialActivitiesDto.job = dataList.job
|
|
|
- that.OpOfficialActivitiesDto.tel = dataList.tel
|
|
|
- that.OpOfficialActivitiesDto.officialForm = dataList.officialForm
|
|
|
- that.OpOfficialActivitiesDto.setting = dataList.setting
|
|
|
- that.OpOfficialActivitiesDto.dresscode = dataList.dresscode
|
|
|
- that.OpOfficialActivitiesDto.attendees = dataList.attendees
|
|
|
- that.OpOfficialActivitiesDto.isNeedTrans = dataList.isNeedTrans
|
|
|
- that.OpOfficialActivitiesDto.translators = dataList.translators
|
|
|
- that.OpOfficialActivitiesDto.language = dataList.language
|
|
|
- that.OpOfficialActivitiesDto.trip = dataList.trip
|
|
|
- that.OpOfficialActivitiesDto.createUserId = dataList.createUserId
|
|
|
- that.OpOfficialActivitiesDto.remark = dataList.remark
|
|
|
- that.OpOfficialActivitiesDto.isSubmitApproval = dataList.isSubmitApproval
|
|
|
- that.OpOfficialActivitiesDto.isPay = dataList.isPay
|
|
|
- that.OpOfficialActivitiesDto.country = dataList.country
|
|
|
- that.OpOfficialActivitiesDto.area = dataList.area
|
|
|
- that.OpOfficialActivitiesDto.field = dataList.field
|
|
|
- that.OpOfficialActivitiesDto.reqSample = dataList.reqSample
|
|
|
+ var dataList = res.data.data;
|
|
|
+ that.OpOfficialActivitiesDto.id = dataList.id;
|
|
|
+ that.OpOfficialActivitiesDto.diId = dataList.diId;
|
|
|
+ that.OpOfficialActivitiesDto.type = dataList.type;
|
|
|
+ that.OpOfficialActivitiesDto.client = dataList.client;
|
|
|
+ that.OpOfficialActivitiesDto.date = dataList.date;
|
|
|
+ that.OpOfficialActivitiesDto.time = dataList.time;;
|
|
|
+ that.OpOfficialActivitiesDto.address = dataList.address;
|
|
|
+ that.OpOfficialActivitiesDto.contact = dataList.contact;
|
|
|
+ that.OpOfficialActivitiesDto.job = dataList.job;
|
|
|
+ that.OpOfficialActivitiesDto.tel = dataList.tel;
|
|
|
+ that.OpOfficialActivitiesDto.officialForm = dataList.officialForm;
|
|
|
+ that.OpOfficialActivitiesDto.setting = dataList.setting;
|
|
|
+ that.OpOfficialActivitiesDto.dresscode = dataList.dresscode;
|
|
|
+ that.OpOfficialActivitiesDto.attendees = dataList.attendees;
|
|
|
+ that.OpOfficialActivitiesDto.isNeedTrans = dataList.isNeedTrans;
|
|
|
+ that.OpOfficialActivitiesDto.translators = dataList.translators;
|
|
|
+ that.OpOfficialActivitiesDto.language = dataList.language;
|
|
|
+ that.OpOfficialActivitiesDto.trip = dataList.trip;
|
|
|
+ that.OpOfficialActivitiesDto.createUserId = dataList.createUserId;
|
|
|
+ that.OpOfficialActivitiesDto.remark = dataList.remark;
|
|
|
+ that.OpOfficialActivitiesDto.isSubmitApproval = dataList.isSubmitApproval;
|
|
|
+ that.OpOfficialActivitiesDto.isPay = dataList.isPay;
|
|
|
+ that.OpOfficialActivitiesDto.country = dataList.country;
|
|
|
+ that.OpOfficialActivitiesDto.area = dataList.area;
|
|
|
+ that.OpOfficialActivitiesDto.field = dataList.field;
|
|
|
+ that.OpOfficialActivitiesDto.reqSample = dataList.reqSample;
|
|
|
+
|
|
|
+ // that.fileList
|
|
|
+ for(let i=0;i<dataList.screenshotOfMailUrls.length;i++){
|
|
|
+ that.fileList.push({'name':dataList.screenshotOfMailUrls[i].split('/')[7],'url':dataList.screenshotOfMailUrls[i]})
|
|
|
+ }
|
|
|
+ console.log(that.fileList);
|
|
|
}
|
|
|
|
|
|
})
|
|
|
@@ -871,15 +877,26 @@ export default {
|
|
|
|
|
|
// 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用,function(file, fileList)
|
|
|
handleChange(file, fileList) {
|
|
|
+ console.log(file);
|
|
|
+ console.log(fileList);
|
|
|
this.fileList = fileList
|
|
|
},
|
|
|
// 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。function(file, fileList)
|
|
|
handleRemove(file, fileList) {
|
|
|
this.fileList = fileList
|
|
|
},
|
|
|
+ //点击文件列表中已上传的文件
|
|
|
+ handlePreview(file){
|
|
|
+ console.log(file);
|
|
|
+ window.open(file.url);
|
|
|
+ },
|
|
|
//上传服务器
|
|
|
submitUpload() {
|
|
|
- console.log(this.id);
|
|
|
+ // console.log(this.id);
|
|
|
+ if(this.id==undefined){
|
|
|
+ this.id==0
|
|
|
+ }
|
|
|
+ this.Emailscreenshotdata.id=this.id;
|
|
|
this.Emailscreenshotdata.diId=this.DiId;
|
|
|
this.Emailscreenshotdata.currUserId=this.userId;
|
|
|
//判断是否有文件再上传
|
|
|
@@ -896,23 +913,23 @@ export default {
|
|
|
formData.append('diId', this.Emailscreenshotdata.diId);
|
|
|
formData.append('currUserId', this.Emailscreenshotdata.currUserId);
|
|
|
|
|
|
- // var that = this;
|
|
|
- // var url = "/api/Resource/OfficialActivitiesUploadFiles"
|
|
|
- // this.$axios({
|
|
|
- // method: 'post',
|
|
|
- // url: url,
|
|
|
- // headers: {
|
|
|
- // Authorization: 'Bearer ' + that.token
|
|
|
- // },
|
|
|
- // data:formData
|
|
|
- // }).then(function (res) {
|
|
|
- // if (res.data.code == 200) {
|
|
|
- // that.$message.success(res.data.msg);
|
|
|
- // that.fileList = []
|
|
|
- // } else {
|
|
|
- // that.$message.error(res.data.msg);
|
|
|
- // }
|
|
|
- // })
|
|
|
+ var that = this;
|
|
|
+ var url = "/api/Resource/OfficialActivitiesUploadFiles"
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data:formData
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$message.success(res.data.msg);
|
|
|
+ that.fileList = []
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
},
|
|
|
|
