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

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