修改bug

This commit is contained in:
宋伟佳
2021-08-06 14:27:01 +08:00
parent 32342b194d
commit 2df6b33b42
4 changed files with 47 additions and 12 deletions
@@ -399,8 +399,27 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
this.listForm.approvalOpinion = "1"; if(!this.commentText){
this.handleSubmit(); this.$message.warning('请填写审批意见')
}else{
this.listForm.approvalOpinion = "1";
this.saveLoading = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.saveLoading = false
});
}/**/
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
@@ -282,7 +282,7 @@ export default {
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
console.log(item) console.log(item);
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
@@ -304,14 +304,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -354,7 +354,10 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true if (!this.listForm.jgUser) {
this.$message.warning("请选择架构经理");
} else {
this.isSubmit = true;
this.listForm.commentText = this.commentText; 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", {
@@ -368,9 +371,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false;
}, e => { }, e => {
}); });
}
}, },
choiceZRR(scope, type, title, id) { choiceZRR(scope, type, title, id) {
if (scope != null) { if (scope != null) {
@@ -108,12 +108,12 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人" label="分发责任人"
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.liablePeopleId" style="display: none;"/> <el-input v-model="scope.row.liablePeopleId" style="display: none;"/>
<el-input v-model="scope.row.liablePeople" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/> <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -370,6 +370,7 @@ export default {
if(this.peopleFlag === true){ if(this.peopleFlag === true){
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json)
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -430,6 +431,7 @@ export default {
if (this.type === 1) { if (this.type === 1) {
this.dataList[this.zrIndex].liablePeopleId = data[0].id this.dataList[this.zrIndex].liablePeopleId = data[0].id
this.dataList[this.zrIndex].liablePeople = data[0].name this.dataList[this.zrIndex].liablePeople = data[0].name
this.$forceUpdate()
} else if(this.type === 2) { } else if(this.type === 2) {
this.dataList.forEach( item => { this.dataList.forEach( item => {
this.selectList.forEach( items => { this.selectList.forEach( items => {
@@ -437,6 +439,7 @@ export default {
item.liablePeopleId = data[0].id item.liablePeopleId = data[0].id
item.liablePeople = data[0].name item.liablePeople = data[0].name
} }
this.$forceUpdate()
}) })
}) })
} }
@@ -451,6 +454,14 @@ export default {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
} }
}, },
watch: {
// dataList: {
// deep: true,
// handler (val) {
// console.log('dataList update', val)
// }
// }
},
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
@@ -315,6 +315,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg)
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);