FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2022-01-18 16:37:45 +08:00
parent 8c62b74893 cd1037d997
commit 04e482eda6
19 changed files with 1543 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/process.js
+16
View File
@@ -448,6 +448,22 @@ export function processModelHisOne (data) {
})
}
export function saveEditFile (data) {
return axios({
url: '/api/lawss/activiti/saveEditFile',
method: 'get',
params: data
})
}
export function processEditFile (data) {
return axios({
url: '/api/lawss/activiti/processEditFile',
method: 'get',
params: data
})
}
export function processModelHisOneCount (data) {
return axios({
url: '/api/lawss/activiti/processModelHisOneCount',
src/common/index.js
+19 -1
View File
@@ -6,6 +6,9 @@ import base64 from './base64'
import dateFormat from './date'
import hasPermission from './hasPermission'
import preview from './preview'
import onlineEdit from './onlineEdit'
import onlinePreview from './onlinePreview'
import onlineEditPreview from './onlineEditPreview'
// 表单验证
import verify from './verify'
@@ -38,7 +41,22 @@ const install = function (Vue) {
get () {
return preview
}
}
},
$onlinePreview: {
get () {
return onlinePreview
}
},
$onlineEditPreview: {
get () {
return onlineEditPreview
}
},
$onlineEdit: {
get () {
return onlineEdit
}
},
})
}
export default {
src/common/onlineEdit/index.js
+27
View File
@@ -0,0 +1,27 @@
/**
* 在线编辑
*/
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import { processEditFile } from 'api/process'
let Base64 = require('js-base64').Base64;
export default (id,nodeName,userId,userName) => {
processEditFile({
id
}).then(res => {
if(res){
const editFileInfo = res
const showName = nodeName
const editFilePath = editFileInfo.editFilePath.split("/")
editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
editFileInfo.fileName = editFilePath[2]
editFileInfo.userId = userId
editFileInfo.userName = userName
if(editFileInfo.pid){
editFileInfo.pId = editFileInfo.pid
}
const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
}
}).catch(e => {
})
}
src/common/onlineEditPreview/index.js
+29
View File
@@ -0,0 +1,29 @@
/**
* 工作流文件在线编辑预览
*/
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import { processEditFile } from 'api/process'
let Base64 = require('js-base64').Base64;
export default (id,nodeName,userId,userName) => {
processEditFile({
id
}).then(res => {
if(res){
const editFileInfo = res
const showName = nodeName
const editFilePath = editFileInfo.editFilePath.split("/")
editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
editFileInfo.fileName = editFilePath[2]
editFileInfo.userId = userId
editFileInfo.userName = userName
if(editFileInfo.pid){
editFileInfo.pId = editFileInfo.pid
}
editFileInfo.fileSuffix = 'docx'
const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
}).catch(e => {
})
}
src/common/onlinePreview/index.js
+17
View File
@@ -0,0 +1,17 @@
/**
* 工作流文件预览
*/
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import { processEditFile } from 'api/process'
let Base64 = require('js-base64').Base64;
export default id => {
processEditFile({
id
}).then(res => {
if(res){
const editFileInfo = res
window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
}
}).catch(e => {
})
}
src/components/CustomFormComponents/DatePicker.vue
+1
View File
@@ -15,6 +15,7 @@
format="yyyy-MM-dd"
:value="value"
type="date"
clearable
:editable="true"
:disabled="disabled"
:placeholder="placeholder"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+7 -7
View File
@@ -64,13 +64,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -206,6 +199,13 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+7 -7
View File
@@ -63,13 +63,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -222,6 +215,13 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+89 -15
View File
@@ -34,6 +34,19 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
@@ -75,19 +88,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
@@ -171,6 +171,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span>
</div>
</el-form-item>
</el-form>
<!-- 选择企业标准弹窗-->
<el-drawer
@@ -367,6 +378,7 @@ export default {
cbcdOptions: [],
BZList: [],
qcdwOptions: [],
LXDList: [],
qbfsForm: {
type: "5",
unit: "", // 单位
@@ -386,7 +398,9 @@ export default {
drafter: "", // 起草人
drafterName: "",
esMatingRelations: "", //配套标准
newReason: "" //立项原因
newReason: "", //立项原因
LXDName: "", //立项单名称
LXD: "", //立项单
// remarks: '', // 备注
},
qbfsFormRules: {
@@ -428,6 +442,15 @@ export default {
}
},
watch:{
'qbfsForm.esName': {
handler: function(val) {
if(val && val !== ''){
this.qbfsForm.LXDName = val+'-立项单'
this.LXDList = []
this.LXDList=this.assemble(this.qbfsForm.LXD,val+'-立项单');
}
}
},
message: {
immediate: true,
deep: true,
@@ -449,10 +472,61 @@ export default {
this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
this.qcdwOptions = res.data.QCDW // 起草单位
})
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
this.$http.get('/lawss/activiti/saveEditFile', '',{
_this: this
}, res => {
console.log(res)
if(res){
this.qbfsForm.LXD = res.id
this.qbfsForm.LXDName = '立项单'
this.LXDList=this.assemble(res.id,'立项单');
}
})
}
},
methods: {
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
let fileNam2 = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
fileNam2 = this.qbfsForm.esName+'-立项单'
}else {
fileName = '立项单.docx'
fileNam2 = '立项单'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlineEditPreview(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}else {
this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
//体系结构单选
handleClick(data,checked, node){
if(checked){
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+13 -13
View File
@@ -84,19 +84,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<template>
<custom-input-for-all-standards2
class="classDisplay"
@@ -228,6 +215,19 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+7 -7
View File
@@ -63,13 +63,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -213,6 +206,13 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+56 -7
View File
@@ -36,6 +36,13 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -82,13 +89,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -153,6 +153,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
<!-- </span>-->
</div>
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -337,6 +348,7 @@ export default {
},
data(){
return {
LXDList: [],
BZList: [],
active: '1',
type: '',
@@ -368,6 +380,32 @@ export default {
})
},
methods:{
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
}else {
fileName = '立项单.docx'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlinePreview(id)
}else {
this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
handleTabs(name){
this.active = name
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+56 -7
View File
@@ -36,6 +36,13 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -82,13 +89,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -153,6 +153,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
<!-- </span>-->
</div>
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -337,6 +348,7 @@ export default {
},
data(){
return {
LXDList: [],
BZList: [],
standSortOptions: [],
active: '1',
@@ -369,6 +381,32 @@ export default {
})
},
methods:{
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
}else {
fileName = '立项单.docx'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlinePreview(id)
}else {
this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -405,8 +443,19 @@ export default {
this.qbfsForm = JSON.parse(JSON.stringify(item))
console.log(item.area.join(','));
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
handleTabs(name){
this.active = name
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+56 -7
View File
@@ -36,6 +36,13 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -82,13 +89,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -153,6 +153,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
<!-- </span>-->
</div>
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -335,6 +346,7 @@ export default {
},
data(){
return {
LXDList: [],
BZList: [],
active: '1',
type: '',
@@ -366,6 +378,32 @@ export default {
})
},
methods:{
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
}else {
fileName = '立项单.docx'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlinePreview(id)
}else {
this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -401,8 +439,19 @@ export default {
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
handleTabs(name){
this.active = name
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+56 -7
View File
@@ -36,6 +36,13 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -82,13 +89,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -153,6 +153,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
<!-- </span>-->
</div>
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -337,6 +348,7 @@ export default {
},
data(){
return {
LXDList: [],
BZList: [],
active: '1',
type: '',
@@ -368,6 +380,32 @@ export default {
})
},
methods:{
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
}else {
fileName = '立项单.docx'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlinePreview(id)
}else {
this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
handleTabs(name){
this.active = name
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+56 -7
View File
@@ -36,6 +36,13 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -82,13 +89,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -153,6 +153,17 @@
placeholder="请输入立项原因"
:maxlength="500"/>
</el-form-item>
<el-form-item v-if="type === '5'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<!-- <el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>-->
<!-- </span>-->
</div>
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -337,6 +348,7 @@ export default {
},
data(){
return {
LXDList: [],
BZList: [],
active: '1',
type: '',
@@ -368,6 +380,32 @@ export default {
})
},
methods:{
// 文件预览及下载
handleFilePreview(file,type) {
let id = ""
let fileName = ""
if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){
fileName = this.qbfsForm.esName+'-立项单.docx'
}else {
fileName = '立项单.docx'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlinePreview(id)
}else {
this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -403,8 +441,19 @@ export default {
this.$nextTick(() => {
this.qbfsForm = JSON.parse(JSON.stringify(item))
this.type = item.type
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
handleTabs(name){
this.active = name
},
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+906 -880
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+70
View File
@@ -402,6 +402,17 @@
v-model="addForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item label="立项单" prop="LXDName" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== '' && DrawerType !== 'see'">
<el-button type="primary" size="mini" plain icon="el-icon-edit" @click="handleFilePreview(item,'onlineEdit')"></el-button>
</span>
</div>
</el-form-item>
</el-form>
</el-col>
</el-row>
@@ -597,6 +608,7 @@
},
data() {
return {
LXDList: [],
CBList: [],
BZList: [],
TXJGList: [],
@@ -1031,6 +1043,34 @@
this.form.pageSize = pageSize
this.getData()
},
handleFilePreview(file,type) {
let id = ""
let fileName = ""
let fileNam2 = ""
if(this.addForm.esName && this.addForm.esName !== ''){
fileName = this.addForm.esName+'-立项单.docx'
fileNam2 = this.addForm.esName+'-立项单'
}else {
fileName = '立项单.docx'
fileNam2 = '立项单'
}
if(file && file.id){
id = file.id
}else {
id = file.response.data.id
}
if (type === 'down') {
if (id) {
window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else if(type === 'preview'){
this.$onlineEditPreview(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}else {
this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
}
},
handleCommand (command) {
switch (command[1]) {
case '编辑':
@@ -1064,6 +1104,16 @@
drafterName: command[0].drafterName, // 起草人
drafter: command[0].drafter,
}
this.addForm.LXD = command[0].lxd
let fileName1 = ""
if(this.addForm.esName && this.addForm.esName !== ''){
fileName1 = this.addForm.esName+'-立项单'
}else {
fileName1 = '立项单'
}
this.addForm.LXDName = fileName1
this.LXDList=this.assemble(command[0].lxd,fileName1)
console.log(this.LXDList)
if (typeof (this.addForm.area) === 'string') {
this.addForm.area = command[0].area.split(',')
}
@@ -1096,12 +1146,32 @@
this.DrawerType = 'see'
this.addDrawer = true
this.addForm = command[0]
this.addForm.LXD = command[0].lxd
let fileName = ""
if(this.addForm.esName && this.addForm.esName !== ''){
fileName = this.addForm.esName+'-立项单'
}else {
fileName = '立项单'
}
this.addForm.LXDName = fileName
this.LXDList=this.assemble(command[0].lxd,fileName);
console.log(this.LXDList)
if (typeof (this.addForm.area) === 'string') {
this.addForm.area = command[0].area.split(',')
}
break
}
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
getData () {
this.loading = true
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.form, {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+55 -32
View File
@@ -955,22 +955,22 @@
placeholder="请输入标准英文名称"
clearable></el-input>
</el-form-item>
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
<!-- <template slot="label">标准性质</template>-->
<!-- <el-select v-model="sarStandardsInfoEO.standNature"-->
<!-- placeholder="请选择标准性质"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in standNatureOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- >-->
<!-- {{ item.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="standNature" label-width="150px" class="add-form-item">
<template slot="label">标准性质</template>
<el-select v-model="sarStandardsInfoEO.standNature"
placeholder="请选择标准性质"
clearable>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
>
{{ item.label }}
</el-option>
</el-select>
</el-form-item>-->
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template>
@@ -988,10 +988,7 @@
</el-select>
</el-form-item>
<custom-date-pick
:config="{
attrName: '发布日期',
attrField: 'issueTime'
}"
:config="{ attrName: '发布日期',attrField: 'issueTime'}"
v-model="sarStandardsInfoEO.issueTime"
:disabled="formdisableflag"
></custom-date-pick>
@@ -1002,7 +999,7 @@
class="add-form-item"
>
<template slot="label">是否纳入认证清单</template>
<el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
<el-select v-model="sarStandardsInfoEO.isRelateAccess" clearable @change="isRegulationsChange">
<el-option value="1" label="是" key="1"></el-option>
<el-option value="2" label="否" key="2"></el-option>
</el-select>
@@ -1072,6 +1069,7 @@
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
clearable
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
@@ -1082,7 +1080,7 @@
class="add-form-item"
>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
@@ -1092,13 +1090,14 @@
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
v-model="sarStandardsInfoEO.CYCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -1106,7 +1105,8 @@
<template v-else-if="field.attrField === 'KCCVPPSCN'">
<el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="KCCVPPSCN" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
v-model="sarStandardsInfoEO.KCCVPPSCN"
disabled
clearable
></el-input>
</el-form-item>
@@ -1114,7 +1114,8 @@
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC" disabled
v-model="sarStandardsInfoEO.DYMC"
disabled
clearable
></el-input>
</el-form-item>
@@ -1819,6 +1820,7 @@ export default {
urlChild: '',
drawerTitle: '', //drawer标题
nodeKey: 'id',
defaultCheckedKeys: [],
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
@@ -2298,11 +2300,11 @@ export default {
synopsis: [
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
],
/* standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
// {validator: this.verify.valiateEnName, trigger: 'blur'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
],*/
/* standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
// {validator: this.verify.valiateEnName, trigger: 'blur'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符不', trigger: 'change'}
],*/
standName: [
{required: false, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
@@ -2490,6 +2492,27 @@ export default {
}
}
},
'sarStandardsInfoEO.CYCVPPSBM': {
handler() {
if (this.sarStandardsInfoEO.CYCVPPSBM === '') {
this.sarStandardsInfoEO.CYCVPPSCN = ''
}
}
},
'sarStandardsInfoEO.KCCVPPSBM': {
handler() {
if (this.sarStandardsInfoEO.KCCVPPSBM === '') {
this.sarStandardsInfoEO.KCCVPPSCN = ''
}
}
},
'sarStandardsInfoEO.DYBXH': {
handler() {
if (this.sarStandardsInfoEO.DYBXH === '') {
this.sarStandardsInfoEO.DYMC = ''
}
}
},
filterText(val) {
this.$refs.tree.filter(val);
}
@@ -3842,7 +3865,7 @@ export default {
type: 'between',
value: value.join(',')
});
}else if (value !== null && value !== '' && (key === 'BARQ')){
} else if (value !== null && value !== '' && (key === 'BARQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',