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

合并分支 'fix_foton' 到 'FOTON'

Browse Source 
Fix foton

查看合并请求 laws-foton-slrs/foton-laws-system-front!12
This commit is contained in:
陈栋
2023-01-06 16:46:08 +08:00
parent 90db5ba364 181c8af20e
commit 2b3be84e3e
7 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+3
View File
@@ -886,6 +886,9 @@ export default {
this.getReplaceLawsNumRow()
},
replaceLawsNumModelCancel () {
this.replaceLawsNumForm.standCode = ''
this.replaceLawsNumForm.issueTimeArr = ''
this.replaceLawsNumForm.reviewTimeArr = ''
// this.replaceLawsNumModel = false
this.$refs.selections.clearSelection()
},
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+22
View File
@@ -1009,6 +1009,28 @@ export default {
},
deep: true //对象的深度验证
},
// 删除文件后监听已上传的文件 并回显
FBGBUSSFileListSub:function(val){
this.FBGBUSSFileList = val
},
LSBBBUSSFileListSub:function(val) {
this.LSBBBUSSFileList = val
},
BZSMBUSSFileListSub:function(val) {
this.BZSMBUSSFileList = val
},
QTWJBUSSFileListSub:function(val) {
this.QTWJBUSSFileList = val
},
GLWJBUSSFileListSub:function(val) {
this.GLWJBUSSFileList = val
},
summaryFileListSub:function(val) {
this.summaryFileList = val
},
madelSubListSub:function(val) {
this.madelSubList = val
},
}
}
</script>
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3
View File
@@ -3406,4 +3406,7 @@ export default {
}
}
}
/deep/ .el-form-item__error{
right:50px !important;
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+17 -7
View File
@@ -2228,6 +2228,8 @@
break;
default : ;
}
// 刷新组件
this.formKey++
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
@@ -2382,25 +2384,33 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 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).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).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).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).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).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).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(",")
},
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+17 -8
View File
@@ -2270,6 +2270,7 @@
break;
default : ;
}
this.formKey++
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
@@ -2437,25 +2438,33 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 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).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).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).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).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).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).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(",")
},
@@ -2709,7 +2718,7 @@
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
this.formKey++
this.getStandInfoByReviseStatus()
})
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+14 -7
View File
@@ -2811,23 +2811,30 @@
fileInfoHandle(){
//拼接文件名和id 提交到流程Activity
console.log(this.FBGBUSSFileList)
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
// 修复将文件删除为一个后提交不显示的bug
// this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
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).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).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).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).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).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(",")
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+16 -16
View File
@@ -592,21 +592,21 @@ export default {
qbzxdFrom.commentText = this.commentText;
qbzxdFrom.addFlag = '0'
let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '25',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
// this.$http.post("lawss/activiti/startProcessRollBack", {
// createUser: this.$store.getters.userInfo.userId,
// createUserName: this.$store.getters.userInfo.userName,
// type: '25',
// json: JSON.stringify({
// roleForm: this.roleForm,
// qbfsForm: qbzxdFrom,
// commentText: this.commentText
// })
// }, {
// _this: this
// }, res => {
// if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
@@ -628,8 +628,8 @@ export default {
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
}
});
// }
// });
}else {
this.$refs["roleForm"].validate((valid) => {
if (valid) {