From 68f79d8883a79c28b9375b4439764a9e8cb15f8d Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 28 Jul 2021 10:54:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8,=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 35 ++++++++----------- .../pages/addEdit.vue | 6 ++-- .../pages/otherAddEit.vue | 2 +- .../pages/projectAddEit.vue | 2 +- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index a04520354..58f1a1b86 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -288,18 +288,7 @@ export default { ProcessFooter, ProcessTitle }, - mounted () { - this.getJsonData() - }, methods: { - getJsonData() { - const params = { - type: '8' - } - startProcess(params).then(res => { - this.taskID = res.data - }) - }, //点击新增事件 addList() { standUnqualified(this.queryUnqualidiedData).then(res => { @@ -383,15 +372,21 @@ export default { } else { this.$refs['roleForm'].validate((valid) => { if (valid) { - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskIds', this.taskID) - completeTask(params).then(res => { - if(res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } + const paramsInfo = { + type: '8' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskIds', this.taskID) + completeTask(params).then(res => { + if(res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + }) }) } }) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 8d81c22bc..853fa1c92 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -973,8 +973,8 @@ export default { return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 > 300) { - this.$message.warning('文件' + file.name + '大小不能超过300M') + if (file.size / 1024 / 1024 > 200) { + this.$message.warning('文件' + file.name + '大小不能超过200M') return false } return true @@ -1403,7 +1403,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + this.drawerTotal = res.data.count }, e => { }) }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index df8f46aec..52da71b0b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1369,7 +1369,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + this.drawerTotal = res.data.count }, e => { }) }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index fc4bc99ef..4dfcc1846 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1368,7 +1368,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + this.drawerTotal = res.data.count }, e => { }) }, From 27ee2370399d5a8449fc3277efa55930c0d30154 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Wed, 28 Jul 2021 11:26:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index da1ae7721..f15f0a7f3 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -59,7 +59,7 @@ align="center"> Date: Wed, 28 Jul 2021 11:30:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug:=20=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=20=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CollectionStandard.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 2c38af157..1724579a5 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -62,7 +62,7 @@ 创建时间：{{getDate(item.creationTime)}} - 取消收藏 + 取消收藏 @@ -150,7 +150,7 @@ export default { }, e => {}) }, // 取消收藏 - cancelStandard (id) { + cancelStandard (item) { this.$confirm('确定取消收藏此数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -158,16 +158,18 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - var json = {} - json.userId = this.$store.getters.userInfo.userId - json.id = id - this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { + // var json = { + // id: item.collectId + // } + // json.userId = this.$store.getters.userInfo.userId + this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, { _this: this }, res => { if (res.ok) { this.$message.success('已取消收藏') this.contentOpen = false this.pageChange(1) + this.selectStandard() } }, e => { })