From 83f26b617c4a62598e7311a0c7dffeefb311a9bf Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 2 Aug 2021 16:25:36 +0800 Subject: [PATCH 1/6] =?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=E5=BA=93--=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=8B=96=E6=8B=BD=E5=88=97=E8=A1=A8=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 9bab53613..cc52cb45e 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -197,7 +197,7 @@ label="计划关闭时间"> - + { this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; }); }, From 7f69ee42ecb75867666815f0c6f1f3b9884b8d72 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 11:24:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 126 ++++++++++++++---- .../pages/creatProcess/wfhxzg/step2.vue | 35 ++++- .../pages/creatProcess/wfhxzg/step3.vue | 53 ++++++-- 3 files changed, 176 insertions(+), 38 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index ebb110b56..49068ff27 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -29,7 +29,16 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + + + + + + @@ -87,6 +96,42 @@ + + + +

确认+选择责任人

+
+ + + +
+ + + + + + +

负责人

+
+ + + +
+ + + + + + +

分发负责人

+
+ + + +
+ + + @@ -103,7 +148,7 @@ @@ -154,25 +199,44 @@ + @selection-change="selectedChange" + > - - - - - - - + + + + + + + + + + + + + + +
取消 带入 @@ -217,13 +281,17 @@ export default { // 责任部门 zrbmOptions: [], standModel: false, + // 总数 + total: 0, + // 当前页数 + pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { pageNo: 1, pageSize: 10, total: 0, closeState: '1', - standId: '', // 标准号/名称 + standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, @@ -269,9 +337,9 @@ export default { this.$set(item,'dutyPeople','') this.$set(item,'dutyPeopleInfoId','') this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText','') - this.$set(item,'fileTextId','') - this.$set(item,'fileTextPath','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) }) this.total = res.data.total }) @@ -308,6 +376,18 @@ export default { }); } }, + // 点击查看 + 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') + }, //选择标准取消事件 closeDrawer() { this.standModel = false @@ -432,7 +512,7 @@ export default { // 清空 查询条件 clearAllSearch (search = true) { this.queryUnqualidiedData = { - standId: '', + standSerialNumber: '', productName: '', responsibleUnit: '' } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index d0c774c8a..4a203c4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -119,7 +128,6 @@ -
@@ -316,9 +324,9 @@ export default { const params = { taskIds: this.taskIds, pId: this.pId, - standId: '', // 标准号/名称 - productName: '', // 项目名称 - responsibleUnit: '' // 责任部门 + // standId: '', // 标准号/名称 + // productName: '', // 项目名称 + // responsibleUnit: '' // 责任部门 } inboundLiaisonDetail(params).then(res => { const processForm = JSON.parse(res.mesg) @@ -328,6 +336,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList + this.textarea = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 @@ -455,6 +464,18 @@ export default { }) this.dataList = this.realList }, + // 点击查看 + 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') + }, // 清空 查询条件 clearAllSearch () { this.nonSearch = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e7b4bc4e9..ba1775e1f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -125,7 +134,6 @@ -
@@ -316,6 +324,7 @@ export default { for (let i = 0; i { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') + } +/* this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -365,7 +390,19 @@ export default { }) } else { this.$message.warning('请输入反馈意见') - } + }*/ + }, + // 点击查看 + 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() {},