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 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
This commit is contained in:
super_liu
2021-10-14 14:46:33 +08:00
parent 9394110a24 5e9e82c910
commit 08bbc9a6ad
8 changed files with 1248 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/img/logo5.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

src/components/navMenu/index.vue
+2 -2
View File
@@ -463,7 +463,7 @@
},
computed: {
logo () {
return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
},
...mapGetters(['getDynamicTotal', 'isCollapse'])
},
@@ -509,7 +509,7 @@
text-align: left;
img {
width: 115px;
height: 45px;
height: 40px;
}
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+323 -112
View File
@@ -1,5 +1,4 @@
<template>
<div class="bzrkStep1">
<template><div class="bzrkStep1">
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">标准入库流程</template>
@@ -221,14 +220,14 @@
<div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.xgdName"
clearable
></el-input>
<div v-if="form.xgdName">
<div v-if="xgdFileList.length>0">
<!-- {{ form.xgdName }}-->
<el-button
type="primary"
@@ -251,14 +250,14 @@
</el-button>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.fbgbjbdName"
clearable
></el-input>
<div v-if="form.fbgbjbdName">
<div v-if="FBGBJBDFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
@@ -288,7 +287,7 @@
v-model="form.ssgName"
clearable
></el-input>
<div v-if="form.ssgName">
<div v-if="ssgFileList.length>0">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
@@ -318,7 +317,7 @@
v-model="form.caName"
clearable
></el-input>
<div v-if="form.caName">
<div v-if="caFileList.length>0">
<!-- {{ form.caName }}-->
<el-button
type="primary"
@@ -341,14 +340,14 @@
</el-button>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.zbjbdName"
clearable
></el-input>
<div v-if="form.zbjbdName">
<div v-if="zbjbdFileList.length>0">
<!-- {{ form.zbjbdName }}-->
<el-button
type="primary"
@@ -373,14 +372,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.kwjName"
clearable
></el-input>
<div v-if="form.kwjName">
<div v-if="kwjFileList.length>0">
<!-- {{ form.kwjName }}-->
<el-button
type="primary"
@@ -410,7 +409,7 @@
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="form.jdwjName">
<div v-if="jdwjFileList.length>0">
<!-- {{ form.jdwjName }}-->
<el-button
type="primary"
@@ -440,7 +439,7 @@
v-model="form.bpgName"
clearable
></el-input>
<div v-if="form.bpgName">
<div v-if="bpgFileList.length>0">
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
@@ -470,7 +469,7 @@
v-model="form.zqyjgName"
clearable
></el-input>
<div v-if="form.zqyjgName">
<div v-if="zqyjgFileList.length>0">
<!-- {{ form.zqyjgName }}-->
<el-button
type="primary"
@@ -910,6 +909,7 @@
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-remove="removeOneFile"
:show-file-list="true"
>
<div style="padding: 20px 0">
@@ -1269,7 +1269,7 @@
jdwjFileList: [],
zbjbdFileList: [],
kwjFileList: [],
qlwjFileList: [],
glwjFileList: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1726,7 +1726,7 @@
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
clearFormData(data){
this.form = {
@@ -1817,7 +1817,7 @@
const bringData = this.standardCheckedList[0]
bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
@@ -1847,6 +1847,15 @@
this.busVsFunc()
this.modelFunc()
this.$forceUpdate()
console.log("this.form",this.form);
// 遍历对象初始化文件信息
for(const p in this.form) {
if (typeof (this.form[p]) != "function") {
this.initializeFileList(p,this.form[p]);
}
}
} else if (this.standardCheckedList.length > 1) {
this.$message.warning('最多可以带入一条标准信息')
} else {
@@ -1860,7 +1869,63 @@
this.standardDrawer = false
break
}
},
},initializeFileList(property ,value){
switch (property){
case 'xgd':
this.getFileList(value,this.xgdFileList);
break;
case 'fbgbjbd':
this.getFileList(value,this.FBGBJBDFileList);
break;
case 'ssg':
this.getFileList(value,this.ssgFileList);
break;
case 'ca':
this.getFileList(value,this.caFileList);
break;
case 'zbjbd':
this.getFileList(value,this.zbjbdFileList);
break;
case 'kwj':
this.getFileList(value,this.kwjFileList);
break;
case 'jdwj':
debugger
this.getFileList(value,this.jdwjFileList);
break;
case 'bpg':
this.getFileList(value,this.bpgFileList);
break;
case 'zqyjg':
this.getFileList(value,this.zqyjgFileList);
break;
default: ;
}
},getFileList(fileIds,defaultFileList){
// 对象为引用传递
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: fileIds
}, {
_this: this
}, res => {
debugger
let fileList = res.data
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
let obj = {name: '', response: {}}
obj.name = fileList[i].oldFileName
obj.response.data = fileList[i]
//根据以‘，’分割的id查询到的文件信息，放入对应的文件list中
defaultFileList.push(obj)
console.log("defaultFileList",defaultFileList);
}
}
}, e => {
})
},
handleStandardPageChange (page) {
this.standardSearchForm.page = page
this.handleSearchStandard()
@@ -2219,83 +2284,122 @@
if (response.ok) {
// this.fileMadel = false
// this.fileList = []
if(this.fileType === 'fbgbjbd'){
this.FBGBJBDFileList=fileList;
this.form.fbgbjbd += response.data.id+',';
if( this.form.fbgbjbdName=== undefined){
this.form.fbgbjbdName=''
}
this.form.fbgbjbdName += response.data.name+',';
}else if(this.fileType === 'xgd'){
this.xgdFileList=fileList;
this.form.xgd += response.data.id+',';
if( this.form.xgdName=== undefined){
this.form.xgdName=''
}
this.form.xgdName += response.data.name+',';
}else if(this.fileType === 'bpg'){
this.bpgFileList=fileList;
this.form.bpg += response.data.id+',';
if( this.form.bpgName=== undefined){
this.form.bpgName=''
}
this.form.bpgName += response.data.name+',';
}else if(this.fileType === 'ssg'){
this.ssgFileList=fileList;
this.form.ssg += response.data.id+',';
if( this.form.ssgName=== undefined){
this.form.ssgName=''
}
this.form.ssgName += response.data.name+',';
}else if(this.fileType === 'zqyjg'){
this.zqyjgFileList=fileList;
this.form.zqyjg += response.data.id+',';
if( this.form.zqyjgName=== undefined){
this.form.zqyjgName=''
}
this.form.zqyjgName += response.data.name+',';
}else if(this.fileType === 'jdwj'){
this.jdwjFileList=fileList;
this.form.jdwj += response.data.id+',';
if( this.form.jdwjName=== undefined){
this.form.jdwjName=''
}
this.form.jdwjName += response.data.name+',';
}else if(this.fileType === 'kwj'){
this.kwjFileList=fileList;
this.form.kwj += response.data.id+',';
if( this.form.kwjName=== undefined){
this.form.kwjName=''
}
this.form.kwjName += response.data.name+',';
}
// else if(this.fileType === 'xgd'){
// this.xgdFileList=fileList;
// if(this.fileType === 'fbgbjbd'){
// this.FBGBJBDFileList=fileList;
//
//
// this.form.fbgbjbd += response.data.id+',';
// if( this.form.fbgbjbdName=== undefined){
// this.form.fbgbjbdName=''
// }
// this.form.fbgbjbdName += response.data.name+',';
// }else if(this.fileType === 'xgd'){
// this.xgdFileList=fileList;
// this.form.xgd += response.data.id+',';
// if( this.form.xgdName=== undefined){
// this.form.xgdName=''
// }
// this.form.xgdName += response.data.name+',';
// }else if(this.fileType === 'bpg'){
// this.bpgFileList=fileList;
// this.form.bpg += response.data.id+',';
// if( this.form.bpgName=== undefined){
// this.form.bpgName=''
// }
// this.form.bpgName += response.data.name+',';
// }else if(this.fileType === 'ssg'){
// this.ssgFileList=fileList;
// this.form.ssg += response.data.id+',';
// if( this.form.ssgName=== undefined){
// this.form.ssgName=''
// }
// this.form.ssgName += response.data.name+',';
// }else if(this.fileType === 'zqyjg'){
// this.zqyjgFileList=fileList;
// this.form.zqyjg += response.data.id+',';
// if( this.form.zqyjgName=== undefined){
// this.form.zqyjgName=''
// }
// this.form.zqyjgName += response.data.name+',';
// }else if(this.fileType === 'jdwj'){
// this.jdwjFileList=fileList;
// this.form.jdwj += response.data.id+',';
// if( this.form.jdwjName=== undefined){
// this.form.jdwjName=''
// }
// this.form.jdwjName += response.data.name+',';
// }else if(this.fileType === 'kwj'){
// this.kwjFileList=fileList;
// this.form.kwj += response.data.id+',';
// if( this.form.kwjName=== undefined){
// this.form.kwjName=''
// }
// this.form.kwjName += response.data.name+',';
// }
else if(this.fileType === 'glwj'){
this.qlwjFileList=fileList;
this.form.glwj += response.data.id+',';
if( this.form.glwjName=== undefined){
this.form.glwjName=''
}
this.form.glwjName += response.data.name+',';
}else if(this.fileType === 'ca'){
// // else if(this.fileType === 'xgd'){
// // this.xgdFileList=fileList;
// // this.form.xgd += response.data.id+',';
// // this.form.xgdName += response.data.name+',';
// // }
// else if(this.fileType === 'glwj'){
// this.qlwjFileList=fileList;
// this.form.glwj += response.data.id+',';
// if( this.form.glwjName=== undefined){
// this.form.glwjName=''
// }
// this.form.glwjName += response.data.name+',';
// }else if(this.fileType === 'ca'){
// this.caFileList=fileList;
// console.log(this.caFieList)
// this.form.ca += response.data.id+',';
// if( this.form.caName=== undefined){
// this.form.caName=''
// }
// this.form.caName += response.data.name+',';
// }else if(this.fileType === 'zbjbd'){
// this.zbjbdFileList=fileList;
// this.form.zbjbd += response.data.id+',';
// if( this.form.zbjbdName=== undefined){
// this.form.zbjbdName=''
// }
// this.form.zbjbdName += response.data.name+',';
// }
switch (this.fileType){
case 'fbgbjbd':
this.FBGBJBDFileList=fileList;
console.log("FBGJBDFileList",this.FBGBJBDFileList);
break;
case 'xgd' :
this.xgdFileList=fileList;
break;
case 'bpg':
this.bpgFileList=fileList;
break;
case 'ssg':
this.ssgFileList=fileList;
break;
case 'zqyjg':
this.zqyjgFileList=fileList;
break;
case 'jdwj':
this.jdwjFileList=fileList;
break;
case 'kwj':
this.kwjFileList=fileList;
break;
case 'ca':
this.caFileList=fileList;
this.form.ca += response.data.id+',';
if( this.form.caName=== undefined){
this.form.caName=''
}
this.form.caName += response.data.name+',';
}else if(this.fileType === 'zbjbd'){
this.zbjbdFileList=fileList;
this.form.zbjbd += response.data.id+',';
if( this.form.zbjbdName=== undefined){
this.form.zbjbdName=''
}
this.form.zbjbdName += response.data.name+',';
}
break;
case 'zbjbd':
this.zbjbdFileList=fileList
break;
case 'glwj':
this.glwjFileList=fileList
break
default : ;
}
this.$message({
showClose: true,
message: response.message,
@@ -2308,30 +2412,101 @@
// this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
this.fileType = type;
if (type==='ca'){
this.fileList=this.caFileList;
}else if (type==='fbgbjbd'){
this.fileList=this.FBGBJBDFileList;
}else if (type==='xgd'){
this.fileList=this.xgdFileList;
}else if(type==='bpg'){
this.fileList=this.bpgFileList;
}else if (type==='ssg'){
this.fileList=this.ssgFileList;
}else if (type==='zqyjg'){
this.fileList=this.zqyjgFileList;
}else if (type==='jdwj'){
this.fileList=this.jdwjFileList;
}else if (type==='zbjbd'){
// if (type==='ca'){
// this.fileList=this.caFileList;
// }else if (type==='fbgbjbd'){
// this.fileList=this.FBGBJBDFileList;
// }else if (type==='xgd'){
// this.fileList=this.xgdFileList;
// }else if(type==='bpg'){
// this.fileList=this.bpgFileList;
// }else if (type==='ssg'){
// this.fileList=this.ssgFileList;
// }else if (type==='zqyjg'){
// this.fileList=this.zqyjgFileList;
// }else if (type==='jdwj'){
// this.fileList=this.jdwjFileList;
// }else if (type==='zbjbd'){
// this.fileList=this.zbjbdFileList;
// }else if (type==='kwj'){
// this.fileList=this.kwjFileList;
// }else if (type==='glwj'){
// this.fileList=this.qlwjFileList;
// }
switch (this.fileType){
case 'fbgbjbd':
this.fileList=this.FBGBJBDFileList
break;
case 'xgd' :
this.fileList=this.xgdFileList
break;
case 'bpg':
this.fileList=this.bpgFileList
break;
case 'ssg':
this.fileList=this.ssgFileList
break;
case 'zqyjg':
this.fileList=this.zqyjgFileList
break;
case 'jdwj':
this.fileList=this.jdwjFileList
case 'kwj':
this.fileList=this.kwjFileList
break;
case 'ca':
this.fileList=this.caFileList
break;
case 'zbjbd':
this.fileList=this.zbjbdFileList;
}else if (type==='kwj'){
this.fileList=this.kwjFileList;
}else if (type==='glwj'){
this.fileList=this.qlwjFileList;
}
break;
case 'glwj':
this.fileList=this.glwjFileList;
break
default : ;
}
this.fileMadel = true;
},
removeOneFile(file, fileList) {
switch (this.fileType){
case 'fbgbjbd':
this.FBGBJBDFileList=fileList;
break;
case 'xgd' :
this.xgdFileList=fileList;
break;
case 'bpg':
this.bpgFileList=fileList;
break;
case 'ssg':
this.ssgFileList=fileList;
break;
case 'zqyjg':
this.zqyjgFileList=fileList;
break;
case 'jdwj':
this.jdwjFileList=fileList;
break;
case 'kwj':
this.kwjFileList=fileList;
break;
case 'ca':
this.caFileList=fileList;
break;
case 'zbjbd':
this.zbjbdFileList=fileList
break;
case 'glwj':
this.glwjFileList=fileList
break
default : ;
}
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0 && checkedData.length != 0){
@@ -2444,12 +2619,48 @@
this.saveLoading = false
})
},
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",")
this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",")
this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",")
this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",")
this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",")
this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",")
this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",")
this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",")
this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",")
this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",")
this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",")
this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",")
this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
this.form.caName=this.caFileList.map(item => item.response.data.name).join(",")
this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",")
this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",")
this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",")
},
handleSubmit() {
// this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.fileInfoHandle()
this.isSubmit = true
this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+83 -29
View File
@@ -211,40 +211,41 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }}
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }}
<div v-if="form.fbgbjbdName" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }}
<div v-if="form.zbjbdName" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }}
<div v-if="form.ssgName" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }}
<div v-if="form.caName" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{value.name}}
</div>
<div v-else>
- -
@@ -253,32 +254,32 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }}
<div v-if="form.kwjName" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }}
<div v-if="form.jdwjName" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
<div v-if="form.bpgName" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{value.name}}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
<div v-if="form.zqyjgName" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{value.name}}
</div>
<div v-else>
- -
@@ -693,6 +694,17 @@ export default {
name: "bzrkStep3",
data () {
return {
xgdFileMap: [],
fbgbjbdFileMap: [],
bpgFileMap: [],
ssgFileMap: [],
zqyjgFileMap: [],
jdwjFileMap: [],
kwjFileMap: [],
glwjFileMap: [],
caFileMap: [],
zbjbdFileMap: [],
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
@@ -883,28 +895,28 @@ export default {
}
})
},
downloadFile (fileType) {
downloadFile (fileType,fileId) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
}
},
popoverHide (checkedIds, checkedData) {
@@ -960,6 +972,19 @@ export default {
this.detailData = res
}, e => {})
},
assemble(ids,names){
console.log("name",names)
console.log("id",ids)
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
console.log("idarray",idArray);
for(var i=0;i<idArray.length;i++){
list.push({id:idArray[i],name:nameArray[i]});
}
return list;
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -978,6 +1003,35 @@ export default {
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
console.log("xgdName",this.xgdFileMap);
this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
// fbgbjbdFileMap: {},
this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
// bpgFileMap: {},
this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName);
// ssgFileMap: {},
this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
// zqyjgFileMap: {},
this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwj);
// jdwjFileMap: {},
this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
// kwjFileMap: {},
this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
// glwjFileMap: {},
this.caFileMap=this.assemble(processForm.ca,processForm.caName);
// caFileMap: {},
this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName);
// zbjbdFileMap: {},
this.getFormFieldList(processForm)
}
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+823 -201
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -2
View File
@@ -593,12 +593,11 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.dataList = item.step3DTOS
this.dataList = item.dataList
this.listForm.id = item.step3DTOS[0].id
this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -1
View File
@@ -1072,7 +1072,7 @@
width="500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width="500"
:lazy=true
@@ -2406,6 +2406,9 @@ export default {
this.modalShowFlag1 = false
this.$forceUpdate()
},
popoverHideCancel(){
this.modalShowFlag1 = false
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+12 -5
View File
@@ -882,7 +882,8 @@
class="add-form-item"
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -1422,7 +1423,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
<tree-select-new
width="500"
:lazy=true
@@ -1433,7 +1434,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
<tree-select-new
width="500"
:lazy=true
@@ -1444,7 +1445,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
<!-- 导入失败 -->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -2220,7 +2221,6 @@ export default {
this.urlChild = "sarModelTree/childByList"
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
debugger
if (checkedData) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
@@ -2233,6 +2233,9 @@ export default {
this.modalShowFlag2 = false
this.$forceUpdate()
},
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData.length > 0) {
@@ -2245,6 +2248,8 @@ export default {
}
this.modalShowFlag3 = false
this.$forceUpdate()
},popoverHideCarVsCancel(){
this.modalShowFlag3 = false
},
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
@@ -2258,6 +2263,8 @@ export default {
}
this.modalShowFlag4 = false
this.$forceUpdate()
},popoverHideModelCancel(){
this.modalShowFlag4 = false
},
// 将文本状态的id与name对应
setMap(data) {