From f43744422387ff81fea0d65f91bdcd1500180cd2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 3 Aug 2021 15:58:04 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84--=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=88=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 76ff36995..082aff793 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -195,7 +195,7 @@ width="150px" label="实施日期"> From 28451a6343bfdb1aff4508b2adc23e38c167a4cb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:28:11 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 18 ++- .../pages/creatProcess/wfhxzg/step4.vue | 126 ++++++++++-------- .../pages/creatProcess/wfhxzg/step5.vue | 59 +++++++- 3 files changed, 142 insertions(+), 61 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 49068ff27..7d0b0fe66 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -322,7 +322,23 @@ export default { ProcessFooter, ProcessTitle }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + }, methods: { + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + this.dataList = mes.dataList; + this.roleForm = mes.roleForm; + this.commentText = mes.commentText; + }); + }, //点击新增事件 addList() { dicTypeData().then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b5827c953..df0c6c866 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -97,32 +107,30 @@ - + - @@ -214,23 +222,6 @@ @submit="handleSubmit" > - - -
- -

点击或拖拽上传文件

-
- - @@ -238,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {interfaceUrl} from "@/sysConfig"; +import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask} from "@/api/process" export default { @@ -268,6 +259,8 @@ export default { // 上传路径 uploadPath: 'api/att/attFile/upload', fileMadel: false, + // 上传所储存文件数组 + fileTextList: [], newDataList: [], // 责任部门 zNodesSItem: [], @@ -315,12 +308,18 @@ export default { this.$nextTick(() => { this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] - /*for (let i = 0; i { + if (item.fileText.length !== 0) { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) } - }*/ + }) }) }, @@ -328,16 +327,22 @@ export default { this.active = name }, /************ 上传佐证材料 *****************/ - fileUpload (val) { - this.newDataList = val - this.fileMadel = true + uploadFile (val) { + this.fileListData = val }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.fileText = res.data.name - this.newDataList.fileTextId = res.data.id - this.newDataList.fileTextPath = res.data.filePath + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + this.newDataList.forEach(item =>{ + this.fileListData.fileText.push({ + id: item.id, + name: item.name + }) + }) this.$message({ showClose: true, message: res.message, @@ -374,13 +379,28 @@ export default { return true }, // 移除上传的文件 - handleBeforeRemove() {}, - handleOnRemove() {}, - // 文件超过限制数量提示 - handleExceed() { - this.$message.error(``) + handleBeforeRemove(file, fileList) { + this.fileTextList = fileList + this.newDataList.forEach((item, index) => { + if (file.name === item.name || file.id === item.id) { + this.newDataList.splice(index, 1) + } + }) }, + /************ ********* *****************/ + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 保存按钮 handleSave() {}, // 提交按钮 @@ -388,7 +408,7 @@ export default { this.isSubmit = true let flag=false this.dataList.forEach(item => { - if (item.fileText === '') { + if (item.fileText.length === 0) { flag=true this.isSubmit = false } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 389c2dc99..073001399 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -96,14 +106,19 @@ - - + + - @@ -222,6 +237,7 @@ export default { productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, + fileTextList: [], active: '1', // 默认显示 isSubmit: false, backLoading: false, @@ -281,13 +297,39 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList + this.dataList.forEach(item => { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) + }) }) }, handleTabs(name) { this.active = name }, - + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 点击上传的文件进行下载 + handleOnPreview(file) { + let attId = file.id + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -407,6 +449,9 @@ export default { background: #E6A23C; } } + /deep/.el-upload{ + display: block; + } .content-center { padding: 10px 0px 10px 10px; } From fe9f8f14b146d678e1b26c5a982d36159aaaaaf0 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:30:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 7d0b0fe66..6d8ca7b07 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -78,8 +78,8 @@

流程发起人

- - + +
From d6e4b164d7993522f4ee3df486c0c26eb191dfcc Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 3 Aug 2021 16:46:12 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index cc52cb45e..514caf49e 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -168,7 +168,7 @@ + label="不合规项目"> -
{{historySeeForm.standId}}
+
{{historySeeForm.standSerialNumber}}
{{historySeeForm.standName}}
@@ -253,7 +253,7 @@
{{historySeeForm.productName}}
 - +
{{historySeeForm.reason}}
 From fc2044ad33dec4f0d148c26b915d284ec6562027 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 3 Aug 2021 17:53:42 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=20=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fd24218c6..4701fe62d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1392,14 +1392,15 @@ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } - ], - issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } - ], + ] + , + // issueTime: [ + // { required: true, message: '请选择标准发布日期', trigger: 'change' } + // ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], From 001353d687184718e20a973dc41573be3a2be21c 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, 3 Aug 2021 18:01:11 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 5 +- .../pages/creatProcess/bzqdfb/step3.vue | 5 +- .../pages/creatProcess/bzqdfb/step4.vue | 1063 +++++++++-------- .../tabComponents/taskDraft/index.vue | 38 +- 4 files changed, 555 insertions(+), 556 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index a4035fe21..c531d6c0f 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1305,6 +1305,7 @@ export default { if (cur[i].pId == null || cur[i].pId === '') { this.parentNode = cur[i] } + console.log(str); this.zNodes = str } // 查完左侧目录后，如果没有选中的，设置最外层选中 @@ -1450,7 +1451,6 @@ export default { loading: 'loading' }, res => { - console.log(res) if (res.ok) { this.$copyText(this.copyMessage).then((e) => { }) @@ -1657,7 +1657,6 @@ export default { let regSt = / 1 && countEd.length > 1) { @@ -2115,7 +2114,6 @@ export default { this.standItemEO.ZRBM = this.standItemEO.responsibleUnit this.saveItemId = row.id this.showUpdateItemInfo() - console.log(this.standItemEO) }, getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -2148,7 +2146,6 @@ export default { attribute (row) { this.getFileName(row) this.showItemInfoEO = JSON.parse(JSON.stringify(row)) - console.log(this.showItemInfoEO) }, getDicTypeName(opt, type) { const _type = type ? type.split(',') : [] diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index d82a474de..79adf88df 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -376,7 +376,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveTaskFirst } from "api/process"; +import { inboundLiaisonDetail, saveinboundTask } from "api/process"; export default { name: "bzqdfbStep3", @@ -700,9 +700,10 @@ export default { pId: this.$route.query.prcId, commentText: this.commentText })); - saveTaskFirst(_formData).then(res => { + saveinboundTask(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); + this.$router.push('/processCenter') this.bpnId = res.result; }).catch(e => { this.saveLoading = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index af40db76d..cfb326ed6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -1,546 +1,547 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bd68b0c25..cca5d95c9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -69,43 +69,43 @@ width="55" align="center"> - - + + + + + + + - - + + + + + + + +