Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -275,6 +275,7 @@
|
||||
]
|
||||
},
|
||||
json: {},
|
||||
jsonData: {},
|
||||
fileUrl: 'api/att/attFile/upload',
|
||||
fileMadel: false,
|
||||
}
|
||||
@@ -401,11 +402,12 @@
|
||||
this.$refs['qbkwForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
let json = this.jsonData
|
||||
json.commentText = this.commentText5
|
||||
json.hzfileId = this.form.hzfileId
|
||||
json.hzfileName = this.form.hzfileName
|
||||
json.docUser = this.newDocUser
|
||||
json.responUserList = this.tableData
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
@@ -427,6 +429,8 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
let jsonData = JSON.parse(res.mesg)
|
||||
this.jsonData = jsonData.form ? jsonData.form : jsonData
|
||||
this.commentText5 = data.commentText5 || ''
|
||||
this.form.title = data.title || data.form.title
|
||||
this.form.processName = data.processName || data.form.processName
|
||||
|
||||
@@ -438,6 +438,7 @@
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
:autosize="{minRows:10,maxRows:10}"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
|
||||
@@ -446,6 +446,7 @@
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
:autosize="{minRows:10,maxRows:10}"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
|
||||
@@ -315,6 +315,7 @@
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
:autosize="{minRows:10,maxRows:10}"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
@@ -404,6 +405,7 @@
|
||||
v-model="editForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
:autosize="{minRows:10,maxRows:10}"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
|
||||
@@ -1220,7 +1220,7 @@ export default {
|
||||
this.tableLoading = true;
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
|
||||
page: this.page,
|
||||
size: this.pageSize,
|
||||
pageSize: this.pageSize,
|
||||
...this.standardSearch
|
||||
}, {
|
||||
_this: this
|
||||
|
||||
@@ -49,22 +49,32 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box">
|
||||
<el-upload
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
<el-input
|
||||
disabled
|
||||
style="display: none;"
|
||||
v-model="fileInfo"
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="fileInfoList.length > 0">
|
||||
<div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="clickButtonToUpload(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="fileUpload"
|
||||
size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="signFlag" @change="selectSign">
|
||||
@@ -699,17 +709,20 @@
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
|
||||
<el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
|
||||
<el-upload
|
||||
v-if="fileMadel"
|
||||
multiple
|
||||
class="upload-demo"
|
||||
drag
|
||||
:action="fileUrl"
|
||||
:action="uploadFileListPath"
|
||||
ref="importfile"
|
||||
name="file"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="beginImportFile"
|
||||
:on-success="importFileSuccess"
|
||||
:show-file-list="false"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:file-list="fileInfoList"
|
||||
>
|
||||
<div style="padding: 20px 0">
|
||||
<i class="el-icon-upload" style="color: #3399ff"></i>
|
||||
@@ -793,6 +806,7 @@ export default {
|
||||
sarAccessListDatas: [], //国家地区清单表格
|
||||
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
|
||||
fileInfoList: [], // 上传的附件
|
||||
fileInfo: '', // 展示的附件
|
||||
fileIds: [], // 上传的附件
|
||||
fileList: [],
|
||||
fileListName: [], //上传的附件名称
|
||||
@@ -1191,6 +1205,16 @@ export default {
|
||||
this.fileInfoList.splice(index, 1);
|
||||
}
|
||||
});
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
fileUpload() {
|
||||
this.fileMadel = true;
|
||||
@@ -1204,6 +1228,16 @@ export default {
|
||||
this.$message.error(res.message);
|
||||
fileList.pop();
|
||||
}
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
// 相关附件 上传之前钩子
|
||||
beforeUpload(file) {
|
||||
@@ -1243,6 +1277,18 @@ export default {
|
||||
});
|
||||
window.open(routeUrl.href, "_blank");
|
||||
},
|
||||
clickButtonToUpload2(file) {
|
||||
const attId = file.attId
|
||||
this.$preview(attId)
|
||||
},
|
||||
clickButtonToUpload (file) {
|
||||
const attId = file.attId
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
},
|
||||
// 导入标准数据成功后执行
|
||||
importFileSuccess(response, file) {
|
||||
if (response.ok) {
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<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"> {{ item.name }}
|
||||
:key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(item.id)"
|
||||
@@ -408,6 +408,11 @@ export default {
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
//点击预览
|
||||
clickButtonToUpload2(file) {
|
||||
const attId = file
|
||||
this.$preview(attId)
|
||||
},
|
||||
/**
|
||||
* @Description: 点击下载
|
||||
*/
|
||||
|
||||
@@ -49,22 +49,32 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div>
|
||||
<el-upload
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
<el-input
|
||||
disabled
|
||||
style="display: none;"
|
||||
v-model="fileInfo"
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="fileInfoList.length > 0">
|
||||
<div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="clickButtonToUpload(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="fileUpload"
|
||||
size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
|
||||
<el-radio-group v-model="signFlag" @change="selectSign">
|
||||
@@ -669,17 +679,20 @@
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
|
||||
<el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
|
||||
<el-upload
|
||||
v-if="fileMadel"
|
||||
multiple
|
||||
class="upload-demo"
|
||||
drag
|
||||
:action="fileUrl"
|
||||
:action="uploadFileListPath"
|
||||
ref="importfile"
|
||||
name="file"
|
||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
|
||||
:before-upload="beginImportFile"
|
||||
:on-success="importFileSuccess"
|
||||
:show-file-list="false"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:file-list="fileInfoList"
|
||||
>
|
||||
<div style="padding: 20px 0">
|
||||
<i class="el-icon-upload" style="color: #3399ff"></i>
|
||||
@@ -762,6 +775,7 @@ export default {
|
||||
sarAccessListDatas: [], //国家地区清单表格
|
||||
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
|
||||
fileInfoList: [], // 上传的附件
|
||||
fileInfo: '', // 展示的附件
|
||||
fileIds: [], // 上传的附件
|
||||
fileListName: [], //上传的附件名称
|
||||
standardData: [], //添加标准数据
|
||||
@@ -1122,6 +1136,16 @@ export default {
|
||||
this.fileInfoList.splice(index,1)
|
||||
}
|
||||
})
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
fileUpload() {
|
||||
this.fileMadel = true;
|
||||
@@ -1135,6 +1159,16 @@ export default {
|
||||
this.$message.error(res.message);
|
||||
fileList.pop();
|
||||
}
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
// 相关附件 上传之前钩子
|
||||
beforeUpload(file) {
|
||||
@@ -1174,6 +1208,18 @@ export default {
|
||||
});
|
||||
window.open(routeUrl.href, "_blank");
|
||||
},
|
||||
clickButtonToUpload2(file) {
|
||||
const attId = file.attId
|
||||
this.$preview(attId)
|
||||
},
|
||||
clickButtonToUpload (file) {
|
||||
const attId = file.attId
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
},
|
||||
// 导入标准数据成功后执行
|
||||
importFileSuccess(response, file) {
|
||||
if (response.ok) {
|
||||
|
||||
@@ -52,21 +52,32 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<el-upload
|
||||
:action="uploadFileListPath"
|
||||
show-file-list
|
||||
:file-list="fileInfoList"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-upload>
|
||||
<el-input
|
||||
disabled
|
||||
style="display: none;"
|
||||
v-model="fileInfo"
|
||||
clearable
|
||||
></el-input>
|
||||
<div v-if="fileInfoList.length > 0">
|
||||
<div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
|
||||
<div class="fileClass" >
|
||||
<span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="clickButtonToUpload(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="fileUpload"
|
||||
size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -381,6 +392,27 @@
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
|
||||
<el-upload
|
||||
v-if="fileMadel"
|
||||
multiple
|
||||
class="upload-demo"
|
||||
drag
|
||||
:action="uploadFileListPath"
|
||||
ref="importfile"
|
||||
name="file"
|
||||
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:file-list="fileInfoList"
|
||||
>
|
||||
<div style="padding: 20px 0">
|
||||
<i class="el-icon-upload" style="color: #3399ff"></i>
|
||||
<p>点击或拖拽上传文件</p>
|
||||
</div>
|
||||
</el-upload>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -404,6 +436,7 @@ export default {
|
||||
// 当前流程类型(1待办/2已办)
|
||||
processType: 1,
|
||||
searching: false,
|
||||
fileMadel: false,
|
||||
commentText:'',
|
||||
nodeList:[],
|
||||
isTransfer: false,
|
||||
@@ -436,6 +469,7 @@ export default {
|
||||
uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
|
||||
fileList:[],
|
||||
fileInfoList: [], // 上传的附件
|
||||
fileInfo: '', //展示的附件
|
||||
dataList: [],//清单里的标准数据
|
||||
standardData: [], //添加标准数据
|
||||
standModel: false, // 选择标准抽屉状态
|
||||
@@ -709,6 +743,19 @@ export default {
|
||||
this.fileInfoList.splice(index,1)
|
||||
}
|
||||
})
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
fileUpload() {
|
||||
this.fileMadel = true;
|
||||
},
|
||||
// 上传文件成功回调
|
||||
uploadBackSuccess (res, file, fileList) {
|
||||
@@ -720,6 +767,16 @@ export default {
|
||||
this.$message.error(res.message)
|
||||
fileList.pop()
|
||||
}
|
||||
let list = ''
|
||||
this.fileInfoList.forEach(item => {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += item.name
|
||||
} else {
|
||||
list+= item.name
|
||||
}
|
||||
})
|
||||
this.fileInfo = list
|
||||
},
|
||||
//上传之前的钩子
|
||||
beforeUpload (file) {
|
||||
@@ -748,10 +805,16 @@ export default {
|
||||
}
|
||||
return true;
|
||||
},
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
|
||||
clickButtonToUpload2(file) {
|
||||
const attId = file.id
|
||||
this.$preview(attId)
|
||||
},
|
||||
clickButtonToUpload (file) {
|
||||
const attId = file.id
|
||||
if (attId) {
|
||||
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
|
||||
} else {
|
||||
this.$message.warning('文件不存在,下载失败')
|
||||
}
|
||||
},
|
||||
getData() {
|
||||
|
||||
@@ -1269,7 +1269,7 @@ export default {
|
||||
this.form.zrgcs = "";
|
||||
}
|
||||
let qcdwName = []
|
||||
if(this.form.qcdw && this.form.qcdw.length){
|
||||
if(this.form.qcdw && this.form.qcdw.length > 0){
|
||||
this.form.qcdw.map(item => {
|
||||
this.qcdwOptions.forEach(items => {
|
||||
if(item === items.value){
|
||||
@@ -1282,7 +1282,7 @@ export default {
|
||||
this.form.menuIds = this.form.treeListId;
|
||||
this.form.BBFDTBZ = this.form.bfbdtbzh
|
||||
this.form.qcdw = qcdwName
|
||||
this.form.qcdw = this.form.attrInfoCaseMap.qcdw = this.form.attrInfoMap.QCDW = qcdwName.splice(',')
|
||||
this.form.qcdw = qcdwName.splice(',')
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<div class="ZQYJAddFileDetails">
|
||||
<div class="left">
|
||||
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
|
||||
<loading :loading="iframeLoading">正在加载文档</loading>
|
||||
<iframe name = "iframeMap" id="iframeMapViewComponent" v-bind:src="iframeUrl"
|
||||
width="100%" height="100%"
|
||||
frameborder="0" scrolling="no" ref="iframeDom"
|
||||
></iframe>
|
||||
@@ -48,11 +49,16 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getBusStandFileByAttId } from "api/process";
|
||||
import { kkFileViewUrl } from "@/sysConfig";
|
||||
|
||||
export default {
|
||||
name: "ZQYJAddFileDetails",
|
||||
data () {
|
||||
return {
|
||||
options: [],
|
||||
iframeUrl:"",
|
||||
iframeLoading: false,
|
||||
opinionContent: { // 抽屉数据
|
||||
partCode: '',
|
||||
oldText: '',
|
||||
@@ -79,6 +85,33 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
previewShow(attId) {
|
||||
this.iframeLoading = true
|
||||
return new Promise((resolve, reject) => {
|
||||
getBusStandFileByAttId({
|
||||
attId
|
||||
}).then(res => {
|
||||
if(res){
|
||||
const history = res;
|
||||
const editFileInfo = res.data
|
||||
if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
|
||||
this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
|
||||
}else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
|
||||
this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
|
||||
}else {
|
||||
const nowTime = new Date().getTime()
|
||||
// window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
|
||||
this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
|
||||
}
|
||||
this.iframeLoading = false
|
||||
this.$forceUpdate()
|
||||
resolve(history)
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
console.log(this.iframeUrl);
|
||||
},
|
||||
saveUserInfo () {
|
||||
this.$refs['formAdd'].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -112,6 +145,8 @@
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
const attId = this.$route.query.attId
|
||||
this.previewShow(attId)
|
||||
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
|
||||
standId: this.$route.query.standId,
|
||||
fileType: this.$route.query.fileType,
|
||||
|
||||
@@ -500,8 +500,9 @@ export default {
|
||||
*/
|
||||
getFormFieldList(item) {
|
||||
this.$nextTick(() => {
|
||||
this.standardSearch = item.standardSearch
|
||||
this.roleForm = item.roleForm
|
||||
this.standardSearch = JSON.parse(JSON.stringify(item))
|
||||
// this.standardSearch = item.standardSearch
|
||||
this.roleForm = JSON.parse(JSON.stringify(item))
|
||||
});
|
||||
},
|
||||
//tab发生变化
|
||||
@@ -621,45 +622,69 @@ export default {
|
||||
if (valid) {
|
||||
this.$refs['roleForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.standardSearch.commentText = this.commentText
|
||||
var json = Object.assign(this.standardSearch, this.roleForm)
|
||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
type: '24',
|
||||
json: JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
qbfsForm: this.standardSearch,
|
||||
commentText: this.commentText
|
||||
})
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: res.data,
|
||||
userId : this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
if (this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}
|
||||
if (this.$route.query.type === 2) {
|
||||
this.isSubmit = true
|
||||
this.standardSearch.commentText = this.commentText
|
||||
var json = Object.assign(this.standardSearch, this.roleForm)
|
||||
this.$http.post('lawss/activiti/completeTaskNew', {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId : this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json),
|
||||
specialJson: JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
qbfsForm: this.standardSearch,
|
||||
commentText: this.commentText
|
||||
})
|
||||
}
|
||||
})
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
this.isSubmit = false
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
this.standardSearch.commentText = this.commentText
|
||||
var json = Object.assign(this.standardSearch, this.roleForm)
|
||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
type: '24',
|
||||
json: JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
qbfsForm: this.standardSearch,
|
||||
commentText: this.commentText
|
||||
})
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: res.data,
|
||||
userId : this.$store.getters.userInfo.userId,
|
||||
json: JSON.stringify(json)
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
if (this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res=>{
|
||||
return res
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}else {
|
||||
this.$message.warning('请检查人员信息表单是否填写完整')
|
||||
}
|
||||
|
||||
@@ -2075,7 +2075,7 @@ export default {
|
||||
if (row.taskInfo === '标准法规部部长审核') {
|
||||
this.$router.push({
|
||||
name: 'qbfzStep2',
|
||||
query:{
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
@@ -2083,6 +2083,15 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '重新起草') {
|
||||
this.$router.push({
|
||||
name: 'qbfzStep1',
|
||||
query:{
|
||||
type: 2,
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '会签') {
|
||||
this.$router.push({
|
||||
name: 'qbfzStep3',
|
||||
|
||||
@@ -734,7 +734,7 @@
|
||||
:before-upload="beforeUpload"
|
||||
:action="importExcelUrls"
|
||||
:file-list="defaultFileList"
|
||||
accept=".xls"
|
||||
accept=".xlsx"
|
||||
name="file"
|
||||
ref="importFileAboutStand">
|
||||
<div style="padding: 20px 0">
|
||||
@@ -1024,14 +1024,14 @@ export default {
|
||||
//IE浏览器、微软浏览器
|
||||
/* 经过测试,微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开,
|
||||
IE可不重命名,以防万一,所以都写上比较好 */
|
||||
window.navigator.msSaveBlob(blob, '清单下载模板.xls');
|
||||
window.navigator.msSaveBlob(blob, '清单下载模板.xlsx');
|
||||
} else {
|
||||
//其他浏览器
|
||||
let link = document.createElement('a'); // 创建a标签
|
||||
link.style.display = 'none';
|
||||
let objectUrl = URL.createObjectURL(blob);
|
||||
link.href = objectUrl;
|
||||
link.download = '清单下载模板.xls';
|
||||
link.download = '清单下载模板.xlsx';
|
||||
link.click();
|
||||
URL.revokeObjectURL(objectUrl);
|
||||
}
|
||||
|
||||
@@ -1711,7 +1711,7 @@
|
||||
<el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
|
||||
<el-option value="1" label="是"></el-option>
|
||||
<el-option value="0" label="否"></el-option>
|
||||
<el-option value="2" label="否"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -546,7 +546,7 @@
|
||||
<el-form-item label="是否纳入标准清单" title="是否纳入标准清单" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
|
||||
<el-option value="1" label="是"></el-option>
|
||||
<el-option value="0" label="否"></el-option>
|
||||
<el-option value="2" label="否"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 标记-->
|
||||
|
||||
Reference in New Issue
Block a user