diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index cb3106e91..f4db8da41 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -241,6 +241,15 @@ export default {
comityTel: [],
comityOpRole: '',
comityInRoleId: '',
+ fillPeople: '',
+ fillPeopleId: '',
+ fillUnit: '',
+ fillDept: '',
+ fillPost: '',
+ fillTel: '',
+ fillMail: '',
+ fillLeader: '',
+ fillLeaderId: '',
},
roleForm: {},
commentText: '',
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index c2e5c78b5..797572dab 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -153,7 +153,7 @@
-
+
-
+ class="upload_style"
+ :disabled="acceptShow"
+ multiple
+ ref="uploadFile"
+ :action="uploadPath"
+ name="file"
+ :file-list="fillFileList"
+ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+ :before-upload="handleBeforeUpload"
+ :before-remove="handleBeforeRemove"
+ :on-success="handleOnsuccess"
+ >
+
+ 点击上传
+
+
@@ -323,7 +339,7 @@ export default {
fillMail: '',
fillLeader: '',
fillLeaderId: '',
- fillFile: '',
+ fillFile: [],
},
rh_rules: {
fillLeader: [
@@ -345,7 +361,15 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
- infoSourcesLength: ''
+ infoSourcesLength: '',
+
+ /** 上传相关 */
+ acceptShow: false,
+ // 上传路径
+ uploadPath: 'api/att/attFile/upload',
+ // 上传所储存文件数组
+ fillFileList: [],
+ newDataList: [],
}
},
computed: {
@@ -385,11 +409,12 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+ this.rh_pageData.fillLeader = ''
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.rh_pageData.infoSources.length
- // this.rh_pageData.comityFileNum = this.fileTextList
+ // this.rh_pageData.comityFileNum = this.fillFileList
})
},
// 右上标签页面切换
@@ -458,6 +483,65 @@ export default {
})
},
+ // 文件上传限制条件
+ handleBeforeUpload(file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ return true
+ } else {
+ this.spinShow = false
+ this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ // 移除上传的文件
+ handleBeforeRemove(file, fileList) {
+ this.fileData = fileList
+ this.fillFileList.forEach((item, index) => {
+ if (item.name === file.name || item.id === file.id) {
+ this.fillFileList.splice(index, 1)
+ }
+ })
+ this.rh_pageData.fillFile = this.fillFileList
+ },
+ // 文件上传成功
+ handleOnsuccess(res, file, fileList) {
+ if (res.ok) {
+ if (this.fillFileList !== null) {
+ this.newDataList = this.fillFileList
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ } else {
+ this.newDataList.push({
+ id: res.data.attId,
+ name: res.data.standName
+ })
+ }
+ this.rh_pageData.fillFile = this.newDataList
+ this.$message({
+ showClose: true,
+ message: res.message,
+ type: 'success'
+ })
+ this.fileMadel = false
+ }
+ },
/** 点击对应附件进行下载*/
previews(val) {
let attId = val
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 267544012..a14e003f4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -107,7 +107,14 @@
-
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index befd2b275..b73c5af0d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -146,7 +146,14 @@
-
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
index dbf22f849..d6ea134a5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -109,7 +109,14 @@
-
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index 964339473..1bcb3f53c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -112,7 +112,14 @@
-
+
+
+ {{ '-' }}
+
+ {{ item.name }} {{ ';' }}
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index ac5a459f5..76aa8a5dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -214,7 +214,17 @@ export default {
active: '1',
acceptShow: false,
- ch_pageData: {},
+ ch_pageData: {
+ fillPeopleId: '',
+ fillPeople: '',
+ fillUnit: '',
+ fillDept: '',
+ fillPost: '',
+ fillTel: '',
+ fillMail: '',
+ fillLeader: '',
+ fillFile: '',
+ },
ch_rules: {},
nodeList: [],
commentText: '',
@@ -335,7 +345,14 @@ export default {
}
})
- }
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 1fd7e6aa1..45db1b442 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -123,7 +123,7 @@
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index 4375af7cf..40e385017 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -349,7 +349,14 @@ export default {
});
}
})
- }
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index 7d8a47e04..262e08058 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -318,7 +318,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.ch_pageData.myPartRole.findIndex(items => {
- return items.id === item;
+ return items === item;
});
if (index > -1) {
this.ch_pageData.myPartRole.splice(index, 1);
@@ -377,7 +377,14 @@ export default {
}
})
- }
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index 4a5d3fb91..a11847ce6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
@@ -414,7 +414,14 @@ export default {
}
})
- }
+ },
+ /** 点击对应附件进行下载*/
+ previews(val) {
+ let attId = val
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
}
}