+
Date: Mon, 13 Dec 2021 14:24:46 +0800
Subject: [PATCH 35/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/xmpg2/step1-1.vue | 81 ++++++++++---------
.../pages/creatProcess/xmpg2/step1.vue | 81 ++++++++++---------
2 files changed, 82 insertions(+), 80 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 2f69511df..5ed40df6e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -598,47 +598,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
choiceZRR(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index ce0e2ae44..ccdd41aac 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -615,47 +615,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
// 点击查看