@@ -351,14 +353,14 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
- })
+ });
this.totalNo = res.data.count;
}, e => {
});
@@ -410,9 +412,9 @@ export default {
},
//驳回事件
beforeBack() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
+ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+ this.$message.warning("请填写审批意见");
+ } else {
this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -433,24 +435,26 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.bzFlag = "1";
- this.listForm.commentText = this.commentText;
- const json = JSON.stringify(this.listForm);
- console.log(json)
- 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");
- }
- }, e => {
- });
- },
+ this.isSubmit = true;
+ this.listForm.bzFlag = "1";
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ console.log(json);
+ 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.isSubmit = false;
+ }, e => {
+ });
+ }
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 2ffd9a28e..f9d78447f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -43,25 +43,25 @@
填写信息
+ type="selection"
+ width="55"
+ align="center">
{{ scope.row.standName }}
+ prop="itemsNum"
+ align="center"
+ width="200"
+ label="条款号">
+ prop="itemsName"
+ width="200"
+ align="center"
+ label="条款名称">
+ prop="xcxssrqgj"
+ width="200"
+ align="center"
+ label="新车型实施日期">
{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="zccssrqgj"
+ width="200"
+ align="center"
+ label="在产车实施日期">
{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="productType"
+ align="center"
+ label="在研产品">
+ prop="complianceReasons"
+ align="center"
+ width="160"
+ label="合规">
+ align="center"
+ width="160"
+ prop="researchNonCompliance"
+ label="不合规">
+ prop="noCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="countermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="completionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+ }}
+ align="center"
+ label="在产产品">
+ prop="zcComplianceReasons"
+ align="center"
+ width="160"
+ label="合规(具体情况)">
+ align="center"
+ width="160"
+ label="不合规">
+ prop="zcNoCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="zcCountermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="zcCompletionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+ }}
-
-
+
+
@@ -349,14 +351,14 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
- })
+ });
this.totalNo = res.data.count;
}, e => {
});
@@ -385,7 +387,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- console.log(res.mesg)
+ console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -409,23 +411,25 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.bzFlag = "1";
- 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");
- }
- }, e => {
- });
- },
+ this.isSubmit = true;
+ this.listForm.bzFlag = "1";
+ 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.isSubmit = false;
+ }, e => {
+ });
+ }
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 81f5faa37..d43b5367c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -43,25 +43,25 @@
填写信息
+ type="selection"
+ width="55"
+ align="center">
{{ scope.row.standName }}
+ prop="itemsNum"
+ align="center"
+ width="200"
+ label="条款号">
+ prop="itemsName"
+ width="200"
+ align="center"
+ label="条款名称">
+ prop="xcxssrqgj"
+ width="200"
+ align="center"
+ label="新车型实施日期">
{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="zccssrqgj"
+ width="200"
+ align="center"
+ label="在产车实施日期">
{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ prop="productType"
+ align="center"
+ label="在研产品">
+ prop="complianceReasons"
+ align="center"
+ width="160"
+ label="合规">
+ align="center"
+ width="160"
+ prop="researchNonCompliance"
+ label="不合规">
+ prop="noCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="countermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="completionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+ }}
+ align="center"
+ label="在产产品">
+ prop="zcComplianceReasons"
+ align="center"
+ width="160"
+ label="合规(具体情况)">
+ align="center"
+ width="160"
+ label="不合规">
+ prop="zcNoCompliance"
+ align="center"
+ width="160"
+ label="不合规项目">
+ prop="zcCountermeasures"
+ align="center"
+ width="160"
+ label="应对措施">
+ prop="zcCompletionTime"
+ align="center"
+ width="160"
+ label="完成时间">
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+ }}
-
-
+
+
@@ -351,14 +353,14 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
- })
+ });
this.totalNo = res.data.count;
}, e => {
});
@@ -410,9 +412,9 @@ export default {
},
//驳回事件
beforeBack() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写审批意见')
- }else{
+ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+ this.$message.warning("请填写审批意见");
+ } else {
this.listForm.dlFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.dlFlag = "1";
- 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");
- }
- }, e => {
- });
- },
+ this.isSubmit = true;
+ this.listForm.dlFlag = "1";
+ 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.isSubmit = false;
+ }, e => {
+ });
+ }
},
computed: {
listNoDataText() {
@@ -459,7 +463,7 @@ export default {
mounted() {
this.processTable();
this.getData();
- },
+ }
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index a00511c26..cefaecdc1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -44,7 +44,8 @@
-
-
+
+
@@ -225,7 +227,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step4",
@@ -247,8 +249,8 @@ export default {
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
- zrIndex: '',
- zrType: '',
+ zrIndex: "",
+ zrType: "",
roleForm: {
liablePeople: ""
},
@@ -270,7 +272,7 @@ export default {
detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
+ pId: this.$route.query.prcId
};
},
methods: {
@@ -297,14 +299,14 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
- })
+ });
this.totalNo = res.data.count;
}, e => {
});
@@ -346,7 +348,7 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
- if(item.form === undefined){
+ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
@@ -354,8 +356,8 @@ export default {
this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList;
} else {
- this.listForm = item.form
- this.dataList = item.form.dataList
+ this.listForm = item.form;
+ this.dataList = item.form.dataList;
}
});
@@ -382,13 +384,14 @@ export default {
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
- if(item.liablePeople !== undefined){
- this.peopleFlag = true
- }else{
- this.peopleFlag = false
+ if (item.liablePeople !== undefined) {
+ this.peopleFlag = true;
+ } else {
+ this.peopleFlag = false;
}
- })
- if(this.peopleFlag === true){
+ });
+ if (this.peopleFlag === true) {
+ this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -402,30 +405,31 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
+ this.isSubmit = false;
}, e => {
});
- }else{
- this.$message.warning('请选择分发负责人')
+ } else {
+ this.$message.warning("请选择分发负责人");
}
},
- choiceZRRS (row, type, index) {
- this.type = type
+ choiceZRRS(row, type, index) {
+ this.type = type;
if (type === 1) {
- this.drawerTitle = '选择责任人'
- this.nodeList = []
- this.zrIndex = index
- this.zrType = type
- this.nodeList.push(row)
- this.modalshowflag = true
+ this.drawerTitle = "选择责任人";
+ this.nodeList = [];
+ this.zrIndex = index;
+ this.zrType = type;
+ this.nodeList.push(row);
+ this.modalshowflag = true;
} else if (type === 2) {
// 批量
if (this.selectList.length > 0) {
- this.zrType = type
- this.nodeList = []
- this.modalshowflag = true
- this.drawerTitle = '批量选择责任人'
+ this.zrType = type;
+ this.nodeList = [];
+ this.modalshowflag = true;
+ this.drawerTitle = "批量选择责任人";
} else {
- this.$message.warning('请选择要分发的数据')
+ this.$message.warning("请选择要分发的数据");
}
}
},
@@ -447,25 +451,25 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
- checkedRole (data) {
+ checkedRole(data) {
if (this.type === 1) {
- const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
- newRow.liablePeopleId = data[0].id
- newRow.liablePeople = data[0].name
- this.$set(this.dataList, this.zrIndex, newRow)
- } else if(this.type === 2) {
+ const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
+ newRow.liablePeopleId = data[0].id;
+ newRow.liablePeople = data[0].name;
+ this.$set(this.dataList, this.zrIndex, newRow);
+ } else if (this.type === 2) {
this.dataList.forEach((item, index) => {
- this.selectList.forEach( items => {
+ this.selectList.forEach(items => {
if (item.standId === items.standId) {
- const newRow = JSON.parse(JSON.stringify(item))
- newRow.liablePeopleId = data[0].id
- newRow.liablePeople = data[0].name
- this.$set(this.dataList, index, newRow)
+ const newRow = JSON.parse(JSON.stringify(item));
+ newRow.liablePeopleId = data[0].id;
+ newRow.liablePeople = data[0].name;
+ this.$set(this.dataList, index, newRow);
}
- })
- })
+ });
+ });
}
- this.modalshowflag = false
+ this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index e051dc45f..d53cb2820 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -96,7 +96,8 @@
- {{ scope.row.workPeople ? scope.row.workPeople: '' }}
+ {{ scope.row.workPeople ? scope.row.workPeople : "" }}
+