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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!71
This commit is contained in:
高嵩
2023-05-06 11:49:36 +08:00
parent 51d3bad742 7d11475659
commit 6c2f41703c
6 changed files with 508 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessMixin.vue
+14
View File
@@ -132,6 +132,12 @@ export default {
if(row && row.prcType === '25' && row.taskInfo === '技术标准起草'){
let _index = row.prcName.lastIndexOf('-')
return row.prcName.slice(0 , _index + 1) + '企标制修订'
}else if(row && row.prcType === 'buss3' && row.taskInfo === '产品标准起草'){
let _index = row.prcName.lastIndexOf('-')
return row.prcName.slice(0 , _index + 1) + '企标制修订'
}else if(row && row.prcType === 'buss3' && row.taskInfo === '技术标准起草'){
let _index = row.prcName.lastIndexOf('-')
return row.prcName.slice(0 , _index + 1) + '企标制修订'
}else {
return row.prcName
}
@@ -148,6 +154,14 @@ export default {
prcName = '企标制修订-技术标准'
return prcName
}
if(prcType === 'buss3' && taskInfo === '产品标准起草'){
prcName = '企标制修订-产品标准'
return prcName
}
if(prcType === 'buss3' && taskInfo === '技术标准起草'){
prcName = '企标制修订-技术标准'
return prcName
}
this.processTypeList.map(item => {
if (item.value === prcType) {
prcName = item.label;
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+165 -4
View File
@@ -1,8 +1,8 @@
<template><div class="bzrkStep1">
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">产品标准起草</template>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -218,7 +218,15 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
<!--<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>-->
<div v-for="(item,index) in LSBBBUSSFileList" :key="index"
@click="handleFilePreview(item)" style="color: #409eff;cursor:pointer;margin-left: 12px;"
class="fileClass">
<span style="" @click="handleFilePreview2(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')"></i>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button :disabled="disabledXX"
@@ -1084,7 +1092,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLia
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import { selectByIdAtt } from "@/api/flow/index.js"
let Base64 = require('js-base64').Base64;
export default {
@@ -1977,6 +1985,42 @@ export default {
this.standardDrawer = false
this.verifySarStandard = true
this.formKey++
if(this.form.standStatus === '2' || this.form.standStatus === '3'){
selectByIdAtt(item.standId || item.id).then(res =>{
if (res && res.data && res.data.length > 0 && res.data[0].fbgbuss !== '') {
const names = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
const ids = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
if(this.form.LSBBBUSSName === undefined || this.form.LSBBBUSSName.indexOf(names) === -1){
if(this.form.LSBBBUSSName === undefined){
this.form.LSBBBUSSName = names
this.form.LSBBBUSS = ids
}else{
this.form.LSBBBUSSName = names + ',' + this.form.LSBBBUSSName
this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS
}
}
this.LSBBBUSSName = this.form.LSBBBUSSName
this.LSBBBUSS = this.form.LSBBBUSS
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
})
}
this.$forceUpdate()
})
},
@@ -2149,6 +2193,38 @@ export default {
this.form.standStatus = "3"
this.getStandInfoByReviseStatus('dr')
}
try {
let FBGBUSSLast = ''
if(res.data.attrInfoMap.FBGBUSS && res.data.attrInfoMap.FBGBUSS !== ''){
FBGBUSSLast = this.subComma(res.data.attrInfoMap.FBGBUSS)
}
let LSBBBUSS = FBGBUSSLast
if(res.data.attrInfoMap.LSBBBUSS && res.data.attrInfoMap.LSBBBUSS !== ''){
if(FBGBUSSLast === ''){
LSBBBUSS = this.subComma(res.data.attrInfoMap.LSBBBUSS)
}else{
LSBBBUSS = FBGBUSSLast + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSS)
}
}
let LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName) + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSSName)
// 发布稿空 只取历史版本
if(res.data.attrInfoMap.FBGBUSSName === null || res.data.attrInfoMap.FBGBUSSName === ''){
LSBBBUSSName = this.subComma(res.data.attrInfoMap.LSBBBUSSName)
}
// 历史版本空 只取发布稿
if(res.data.attrInfoMap.LSBBBUSSName === null || res.data.attrInfoMap.LSBBBUSSName === ''){
LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName)
}
// 存放带入的历史版本文件名、文件id
this.LSBBBUSS = LSBBBUSS
this.LSBBBUSSName = LSBBBUSSName
this.LSBBBUSSFileList = this.assemble(LSBBBUSS, LSBBBUSSName);
}catch (e) {
console.log(e)
}
this.$forceUpdate()
}
// 遍历对象初始化文件信息
@@ -2174,6 +2250,20 @@ export default {
break
}
},
// 截取字符前后的逗号
subComma(str){
if(str && str!== ''){
if(str.indexOf(',') === 0){
str = str.slice(1)
}
if(str.lastIndexOf(',') === str.length - 1){
str = str.slice(0, -1)
}
return str
}else{
return ''
}
},
initializeFileList(property ,value){
switch (property){
case 'xgd':
@@ -2582,6 +2672,44 @@ export default {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
// 修订、修改 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.standStatus === '2' || this.form.standStatus === '3') && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
// 带入的历史版本即选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS && this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
})
}
this.$refs.selections.clearSelection()
},
filterSetData(data){
@@ -2709,6 +2837,39 @@ export default {
this.$preview(attId)
}
},
handleFilePreview2(file, type) {
let attId = ""
if (file && file.id) {
attId = file.id
} else {
attId = file.response.data.id
}
if (file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
} else {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
return
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
// 导入标准数据成功后执行
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+156 -10
View File
@@ -1,8 +1,8 @@
<template><div class="bzrkStep1">
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">技术标准起草</template>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
@@ -181,7 +181,15 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
<!--<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>-->
<div v-for="(item,index) in LSBBBUSSFileList" :key="index"
@click="handleFilePreview(item)" style="color: #409eff;cursor:pointer;margin-left: 12px;"
class="fileClass">
<span style="" @click="handleFilePreview2(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')"></i>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button :disabled="disabledXX"
@@ -1212,7 +1220,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLia
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import { selectByIdAtt } from "@/api/flow/index.js"
let Base64 = require('js-base64').Base64;
export default {
@@ -2003,6 +2011,17 @@ export default {
}
return list;
},
assemble2(ids,names){
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
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;
},
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
@@ -2144,6 +2163,20 @@ export default {
break
}
},
// 截取字符前后的逗号
subComma(str){
if(str && str!== ''){
if(str.indexOf(',') === 0){
str = str.slice(1)
}
if(str.lastIndexOf(',') === str.length - 1){
str = str.slice(0, -1)
}
return str
}else{
return ''
}
},
initializeFileList(property ,value){
switch (property){
case 'xgd':
@@ -2580,8 +2613,9 @@ export default {
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
this.form.DTQBBHBUSS = this.filterSetData(arr1)
// let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
// this.form.DTQBBHBUSS = this.filterSetData(arr1)
this.form.DTQBBHBUSS = textArr.join(',')
this.form.standNum = this.filterSetData(textArr2.join(','))
}else if(this.replaceLawType === 'CYBZ'){
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
@@ -2595,6 +2629,47 @@ export default {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
// 修订 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.reviseStatus === '2' || this.form.reviseStatus === '3') && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
}else if(res && res.data && res.data.length === 0){
this.form.LSBBBUSS = ''
this.form.LSBBBUSSName = ''
}
// 带入的历史版本即选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS && this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
this.LSBBBUSSFileList = this.assemble2(this.form.LSBBBUSS, this.form.LSBBBUSSName);
})
}
this.$refs.selections.clearSelection()
},
filterSetData(data){
@@ -2722,6 +2797,39 @@ export default {
this.$preview(attId)
}
},
handleFilePreview2(file, type) {
let attId = ""
if (file && file.id) {
attId = file.id
} else {
attId = file.response.data.id
}
if (file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
} else {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
return
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
// 导入标准数据成功后执行
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
@@ -3247,6 +3355,7 @@ export default {
} else if(processForm.reviseStatus == '修订'){
processForm.reviseStatus = '2'
}
try {
this.form.standSort = processForm.standSort
this.form.planId = val
this.form.reviseStatus = '2'
@@ -3274,17 +3383,54 @@ export default {
this.form.FBGBUSS = processForm.attrInfoCaseMap.fbgbuss
this.form.BZSMBUSSName = processForm.attrInfoCaseMap.bzsmbussName
this.form.BZSMBUSS = processForm.attrInfoCaseMap.bzsmbuss
this.form.LSBBBUSSName = processForm.attrInfoCaseMap.lsbbbussName
this.form.LSBBBUSS = processForm.attrInfoCaseMap.lsbbbuss
// this.form.LSBBBUSSName = processForm.attrInfoCaseMap.lsbbbussName
// this.form.LSBBBUSS = processForm.attrInfoCaseMap.lsbbbuss
this.form.QTWJBUSSName = processForm.attrInfoCaseMap.qtwjbussName
this.form.QTWJBUSS = processForm.attrInfoCaseMap.qtwjbuss
this.form.GLWJBUSSName = processForm.attrInfoCaseMap.glwjbussName
this.form.GLWJBUSS = processForm.attrInfoCaseMap.glwjbuss
this.FBGBUSSFileList=this.assemble(processForm.attrInfoCaseMap.fbgbuss,processForm.attrInfoCaseMap.fbgbussName);
// this.FBGBUSSFileList=this.assemble(processForm.attrInfoCaseMap.fbgbuss,processForm.attrInfoCaseMap.fbgbussName);
this.BZSMBUSSFileList=this.assemble(processForm.attrInfoCaseMap.bzsmbuss,processForm.attrInfoCaseMap.bzsmbussName);
this.LSBBBUSSFileList=this.assemble(processForm.attrInfoCaseMap.lsbbbuss,processForm.attrInfoCaseMap.lsbbbussName);
// this.LSBBBUSSFileList=this.assemble(processForm.attrInfoCaseMap.lsbbbuss,processForm.attrInfoCaseMap.lsbbbussName);
this.QTWJBUSSFileList=this.assemble(processForm.attrInfoCaseMap.qtwjbuss,processForm.attrInfoCaseMap.qtwjbussName);
this.GLWJBUSSFileList=this.assemble(processForm.attrInfoCaseMap.glwjbuss,processForm.attrInfoCaseMap.glwjbussName);
}catch (e) {
}
if(this.form.reviseStatus === '2' || this.form.reviseStatus === '3'){
selectByIdAtt(processForm.standId || processForm.id).then(res =>{
if (res && res.data && res.data.length > 0 && res.data[0].fbgbuss !== '') {
const names = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
const ids = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
if(this.form.LSBBBUSSName === undefined || this.form.LSBBBUSSName.indexOf(names) === -1){
if(this.form.LSBBBUSSName === undefined){
this.form.LSBBBUSSName = names
this.form.LSBBBUSS = ids
}else{
this.form.LSBBBUSSName = names + ',' + this.form.LSBBBUSSName
this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS
}
}
this.LSBBBUSSName = this.form.LSBBBUSSName
this.LSBBBUSS = this.form.LSBBBUSS
this.LSBBBUSSFileList = this.assemble2(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
})
}
})
}
}).catch(e => {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+80 -21
View File
@@ -218,7 +218,12 @@
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview2(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')"></i>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button :disabled="disabledXX"
@@ -2157,6 +2162,29 @@
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.LSBBBUSSFileList = this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName).concat(this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName))
}
// 发布稿不为空
if(this.form.FBGBUSS && this.form.FBGBUSS!==''){
// 历史版本不为空
if(this.form.LSBBBUSS && this.form.LSBBBUSS !== ''){
this.LSBBBUSS = this.form.FBGBUSS + ',' + this.form.LSBBBUSS
this.LSBBBUSSName = this.form.FBGBUSSName + ',' + this.form.LSBBBUSSName
}else{
// 历史版本为空
this.LSBBBUSS = this.form.FBGBUSS
this.LSBBBUSSName = this.form.FBGBUSSName
}
}else{
// 发布稿为空
// 历史版本不为空
if(this.form.LSBBBUSS && this.form.LSBBBUSS !== ''){
this.LSBBBUSS = this.form.LSBBBUSS
this.LSBBBUSSName = this.form.LSBBBUSSName
}else{
// 都为空
this.LSBBBUSS = ''
this.LSBBBUSSName = ''
}
}
this.$forceUpdate()
}
// 遍历对象初始化文件信息
@@ -2590,20 +2618,19 @@
}
// this.$emit('input', textArr.join(','))
// 修订 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && this.form.standStatus === '2' && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
try{
// 修订、修改 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.standStatus === '2' || this.form.standStatus === '3') && this.selectedListRep.length > 0){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') {
if (res && res.data && res.data.length > 0 && res.data.fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
@@ -2620,16 +2647,15 @@
}
return init
},'')
}else if(res && res.data && res.data.length === 0){
this.form.LSBBBUSS = ''
this.form.LSBBBUSSName = ''
// 带入的历史版本 与 选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS && this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
})
}catch(e){
console.log(e)
}
}
this.$refs.selections.clearSelection()
},
@@ -2758,6 +2784,39 @@
this.$preview(attId)
}
},
handleFilePreview2(file, type) {
let attId = ""
if (file && file.id) {
attId = file.id
} else {
attId = file.response.data.id
}
if (file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
} else {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
return
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
// 导入标准数据成功后执行
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+50 -16
View File
@@ -213,8 +213,12 @@
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index"
@click="handleFilePreview(item)" style="color: #409eff;cursor:pointer"
class="fileClass">{{ item.name }}
style="color: #409eff;cursor:pointer"
class="fileClass">
<span style="" @click="handleFilePreview2(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')"></i>
</span>
</div>
</div>
<div style="width: 20%;">
@@ -1337,6 +1341,7 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import { selectByIdAtt } from "@/api/flow/index.js"
let Base64 = require('js-base64').Base64;
@@ -2753,7 +2758,7 @@
// this.$emit('input', textArr.join(','))
// 修订 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && this.form.reviseStatus === '2' && this.selectedListRep.length){
if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.reviseStatus === '2' || this.form.reviseStatus === '3') && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
@@ -2764,7 +2769,7 @@
return result
},'')
// const id = this.selectedListRep[0].id
this.selectByIdAtt(ids).then(res =>{
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
@@ -2788,6 +2793,11 @@
this.form.LSBBBUSS = ''
this.form.LSBBBUSSName = ''
}
// 带入的历史版本即选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS && this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
})
}
@@ -2919,6 +2929,39 @@
this.$preview(attId)
}
},
handleFilePreview2(file, type) {
let attId = ""
if (file && file.id) {
attId = file.id
} else {
attId = file.response.data.id
}
if (file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
} else {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
return
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
handleFilePreviewOne(file, type) {
let id = ""
let fileName = ""
@@ -3458,17 +3501,6 @@
this.modelOptions = res.data
})
},
selectByIdAtt(id){
return new Promise((resolve,reject)=>{
this.$http.get('/lawss/sarBussionessStand/selectByIdAtt', {
id
}, {
_this: this
}, res => {
resolve(res)
})
})
},
selectChange(){
this.$forceUpdate()
},
@@ -3522,7 +3554,7 @@
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
// 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本
if(processForm.reviseStatus === '2'){
this.selectByIdAtt(processForm.rqbJson).then(res =>{
selectByIdAtt(processForm.rqbJson).then(res =>{
// if (res && res.data && res.data.fbgbuss !== '') {
// this.form.LSBBBUSSName = res.data.fbgbussNmae
// this.form.LSBBBUSS = res.data.fbgbuss
@@ -3554,6 +3586,8 @@
this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS
}
}
this.LSBBBUSSName = this.form.LSBBBUSSName
this.LSBBBUSS = this.form.LSBBBUSS
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
})
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+43 -16
View File
@@ -209,8 +209,12 @@
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index"
@click="handleFilePreview(item)" style="color: #409eff;cursor:pointer"
class="fileClass">{{ item.name }}
@click="handleFilePreview(item)" style="color: #409eff;cursor:pointer;margin-left: 12px;"
class="fileClass">
<span style="" @click="handleFilePreview2(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')"></i>
</span>
</div>
</div>
<div style="width: 20%;">
@@ -1323,6 +1327,7 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import { selectByIdAtt } from "@/api/flow/index.js"
let Base64 = require('js-base64').Base64;
@@ -2828,8 +2833,8 @@
}
return result
},'')
this.selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.fbgbuss !== '') {
selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.length > 0 && res.data.fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
@@ -2847,7 +2852,7 @@
return init
},'')
// 带入的历史版本即选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS !== ''){
if(this.LSBBBUSS && this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
@@ -2858,17 +2863,6 @@
this.$refs.selections.clearSelection()
},
selectByIdAtt(id){
return new Promise((resolve,reject)=>{
this.$http.get('/lawss/sarBussionessStand/selectByIdAtt', {
id
}, {
_this: this
}, res => {
resolve(res)
})
})
},
filterSetData(data) {
const arr = new Set()
let permission = data.split(",");
@@ -3318,6 +3312,39 @@
this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, JSON.parse(JSON.stringify(this.form)))
}
},
handleFilePreview2(file, type) {
let attId = ""
if (file && file.id) {
attId = file.id
} else {
attId = file.response.data.id
}
if (file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
} else {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form)
return
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
changeRestTree(val) {
let arr = [];
if (val.length !== 0) {