From 433c084d2c6bb343b4802b0b424b34a5991559e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 25 Jan 2022 20:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzpg/step5.vue | 147 ++++++++++--------
1 file changed, 80 insertions(+), 67 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 82d9cc9c1..188779b39 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -158,25 +158,26 @@
align="center">
+ min-width="180"
+ prop="projectGroup"
+ label="项目群">
@@ -187,6 +188,17 @@
align="center"
label="条款名称">
+
+
+
+ 查看条款内容
+
+
+
@@ -420,6 +432,15 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
>
+
+
+
+ 关闭
+
+
{
+ this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
+ })
+ this.itermsConditionsFlag = true
+ },
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
@@ -722,44 +760,14 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
- console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
- if (item.fenFlag === undefined) {
- item.step3DTOS.forEach(item => {
- item.implementerId = this.$store.getters.userInfo.userId;
- item.implementer = this.$store.getters.userInfo.userName;
- });
- // this.commentText = ''
- this.dataList = item.step3DTOS;
- this.dataList.forEach(item => {
- this.$set(item,'complianceReasons', '')
- this.$set(item,'noCompliance', '')
- this.$set(item,'countermeasures', '')
- this.$set(item,'completionTime', '')
- })
- } else {
- this.dataList = item.dataList;
- // this.commentText = ''
- this.dataList.forEach(item => {
- item.implementerId = this.$store.getters.userInfo.userId;
- item.implementer = this.$store.getters.userInfo.userName;
- });
- }
- // this.getLocalTime()
- this.listForm.prcNum = this.prcNum;
- this.listForm.prcName = this.prcName;
- this.listForm["id"] = item.id;
- this.listForm.standName = item.step3DTOS[0].standName;
- this.listForm.standNumber = item.step3DTOS[0].standNumber;
- this.listForm.id = item.step3DTOS[0].id;
- this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
- this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
- this.listForm.itemsName = item.step3DTOS[0].itemsName;
- this.listForm.itemNum = item.step3DTOS[0].itemNum;
- this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
- this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
+ this.fileType = item.fileType
+ this.listForm.prcNum = this.prcNum
+ this.listForm.prcName = this.prcName
+ this.listForm['id'] = item.id
+ this.dataList = item.dataList
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -827,27 +835,32 @@ export default {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.commentText = this.commentText;
- this.listForm.approvalOpinion = "";
- this.listForm.signFlag = "";
- this.listForm.dataList = this.dataList;
- const json = JSON.stringify(this.listForm);
- this.isSubmit = true
- 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 => {
+ this.$confirm("请确认表单数据是否填写完整", "提示", {
+ confirmButtonText: "确认",
+ confirmButtonClass: "common-button-primary",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ this.listForm.commentText = this.commentText;
+ this.listForm.dataList = this.dataList;
+ const json = JSON.stringify(this.listForm);
+ this.isSubmit = true
+ 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 => {
+ });
+ }).catch(() => {
});
}
}
@@ -872,7 +885,7 @@ export default {
saveBatchEditForm() {
this.dataList.forEach(item => {
this.selectList.forEach(items => {
- if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
+ if (item.itemsNum === items.itemsNum && item.projectName === items.projectName) {
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
@@ -904,7 +917,7 @@ export default {
this.searchData();
},
pageSizeChange(pageSize) {
- this.pageSize = this.$store.getters.userInfo.configContent;
+ this.pageSize = pageSize;
this.searchData();
}
},