{{ listForm.modelName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
@@ -255,6 +277,7 @@ export default {
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
+ fileList:[],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
@@ -356,6 +379,9 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
+ this.fileIds = item.fileId;
+ console.log(this.fileIds);
+ this.getFileInfo();
});
},
// 请求上传的文件信息
@@ -365,11 +391,15 @@ export default {
}, {
_this: this
}, res => {
- console.log(res);
this.$nextTick(() => {
res.data.map(item => {
- this.listForm.modelName = item.oldFileName;
- this.listForm.model = item.id;
+ // 赋值要回显的上传文件内容
+ this.fileList.push({
+ name: item.oldFileName,
+ uid: item.uid,
+ status: item.status,
+ id: item.id
+ });
});
});
}, e => {
@@ -399,8 +429,27 @@ export default {
},
//驳回事件
beforeBack() {
- this.listForm.approvalOpinion = "1";
- this.handleSubmit();
+ if(!this.commentText){
+ 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() {
@@ -480,6 +529,31 @@ export default {
padding: 0 20px 0;
}
}
+ p {
+ & > a {
+ cursor: pointer;
+ }
+
+ & > i {
+ display: inline-block;
+ margin-left: 3px;
+ width: 18px;
+ height: 16px;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ background-position: center center;
+ vertical-align: sub;
+ cursor: pointer;
+ }
+
+ .icon-download {
+ background-image: url("~assets/images/shangqi/img/download.png");
+ }
+
+ .icon-download2 {
+ background-image: url("~assets/images/shangqi/img/download2.png");
+ }
+ }
.choiceBtn {
.el-button--primary {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index c59d0535d..81f1b0667 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -282,7 +282,7 @@ export default {
},
// 点击查看
handlePreview(item) {
- console.log(item)
+ console.log(item);
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -304,14 +304,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 => {
});
@@ -354,7 +354,10 @@ export default {
},
//提交事件
handleSubmit() {
- this.isSubmit = true
+ if (!this.listForm.jgUser) {
+ this.$message.warning("请选择架构经理");
+ } else {
+ this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -368,9 +371,10 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
- this.isSubmit = false
+ this.isSubmit = false;
}, e => {
});
+ }
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 7bf689c06..7f30f2f5b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -108,12 +108,12 @@
>