diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index dbb9177ea..2664f236c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -275,6 +275,7 @@ ] }, json: {}, + jsonData: {}, fileUrl: 'api/att/attFile/upload', fileMadel: false, } @@ -401,11 +402,12 @@ this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.isSubmit = true - var json = this.json + let json = this.jsonData json.commentText = this.commentText5 json.hzfileId = this.form.hzfileId json.hzfileName = this.form.hzfileName json.docUser = this.newDocUser + json.responUserList = this.tableData this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -427,6 +429,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + let jsonData = JSON.parse(res.mesg) + this.jsonData = jsonData.form ? jsonData.form : jsonData this.commentText5 = data.commentText5 || '' this.form.title = data.title || data.form.title this.form.processName = data.processName || data.form.processName diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index e6495aa66..c8bc403dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -438,6 +438,7 @@ v-model="plForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 74a6f4fbf..6518e4149 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -446,6 +446,7 @@ v-model="plForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 33806c498..b6cdc0327 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -315,6 +315,7 @@ v-model="plForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > @@ -404,6 +405,7 @@ v-model="editForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 7e5cd7c67..36d75bf93 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1220,7 +1220,7 @@ export default { this.tableLoading = true; this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { page: this.page, - size: this.pageSize, + pageSize: this.pageSize, ...this.standardSearch }, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 35b1d5dac..59ff0c487 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -49,22 +49,32 @@ > -
- - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+ + 点击上传 + @@ -699,17 +709,20 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - +
@@ -793,6 +806,7 @@ export default { sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: "api/att/attFile/upload", // 上传的地址 fileInfoList: [], // 上传的附件 + fileInfo: '', // 展示的附件 fileIds: [], // 上传的附件 fileList: [], fileListName: [], //上传的附件名称 @@ -1191,6 +1205,16 @@ export default { this.fileInfoList.splice(index, 1); } }); + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, fileUpload() { this.fileMadel = true; @@ -1204,6 +1228,16 @@ export default { this.$message.error(res.message); fileList.pop(); } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, // 相关附件 上传之前钩子 beforeUpload(file) { @@ -1243,6 +1277,18 @@ export default { }); window.open(routeUrl.href, "_blank"); }, + clickButtonToUpload2(file) { + const attId = file.attId + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file) { if (response.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 661e3af97..d4522ff59 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -40,7 +40,7 @@

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} { }); }, + //点击预览 + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d45ece1f4..34da50302 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,22 +49,32 @@ > -

- - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+ + 点击上传 + @@ -669,17 +679,20 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - +
@@ -762,6 +775,7 @@ export default { sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: "api/att/attFile/upload", // 上传的地址 fileInfoList: [], // 上传的附件 + fileInfo: '', // 展示的附件 fileIds: [], // 上传的附件 fileListName: [], //上传的附件名称 standardData: [], //添加标准数据 @@ -1122,6 +1136,16 @@ export default { this.fileInfoList.splice(index,1) } }) + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, fileUpload() { this.fileMadel = true; @@ -1135,6 +1159,16 @@ export default { this.$message.error(res.message); fileList.pop(); } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, // 相关附件 上传之前钩子 beforeUpload(file) { @@ -1174,6 +1208,18 @@ export default { }); window.open(routeUrl.href, "_blank"); }, + clickButtonToUpload2(file) { + const attId = file.attId + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file) { if (response.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 484587e3b..732b47a57 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -52,21 +52,32 @@ > - - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+
+ + 点击上传 +
@@ -381,6 +392,27 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + + +
+ +

点击或拖拽上传文件

+
+
+
@@ -404,6 +436,7 @@ export default { // 当前流程类型(1待办/2已办) processType: 1, searching: false, + fileMadel: false, commentText:'', nodeList:[], isTransfer: false, @@ -436,6 +469,7 @@ export default { uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 fileList:[], fileInfoList: [], // 上传的附件 + fileInfo: '', //展示的附件 dataList: [],//清单里的标准数据 standardData: [], //添加标准数据 standModel: false, // 选择标准抽屉状态 @@ -709,6 +743,19 @@ export default { this.fileInfoList.splice(index,1) } }) + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list + }, + fileUpload() { + this.fileMadel = true; }, // 上传文件成功回调 uploadBackSuccess (res, file, fileList) { @@ -720,6 +767,16 @@ export default { this.$message.error(res.message) fileList.pop() } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, //上传之前的钩子 beforeUpload (file) { @@ -748,10 +805,16 @@ export default { } return true; }, - handleOnPreview(file) { - let attId = file.id - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId; + clickButtonToUpload2(file) { + const attId = file.id + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.id + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') } }, getData() { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 5e10ec58e..574e5120e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1269,7 +1269,7 @@ export default { this.form.zrgcs = ""; } let qcdwName = [] - if(this.form.qcdw && this.form.qcdw.length){ + if(this.form.qcdw && this.form.qcdw.length > 0){ this.form.qcdw.map(item => { this.qcdwOptions.forEach(items => { if(item === items.value){ @@ -1282,7 +1282,7 @@ export default { this.form.menuIds = this.form.treeListId; this.form.BBFDTBZ = this.form.bfbdtbzh this.form.qcdw = qcdwName - this.form.qcdw = this.form.attrInfoCaseMap.qcdw = this.form.attrInfoMap.QCDW = qcdwName.splice(',') + this.form.qcdw = qcdwName.splice(',') const json = JSON.stringify(this.form); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue index 2b26ddfec..670a3ebc9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -1,7 +1,8 @@