Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue

@@ -532,12 +532,23 @@ export default {
           _this: this
         }, res => {
           if(res.ok){
-            this.qblx_pageData.qblxData = res.data
+            if(res.data.length){
+              this.qblx_pageData.qblxData = res.data
+              this.$message.success('文件上传成功')
+            }else{
+              this.$message.warning('请勿上传为空的文件')
+            }
           }else{
-           alert(res.message)
+            this.$confirm(res.message, "提示", {
+              confirmButtonText: "确认",
+              confirmButtonClass: "common-button-primary",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+            }).catch(() => {
+            });
           }
         })
-        this.$message.success('文件上传成功')
         this.importModalshowflag = false
         this.$nextTick(() => {
           this.$refs.importFileAboutStand.clearFiles()
@@ -946,9 +957,10 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      let jsonData = this.qblx_pageData.qblxData
-      this.qblx_pageData.qblxFile = this.fileInfoList
-      this.qblx_pageData.commentText = this.commentText;
+      if(this.qblx_pageData.qblxData.length){
+        let jsonData = this.qblx_pageData.qblxData
+        this.qblx_pageData.qblxFile = this.fileInfoList
+        this.qblx_pageData.commentText = this.commentText;
         this.$refs["qblx_pageData"].validate((valid) => {
           if (valid) {
             this.$refs["roleForm"].validate(async (valid) => {
@@ -960,7 +972,7 @@ export default {
                     .then(() => {
                       finishCount++
                     }).catch(e => {
-                  })
+                    })
                 }
                 if (finishCount === jsonData.length) {
                   this.isSubmit = false
@@ -975,6 +987,10 @@ export default {
             return this.$message.warning("请完善基础信息");
           }
         });
+      }else{
+        this.$message.warning('立项列表不能为空')
+      }
+
     },
 
   }