Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -116,7 +116,7 @@
|
||||
<el-input
|
||||
placeholder="请选择入会成员"
|
||||
style="width: 50%"
|
||||
@click.native="choiceRole('','请选择入会成员',rh_pageData.comityOpRoleId,)"
|
||||
@click.native="choiceRole(rh_pageData.comityOpRoleId)"
|
||||
v-model="rh_pageData.comityOpRole"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -342,9 +342,11 @@ export default {
|
||||
},
|
||||
|
||||
/** 选择入会人员 */
|
||||
choiceRole(type,title,id) {
|
||||
choiceRole() {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
if (this.rh_pageData.comityOpRoleId.length > 0) {
|
||||
this.nodeList = this.rh_pageData.comityOpRoleId.split(',')
|
||||
}
|
||||
this.roleShowflag = true
|
||||
},
|
||||
drawerCheck(data) {
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
<el-input
|
||||
placeholder="请选择参会人员"
|
||||
style="width: 50%"
|
||||
@click.native="choiceRole('meetingInRoleId','选择参会人员',ch_pageData.meetingInRoleId,)"
|
||||
@click.native="choiceRole"
|
||||
v-model="ch_pageData.meetingInRole"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -303,9 +303,11 @@ export default {
|
||||
},
|
||||
|
||||
/** 选择入会人员 */
|
||||
choiceRole(type,title,id) {
|
||||
choiceRole() {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
if (this.ch_pageData.meetingInRoleId.length > 0) {
|
||||
this.nodeList = this.ch_pageData.meetingInRoleId.split(',')
|
||||
}
|
||||
this.roleShowflag = true
|
||||
},
|
||||
drawerCheck(data) {
|
||||
|
||||
@@ -40,16 +40,16 @@
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box" v-if="fileList.length > 0">
|
||||
<p v-for="item in fileList"
|
||||
:key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
|
||||
:key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(item.id)"
|
||||
@click.stop="downloadFile(item.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(item.id, item.name)"
|
||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
@@ -382,14 +382,13 @@ export default {
|
||||
}
|
||||
},
|
||||
downloadFileByWater(attId, fileSuffix) {
|
||||
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
|
||||
if (fileExtension !== "pdf" && fileExtension !== "PDF") {
|
||||
this.$message.error("水印下载仅支持PDF,pdf格式文件");
|
||||
if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -40,16 +40,16 @@
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box" v-if="fileList.length > 0">
|
||||
<p v-for="item in fileList"
|
||||
:key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
|
||||
:key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(item.id)"
|
||||
@click.stop="downloadFile(item.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(item.id, item.name)"
|
||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
@@ -452,14 +452,13 @@ export default {
|
||||
}
|
||||
},
|
||||
downloadFileByWater(attId, fileSuffix) {
|
||||
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
|
||||
if (fileExtension !== "pdf" && fileExtension !== "PDF") {
|
||||
this.$message.error("水印下载仅支持PDF,pdf格式文件");
|
||||
if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
|
||||
this.$message.error('水印下载仅支持PDF,pdf格式文件')
|
||||
} else {
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
|
||||
if (attId != null && attId !== '') {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
|
||||
} else {
|
||||
this.$message.error("请选择要下载的文件");
|
||||
this.$message.error('请选择要下载的文件')
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -880,6 +880,7 @@ export default {
|
||||
}else{
|
||||
this.qdform = item.form
|
||||
this.dataList =item.form.dataList
|
||||
this.commentText = item.commentText
|
||||
this.detailedId = item.form.detailedListId;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -889,6 +889,7 @@ export default {
|
||||
}else{
|
||||
this.qdform = item.form
|
||||
this.dataList =item.form.dataList
|
||||
this.commentText = item.commentText
|
||||
this.detailedId = item.form.detailedListId;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -883,6 +883,7 @@ export default {
|
||||
}else{
|
||||
this.qdform = item.form
|
||||
this.dataList =item.form.dataList
|
||||
this.commentText = item.commentText
|
||||
this.detailedId = item.form.detailedListId;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -596,7 +596,7 @@
|
||||
useLevel: '',
|
||||
isRelate: '',
|
||||
esStandRelations: '',
|
||||
area: '',
|
||||
area: [],
|
||||
tsJson: '',
|
||||
tsJsonName: '',
|
||||
rqbJson: '',
|
||||
@@ -838,6 +838,8 @@
|
||||
url = 'esRevisePlan/es-revise-plan/addPlan'
|
||||
tips = '添加'
|
||||
}
|
||||
let arr = JSON.parse(JSON.stringify(this.addForm))
|
||||
arr.area = arr.area.join(',')
|
||||
this.$http.post(url, this.addForm, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -939,6 +941,16 @@
|
||||
this.DrawerType = 'edit'
|
||||
this.addDrawer = true
|
||||
this.addForm = {
|
||||
esMatingRelations: command[0].esMatingRelations,
|
||||
technologic: command[0].technologic,
|
||||
useLevel: command[0].useLevel,
|
||||
isRelate: command[0].isRelate,
|
||||
esStandRelations: command[0].esStandRelations,
|
||||
area: command[0].area,
|
||||
tsJson: command[0].tsJson,
|
||||
tsJsonName: command[0].tsJsonName,
|
||||
rqbJson: command[0].rqbJson,
|
||||
rqbName: command[0].rqbName,
|
||||
unitName:command[0].unitName,
|
||||
id: command[0].id,
|
||||
unit: command[0].unit, // 单位
|
||||
@@ -954,6 +966,9 @@
|
||||
drafterName: command[0].drafterName, // 起草人
|
||||
drafter: command[0].drafter,
|
||||
}
|
||||
if (typeof (this.addForm.area) === 'string') {
|
||||
this.addForm.area = command[0].area.split(',')
|
||||
}
|
||||
break
|
||||
case '删除':
|
||||
this.$confirm('您是否确认删除选中数据?', '提示', {
|
||||
@@ -983,6 +998,9 @@
|
||||
this.DrawerType = 'see'
|
||||
this.addDrawer = true
|
||||
this.addForm = command[0]
|
||||
if (typeof (this.addForm.area) === 'string') {
|
||||
this.addForm.area = command[0].area.split(',')
|
||||
}
|
||||
break
|
||||
}
|
||||
},
|
||||
@@ -1008,7 +1026,6 @@
|
||||
this.QCDWList = res.data.QCDW // 起草单位
|
||||
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
|
||||
this.BZList = res.data.ENERGYTYPES
|
||||
console.log(this.BZList);
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user