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!73
This commit is contained in:
高嵩
2023-05-11 10:18:52 +08:00
parent 136b5f8fa7 cdc141288e
commit 0cd56e59b4
3 changed files with 243 additions and 1656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+203 -1632
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+2 -2
View File
@@ -243,9 +243,9 @@
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div class="demo-drawer-content" style="position: relative">
<loading :loading="tableLoading">数据获取中</loading>
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+38 -22
View File
@@ -2532,35 +2532,35 @@
},
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
// this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 修复将文件删除为一个后提交不显示的bug
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
//拼接文件名和id 提交到流程Activity
// this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 修复将文件删除为一个后提交不显示的bug
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
// this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
// this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
// this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
// this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
// this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
// this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
// this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
// this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
// this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
// this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
// this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id ? item.id : item.response.data.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
},
// 删除方法
@@ -2828,7 +2828,23 @@
}
return "";
},
// 截取字符前后的逗号
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 ''
}
},
assemble(ids,names){
ids = this.subComma(ids)
names = this.subComma(names)
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');