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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-17 17:42:42 +08:00
parent f2a29b0347 b74978ab66
commit 13df2ae65c
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+1
View File
@@ -1126,6 +1126,7 @@ export default {
} else { } else {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList
var json = Object.assign(this.listForm, this.roleForm); var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1
View File
@@ -1056,6 +1056,7 @@ export default {
} else { } else {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList this.listForm.fileName = this.fileInfoList
this.listForm.dataList = this.dataList
var json = Object.assign(this.listForm, this.roleForm); var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+1
View File
@@ -811,6 +811,7 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.isSubmit = true this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+4 -3
View File
@@ -234,7 +234,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default { export default {
name: "bzqdfbStep4", name: "bzqdfbStep4",
@@ -489,8 +489,9 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,