From 4d143302bcaa7af792e87f7e349af57e75d70474 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 3 Mar 2022 10:29:22 +0800 Subject: [PATCH 1/6] commit --- src/pages/home2/components/solicitopinions/index.vue | 4 ++-- .../regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 882219024..0ed6e33f3 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -83,11 +83,11 @@ export default { }); }, standForComments(item) { - this.$store.commit("setDetailMap", this.$router.path); + this.$store.commit("setDetailMap", this.$router.path); this.$router.push({ name: "consultationDetails", query: { - item: item + item: JSON.stringify(item) } }); } diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 55d748129..40bbb58fe 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -355,7 +355,7 @@ - +
From 93237237a582be1d36bf77819edf8c99157170bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 3 Mar 2022 10:42:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=8A=9E=E7=90=86=20=E8=A7=92=E8=89=B2=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 2 +- .../qbzxdjhgk/component/delay.vue | 2 +- .../qbzxdjhgk/component/establish.vue | 2 +- .../qbzxdjhgk/component/merge.vue | 2 +- .../qbzxdjhgk/component/rename.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 52 +++++++++---------- 6 files changed, 29 insertions(+), 33 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 4d36599a6..99b7c7447 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -380,7 +380,7 @@ export default { } }, mounted(){ - if(!this.qbfsForm.passFlag){ + if(this.qbfsForm.passFlag){ this.qbfsForm = {} } //查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 1c0d82db3..2ff528932 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -401,7 +401,7 @@ export default { } }, mounted(){ - if(!this.qbfsForm.passFlag){ + if(this.qbfsForm.passFlag){ this.qbfsForm = {} } //查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 5f9daec62..a533ba2a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -550,7 +550,7 @@ export default { }, mounted(){ this.getWorkData() - if(!this.qbfsForm.passFlag){ + if(this.qbfsForm.passFlag){ this.qbfsForm = {} } //查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 3f0280a71..8fb2b872e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -712,7 +712,7 @@ export default { } }, mounted() { - if(!this.qbfsForm.passFlag){ + if(this.qbfsForm.passFlag){ this.qbfsForm = {} } //查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index c93a389fb..3950f1b63 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -389,7 +389,7 @@ export default { } }, mounted(){ - if(!this.qbfsForm.passFlag){ + if(this.qbfsForm.passFlag){ this.qbfsForm = {} } this.$http.get('sys/dictype/getDicTypeListCode', '',{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index f6a422859..ed5506ad4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -128,11 +128,11 @@ :color="roleForm.approver ? '#66b1ff' : ''"> -

标准法规部高级经理

+

总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长

- +
@@ -321,7 +321,7 @@ export default { {required: true, message:'请选择标准体系工作组组长', trigger: "change" } ], approverName:[ - {required: true, message:'请选择标准法规部高级经理', trigger: "change" } + {required: true, message:'请选择总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长', trigger: "change" } ], engineerName:[ {required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" } @@ -333,7 +333,7 @@ export default { this.taskId = this.$route.query.taskIds this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { - this.getDatas() + this.getData() } if(this.taskId){ this.approvalFlag = true @@ -368,25 +368,20 @@ export default { getData() { this.formLoading = true this.showFlag = false - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId - }).then(res => { - if (res) { - const processForm = JSON.parse(res.mesg); - this.getFormFieldList(processForm); - } - }).catch(e => { - }); + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.getFormFieldList(mes); }); }, /** * @description: 动态表单读取 */ getFormFieldList(item) { + let type = item.qbfsForm.type this.$nextTick(() => { - switch (item.type){ + switch (type){ case '1': this.comName = "merge" break @@ -403,18 +398,18 @@ export default { this.comName = "establish" break } - this.qbfsForm = item; + this.qbfsForm = item.qbfsForm; this.formLoading = false; - this.roleForm.dockUser = item.dockUser; - this.roleForm.dockUserName = item.dockUserName; - this.roleForm.countersigner = item.countersigner; - this.roleForm.countersignerName = item.countersignerName; - this.roleForm.approver = item.approver; - this.roleForm.approverName = item.approverName; - this.roleForm.engineer = item.engineer; - this.roleForm.engineerName = item.engineerName; - this.roleForm.examine = item.examine; - this.roleForm.examineName = item.examineName; + this.roleForm.dockUser = item.roleForm.dockUser; + this.roleForm.dockUserName = item.roleForm.dockUserName; + this.roleForm.countersigner = item.roleForm.countersigner; + this.roleForm.countersignerName = item.roleForm.countersignerName; + this.roleForm.approver = item.roleForm.approver; + this.roleForm.approverName = item.roleForm.approverName; + this.roleForm.engineer = item.roleForm.engineer; + this.roleForm.engineerName = item.roleForm.engineerName; + this.roleForm.examine = item.roleForm.examine; + this.roleForm.examineName = item.roleForm.examineName; }); }, handleTabs(name) { @@ -437,6 +432,7 @@ export default { //流程保存 handleSave() { let qbzxdFrom = this.$refs["childForm"].qbfsForm; + qbzxdFrom.type = this.toggleType this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') From 63c9142b75bc54fe22131bd21ad05c49b59f0b69 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 3 Mar 2022 10:48:19 +0800 Subject: [PATCH 3/6] commit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index a5865d561..3df4d87dd 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -190,7 +190,7 @@ label="标准名称"> From a4dba4cac6743b03d04ed4bd0a2ace395f986a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 3 Mar 2022 10:58:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index cc5e6c159..910f6e02e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -862,6 +862,7 @@ export default { }else{ for (let i = 0; i < this.dataList.length; i++) { if (this.dataList[i].complianceReasons !== "" || (this.dataList[i].noCompliance !== "" && this.dataList[i].countermeasures !== "" && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) { + this.comFlag = 0; } else { this.comFlag++; } From e42ee6b7635cfb356cbb4df56516b6c3e62979ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 3 Mar 2022 15:15:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=92=8C=E8=B4=A8=E9=87=8F=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/rectificationDatabase.vue | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index aead3de33..aff54465f 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -170,18 +170,6 @@ width="100" label="责任工程师"> - - - -
{{ historySeeForm.dutyEngineerName }}
- -
{{ historySeeForm.authEngineer }}
-
- -
{{ historySeeForm.qaEngineer }}
-
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }} @@ -514,22 +496,6 @@ @click.native="choiceZRR" /> - - - - - - Date: Thu, 3 Mar 2022 15:26:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B=20=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E6=AD=A5=E9=A9=B3=E5=9B=9E=20=20=E7=AC=AC=E4=B8=89=E6=AD=A5?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 12 ++ .../pages/creatProcess/wfhxzg/step1.vue | 149 ++++++++++++++---- .../pages/creatProcess/wfhxzg/step2.vue | 48 ++++++ .../pages/creatProcess/wfhxzg/step3.vue | 1 - .../tabComponents/processCenter/index.vue | 12 ++ 5 files changed, 189 insertions(+), 33 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 688bac9c7..6f2346510 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -970,6 +970,18 @@ export default { prcType: row.prcType } }) + }else if (row.taskInfo === '重新起草') { + this.$router.push({ + name: 'wfhxzgStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + taskAssignee: row.taskAssignee, + prcName: row.prcName, + prcType: row.prcType + } + }) }else { this.$router.push({ name: 'wfhxzgStep5', diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 315f128cc..04fa73d4e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -324,7 +324,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js' +import { + startProcess, + completeTask, + saveTaskFirst, + queryTaskFirst, + taskDel, + processBack, + inboundLiaisonDetail +} from "@/api/process.js"; import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js' export default { @@ -332,6 +340,7 @@ export default { data() { return { loading: false, + submitFlag: '', //是否是修改节点 commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 @@ -367,6 +376,7 @@ export default { dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] }, nodeList: [], + hisListForm:{}, drawerTitle: '', //drawer标题 modalshowflag: false, // drawer开关 treeData: [], // 人员数据 @@ -388,8 +398,39 @@ export default { if (this.bpnId !== undefined) { this.getData() } + if(this.$route.query.taskIds){ + //被驳回时调用 + this.getHistoryData() + } }, methods: { + getHistoryData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + } + }).catch(e => { + }) + }) + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + item.commentText = '' + this.$nextTick(() => { + this.hisListForm = JSON.parse(JSON.stringify(item)) + this.submitFlag = '修改节点' + this.dataList = item.dockUserList[0].standardInfoList + this.roleForm.dockUserName = this.dataList[0].engineer + this.roleForm.dockUser = this.dataList[0].engineerId + }) + }, getData() { queryTaskFirst({ bpnId: this.$route.query.bpnId @@ -557,6 +598,7 @@ export default { prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUserName: this.$store.getters.userInfo.userName, engineer: this.roleForm.dockUser, + engineerName: this.roleForm.dockUserName, standardInfoList: this.dataList, commentText: this.commentText } @@ -566,43 +608,86 @@ export default { if (this.roleForm.dockUserName === '') { this.$message.warning('请完善人员信息') } else { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - let paramsInfo = new FormData() - // paramsInfo.append('id', this.bpnId || '') - paramsInfo.append('createUser', this.$store.getters.userInfo.userId) - paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) - paramsInfo.append('type', '8') - paramsInfo.append('json', JSON.stringify({ - roleForm: this.roleForm, - dataList: this.dataList, - commentText: this.commentText - })) - processBack(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('提交成功') - if (this.bpnId !== '') { + if(!this.submitFlag){ + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + let paramsInfo = new FormData() + // paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '8') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + })) + processBack(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('提交成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + } + this.$router.push("/processCenter"); + } + this.isSubmit = false + }) + }) + } + }) + }else{ + this.$refs["roleForm"].validate((valid) => { + if (valid) { + let specialJson = { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: "8", + json: { + standardInfoList: this.dataList, + roleForm: this.roleForm, + commentText: this.commentText + } + }; + this.$http.post("lawss/activiti/completeTaskNew", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json), + specialJson: JSON.stringify(specialJson) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + if (this.bpnId !== "") { let taskId = { id: this.bpnId - } + }; taskDel(taskId).then(res => { - return res - }) + return res; + }); } this.$router.push("/processCenter"); } - this.isSubmit = false - }) - }) - } - }) + this.isSubmit = false; + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } + } } }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 17b5d11e6..afef73ef0 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -150,9 +150,11 @@ show-save show-submit show-transfer + show-back :submitLoading="isSubmit" :saveLoading="saveLoading" :transferLoading="turnLoading" + @back="beforeBack" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -277,6 +279,7 @@ export default { }) }, getFormFieldList (item) { + console.log(item); this.$nextTick(() => { if (item.passInfo !== undefined) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo @@ -336,6 +339,50 @@ export default { this.saveLoading = false }) }, + //驳回按钮 + beforeBack(){ + if(!this.commentInfo){ + this.$message.warning('请填写审批意见') + }else{ + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleInfoId) + if( a == null){ + a = { + id: lastDataListElement.dutyPeopleInfoId, + name: lastDataListElement.dutyPeopleInfo, + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = []; + for(let item of zqa) { + list.push(item[1]) + } + let json = { + dockUserList: list, + passInfo: this.passInfo, + passFlag: '1', + commentText: this.commentInfo + } + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskIds', this.taskIds) + completeTask(params).then(res => { + if(res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }).catch(e => { + this.isSubmit = false + }) + } + + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -359,6 +406,7 @@ export default { let json = { dockUserList: list, passInfo: this.passInfo, + passFlag: '0', commentText: this.commentInfo } let flag=false diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 3b6e54bf1..9b7eaca53 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -152,7 +152,6 @@