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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zyd
2022-10-24 22:30:44 +08:00
parent 2392d08ea6 f5a837060d
commit 2c1a0f5085
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+3 -3
View File
@@ -294,9 +294,9 @@ export default {
releaseTime: [ releaseTime: [
{required: true, message: "请选择计划标准发布日期", trigger: "change"} {required: true, message: "请选择计划标准发布日期", trigger: "change"}
], ],
// FSDName: [ FSDName: [
// { required: true, validator: validateFsOnlineFile, trigger: 'blur' } { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
// ], ],
}, },
} }
}, },
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+1 -1
View File
@@ -656,7 +656,7 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.isSubmit = false this.isSubmit = false
if(this.qbfsForm.approvalOpinion === 0){ if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){
this.processCreateFsBuss(json) this.processCreateFsBuss(json)
} }
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
-1
View File
@@ -3031,7 +3031,6 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
return
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data, taskIds: res.data,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,