Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/system/process-form.vue

@@ -360,6 +360,28 @@
       },
       //保存退课流程
       setBackClassFlow() {
+        for(let i=0;i<this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList.length;i++){
+          if(this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList[i].AuditType==2){
+            if(!this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList[i].UserId){
+              this.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: '请选择审批人'+(i+1)+'指定人员名称'
+              })
+              return;
+            }
+          }
+          if(this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList[i].AuditType==3){
+            if(!this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList[i].PostType){
+              this.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: '请选择审批人'+(i+1)+'角色'
+              })
+              return;
+            }
+          }
+        }
         saveBackClassFlow(this.saveObj).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/pages/system/processSet.vue

@@ -286,7 +286,18 @@
       },
       //删除节点
       DeleteNode(index) {
-        this.flowObj.FlowNodeList.splice(index, 1);
+        this.$q.dialog({
+          title: '提示信息',
+          message: '是否确定删除该流程',
+          cancel: true,
+          persistent: true,
+          ok: "确定",
+          cancel: "取消",
+        }).onOk(() => {
+          this.flowObj.FlowNodeList.splice(index, 1);
+        }).onCancel(() => {
+
+        });
       },
       getBackClassFlow() {
         queryBackClassFlow(this.msg).then(res => {