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

流程bug

Browse Source
This commit is contained in:
宋伟佳
2021-08-12 15:49:05 +08:00
parent 357092682c
commit 338408823c
9 changed files with 1130 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+16 -12
View File
@@ -145,7 +145,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -181,7 +182,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -351,14 +353,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 => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.bzFlag = "2"; this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,10 +435,11 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.bzFlag = "1"; this.listForm.bzFlag = "1";
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) 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,
@@ -448,9 +451,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+13 -9
View File
@@ -145,7 +145,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -181,7 +182,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -349,14 +351,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 => {
}); });
@@ -385,7 +387,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg) 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);
@@ -409,6 +411,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.bzFlag = "1"; this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -423,9 +426,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, }
}, },
computed: { computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+16 -12
View File
@@ -145,7 +145,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -181,7 +182,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -351,14 +353,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 => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.dlFlag = "2"; this.listForm.dlFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,6 +435,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.dlFlag = "1"; this.listForm.dlFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -447,9 +450,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
@@ -459,7 +463,7 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
}, }
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+53 -49
View File
@@ -44,7 +44,8 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button> <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div> </div>
</div> </div>
<el-table <el-table
@@ -112,8 +113,9 @@
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>
@@ -247,8 +249,8 @@ export default {
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
selectList: [], selectList: [],
treeData: [], // 人员数据 treeData: [], // 人员数据
zrIndex: '', zrIndex: "",
zrType: '', zrType: "",
roleForm: { roleForm: {
liablePeople: "" liablePeople: ""
}, },
@@ -270,7 +272,7 @@ export default {
detailData: [], //流程历史数据 detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId
}; };
}, },
methods: { methods: {
@@ -297,14 +299,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 => {
}); });
@@ -346,7 +348,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
@@ -354,8 +356,8 @@ export default {
this.dataList = item.dataList; this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList; this.listForm.breakdownList = item.breakdownList;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -382,13 +384,14 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.liablePeople !== undefined){ if (item.liablePeople !== undefined) {
this.peopleFlag = true this.peopleFlag = true;
}else{ } else {
this.peopleFlag = false this.peopleFlag = false;
} }
}) });
if(this.peopleFlag === true){ if (this.peopleFlag === true) {
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", {
@@ -402,30 +405,31 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}else{ } else {
this.$message.warning('请选择分发负责人') this.$message.warning("请选择分发负责人");
} }
}, },
choiceZRRS (row, type, index) { choiceZRRS(row, type, index) {
this.type = type this.type = type;
if (type === 1) { if (type === 1) {
this.drawerTitle = '选择责任人' this.drawerTitle = "选择责任人";
this.nodeList = [] this.nodeList = [];
this.zrIndex = index this.zrIndex = index;
this.zrType = type this.zrType = type;
this.nodeList.push(row) this.nodeList.push(row);
this.modalshowflag = true this.modalshowflag = true;
} else if (type === 2) { } else if (type === 2) {
// 批量 // 批量
if (this.selectList.length > 0) { if (this.selectList.length > 0) {
this.zrType = type this.zrType = type;
this.nodeList = [] this.nodeList = [];
this.modalshowflag = true this.modalshowflag = true;
this.drawerTitle = '批量选择责任人' this.drawerTitle = "批量选择责任人";
} else { } else {
this.$message.warning('请选择要分发的数据') this.$message.warning("请选择要分发的数据");
} }
} }
}, },
@@ -447,25 +451,25 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0]; this.roleRow = this.$refs.tree.getCheckedNodes()[0];
} }
}, },
checkedRole (data) { checkedRole(data) {
if (this.type === 1) { if (this.type === 1) {
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])) const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
newRow.liablePeopleId = data[0].id newRow.liablePeopleId = data[0].id;
newRow.liablePeople = data[0].name newRow.liablePeople = data[0].name;
this.$set(this.dataList, this.zrIndex, newRow) this.$set(this.dataList, this.zrIndex, newRow);
} else if(this.type === 2) { } else if (this.type === 2) {
this.dataList.forEach((item, index) => { this.dataList.forEach((item, index) => {
this.selectList.forEach( items => { this.selectList.forEach(items => {
if (item.standId === items.standId) { if (item.standId === items.standId) {
const newRow = JSON.parse(JSON.stringify(item)) const newRow = JSON.parse(JSON.stringify(item));
newRow.liablePeopleId = data[0].id newRow.liablePeopleId = data[0].id;
newRow.liablePeople = data[0].name newRow.liablePeople = data[0].name;
this.$set(this.dataList, index, newRow) this.$set(this.dataList, index, newRow);
} }
}) });
}) });
} }
this.modalshowflag = false this.modalshowflag = false;
}, },
cancleUserInfo() { cancleUserInfo() {
this.modalshowflag = false; this.modalshowflag = false;
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+19 -16
View File
@@ -96,7 +96,8 @@
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{'fileClass': !scope.row.workPeople}"> <div :class="{'fileClass': !scope.row.workPeople}">
{{ scope.row.workPeople ? scope.row.workPeople: '' }}</div> {{ scope.row.workPeople ? scope.row.workPeople : "" }}
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -279,14 +280,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 => {
}); });
@@ -328,7 +329,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
@@ -362,8 +363,8 @@ export default {
}); });
this.listForm.children = children; this.listForm.children = children;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -389,6 +390,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
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", {
@@ -402,6 +404,7 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, },
@@ -434,7 +437,7 @@ export default {
} }
}, },
checkedRole(data) { checkedRole(data) {
console.log(data[0].name) console.log(data[0].name);
// 选取负责人时的操作 // 选取负责人时的操作
let deposit = new Map(); let deposit = new Map();
let mis2 = new Map(); let mis2 = new Map();
@@ -456,19 +459,19 @@ export default {
i.workPeople = undefined; i.workPeople = undefined;
}); });
} else { } else {
const newItem = JSON.parse(JSON.stringify(item)) const newItem = JSON.parse(JSON.stringify(item));
newItem.workPeopleId = data[0].id newItem.workPeopleId = data[0].id;
newItem.workPeople = data[0].name newItem.workPeople = data[0].name;
this.$set(this.dataList, index, newItem) this.$set(this.dataList, index, newItem);
} }
} else { } else {
if (item.children) { if (item.children) {
item.children.forEach((items, childIndex) => { item.children.forEach((items, childIndex) => {
if (deposit.get(items.standId)) { if (deposit.get(items.standId)) {
const childItems = JSON.parse(JSON.stringify(items)) const childItems = JSON.parse(JSON.stringify(items));
childItems.workPeopleId = deposit.get(items.standId).workPeopleId; childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
childItems.workPeople = deposit.get(items.standId).workPeople; childItems.workPeople = deposit.get(items.standId).workPeople;
this.$set(this.dataList[index].children, childIndex, childItems) this.$set(this.dataList[index].children, childIndex, childItems);
} }
}); });
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+18 -16
View File
@@ -370,24 +370,24 @@ export default {
children: "children", children: "children",
label: "name" label: "name"
}, },
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: "",
//表单的数据 //表单的数据
listForm: { listForm: {
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [ dataList: [
{ {
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: ""
} }
], //项目下的标准数据 ], //项目下的标准数据
children: [] //标准下的分解单数据 children: [] //标准下的分解单数据
}, },
dataList: [ dataList: [
{ {
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: ""
} }
], //展示的标准数据 ], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
@@ -421,14 +421,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 => {
}); });
@@ -458,7 +458,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res.mesg) console.log(res.mesg);
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -470,15 +470,15 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList; this.dataList = this.listForm.dataList;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -504,6 +504,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
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", {
@@ -517,6 +518,7 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, },
@@ -537,7 +539,7 @@ export default {
this.$refs.tree.setCheckedKeys([data.id]); this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]; this.roleRow = this.$refs.tree.getCheckedNodes()[0];
} }
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+26 -22
View File
@@ -145,7 +145,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -181,7 +182,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -291,12 +293,12 @@
</template> </template>
<script> <script>
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, queryDetail} from "api/process"; import { inboundLiaisonDetail, queryDetail } from "api/process";
export default { export default {
name: "xmpg2Step7", name: "xmpg2Step7",
components: { components: {
ProcessTitle, ProcessTitle,
@@ -330,7 +332,7 @@
methods: { methods: {
// 点击查看 // 点击查看
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: {
@@ -352,14 +354,14 @@
}, 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 => {
}); });
@@ -388,7 +390,7 @@
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg) 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);
@@ -412,8 +414,8 @@
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') { if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
} else { } else {
this.listForm.ffFlag = "2"; this.listForm.ffFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
@@ -435,6 +437,7 @@
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.ffFlag = "1"; this.listForm.ffFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -449,8 +452,9 @@
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}); });
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
@@ -460,14 +464,14 @@
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
}, }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.xmpg2-step7 { .xmpg2-step7 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -537,5 +541,5 @@
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+2
View File
@@ -433,6 +433,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.jgFlag = "1"; this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -447,6 +448,7 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, },
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+15 -11
View File
@@ -145,7 +145,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -181,7 +182,8 @@
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@@ -351,14 +353,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 => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.gcFlag = "2"; this.listForm.gcFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,6 +435,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.gcFlag = "1"; this.listForm.gcFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -447,9 +450,10 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {