From ddef09c7518ed3c10cd1bd5bf83a484614275672 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Fri, 1 Apr 2022 17:51:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052212=20=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E8=A6=81=E8=83=BD=E8=B7=B3=E8=BD=AC=E8=87=B3=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listTracking.vue | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index f9c6e5e90..241173801 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -83,13 +83,18 @@ width="250" label="标准编号/政策编号" align="center"> + + width="300px"> + { From c5123a8cc29e7ee441f42ddc66f6221a7d75f3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 09:54:24 +0800 Subject: [PATCH 2/8] =?UTF-8?q?52379=20=E6=A0=87=E5=87=86=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E6=AC=A1=E9=A9=B3=E5=9B=9E=EF=BC=8C=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E5=86=8D=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9=EF=BC=88?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AD=A5=EF=BC=89=EF=BC=8C=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzpg/step1.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index f40f73e50..0ae38b787 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -533,6 +533,10 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, + qualityEngineer: '', + qualityEngineerName: '', + certifiedEngineer: '', + certifiedEngineerName: '', fileType: "", subFlag: 0, projectSearch: { @@ -698,6 +702,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { + console.log(item); this.$nextTick(() => { if(item.form){ this.hisListForm = JSON.parse(JSON.stringify(item.form)) @@ -735,6 +740,10 @@ export default { this.roleForm.dockUserName = item.dockUserName this.roleForm.ministerUser = item.ministerUser this.roleForm.ministerUserName = item.ministerUserName + this.certifiedEngineer = item.certifiedEngineer + this.certifiedEngineerName = item.certifiedEngineerName + this.qualityEngineerName = item.qualityEngineerName + this.qualityEngineer = item.qualityEngineer this.submitFlag = '修改节点' this.dataList.distributePerson = this.listForm.dataList[0].distributePerson this.$http.get("SarStandItems/sar-stand-items/getFileType", { @@ -1025,6 +1034,10 @@ export default { } }; this.listForm.dataList = this.dataList + this.listForm.qualityEngineer = this.qualityEngineer ? this.qualityEngineer : this.listForm.qualityEngineer + this.listForm.qualityEngineerName = this.qualityEngineerName ? this.qualityEngineerName : this.listForm.qualityEngineerName + this.listForm.certifiedEngineer = this.certifiedEngineer ? this.certifiedEngineer : this.listForm.certifiedEngineer + this.listForm.certifiedEngineerName = this.certifiedEngineerName ? this.certifiedEngineerName : this.listForm.certifiedEngineerName let json = this.listForm this.$http.post("lawss/activiti/completeTaskNew", { taskIds: this.$route.query.taskIds, From fdb594f0c610016ffa3ab0919b98a77c70134526 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 10:35:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052234=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E5=AE=8C=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=91=98=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=90=A7=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=92=8C=E9=83=A8=E9=97=A8=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index cd07387e3..576bd880a 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -689,6 +689,10 @@ export default { if (data.length > 0) { this.editForm.fillPeopleId = data[0].id this.editForm.fillPeople = data[0].name + this.editForm.fillUnit = data[0].unit + this.editForm.fillDept = data[0].institutionName + this.editForm.fillTel = data[0].phone + this.editForm.fillMail = data[0].email } this.roleShowflag = false }, From f3f8e451f3b133f32785f26a67a6c37849d93925 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 11:15:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9B=BD=E5=86=85=20=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 8 +++ .../pages/details.vue | 50 ++++++++++++++++--- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index fd83b43bf..4cdab4b68 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -43,6 +43,14 @@ export function StandardsInfoPage(data) { }); } +export function selectHighLawsById(data) { + return axios({ + url: "api/sarStandardsInfo/sar-standards-info/selectHighLawsById", + method: "get", + params: data + }); +} + // 车型库清单的下拉列表 export function solostarData(data) { return axios({ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 4f76138e5..0deb91efd 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -458,7 +458,7 @@ import { interfaceUrl } from "@/sysConfig"; import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import CustomSelectArray from "@/components/CustomFormComponents/SelectArray"; -import { StandardsInfoPage } from "api/unqualProcess"; +import { StandardsInfoPage, selectHighLawsById } from "api/unqualProcess"; export default { name: "AccessStandardDetails", @@ -648,24 +648,60 @@ export default { }*/ this.sarAccessInfo = formData this.showQueryMore = false - this.selectLawsStands() + this.selectLawsStands(1) }, // 查询数据搜索 table 数据 - selectLawsStands() { + selectLawsStands(type) { if (this.sarAccessInfo.dataSource === 'INLAND_STAND') { this.sarAccessInfo.standType = 'INLAND' - this.pageInfo() + if (type === 1) { + this.seniorPageInfo() + } else { + this.pageInfo() + } } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') { this.sarAccessInfo.standType = 'FOREIGN' - this.pageInfo() + if (type === 1) { + this.seniorPageInfo() + } else { + this.pageInfo() + } } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') { this.sarAccessInfo.standType = 'LAWS' - this.pageInfo() + if (type === 1) { + this.seniorPageInfo() + } else { + this.pageInfo() + } } else if (this.sarAccessInfo.dataSource === 'BUSINESS') { this.sarAccessInfo.standType = 'BUSINESS' - this.pageInfo() + if (type === 1) { + this.seniorPageInfo() + } else { + this.pageInfo() + } } }, + seniorPageInfo() { + this.sarAccessInfo.qdFlag = '1' + this.sarAccessInfo.qdid = this.$route.params.id + selectHighLawsById((this.sarAccessInfo)).then(res => { + this.standinfoList = res.data.list + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + item.zrbm = item.attrInfoCaseMap.zrbm + item.sycpx = item.attrInfoCaseMap.sycpx + item.typeApplicable = item.attrInfoMap.CLLX + item.nylx = item.attrInfoMap.NYLX + }) + this.total = res.data.count + }, e => { + }) + }, pageInfo() { if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') { StandardsInfoPage((this.sarAccessInfo)).then(res => { From b9245c75efb2ca46796a2eae72bd45ddda413dad Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Sat, 2 Apr 2022 11:21:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 0deb91efd..6d071e387 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -683,6 +683,7 @@ export default { } }, seniorPageInfo() { + this.sarAccessInfo.standType = '' this.sarAccessInfo.qdFlag = '1' this.sarAccessInfo.qdid = this.$route.params.id selectHighLawsById((this.sarAccessInfo)).then(res => { From ea57cc3ca105b8e0864eeb6df008855a2295be3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 13:50:26 +0800 Subject: [PATCH 6/8] =?UTF-8?q?52382=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=84=8F=E8=A7=81=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=8A=A5=E6=89=B9=E8=8A=82=E7=82=B9=EF=BC=8C=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step4.vue | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 12eea8b0b..eb0a73603 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -256,9 +256,11 @@ @@ -340,7 +342,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process' +import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew, saveTaskForPub } from "api/process"; import axios from "axios"; export default { @@ -616,6 +618,29 @@ export default { handleTabs(name) { this.active = name }, + //保存事件 + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + let json = this.json + json.info = this.data + json.spId = this.form.spId + json.spName = this.form.spName + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "3"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: json, + commentText: this.commentText4 + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -668,6 +693,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true @@ -678,16 +704,18 @@ export default { } this.commentText4 = data.commentText4 || '' this.form.fjList = data.fjList || data.form.fjList + this.form.spId = data.form ? data.form.spId : '' + this.form.spName = data.form ? data.form.spName : '' + this.form.startUser = data.form ? data.form.startUser : data.startUser + this.form.startUserName = data.form ? data.form.startUserName : data.startUserName this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.spId = data.spId || '' - this.form.spName = data.spName || '' - this.json = data + this.json = data.form ? data.form : data this.standId = data.standId this.getItemList(data.standId,data.textType) - this.data = data.info || data.data + this.data = data.info || data.form.info }).catch(e => { }) }) From d352f2ace9da100a179622cdb8cbe479bc7bf818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 13:51:30 +0800 Subject: [PATCH 7/8] =?UTF-8?q?52384=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=84=8F=E8=A7=81=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9=20=E6=97=A0=E6=B3=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=88=86=E7=BA=BF=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 7471c5d4d..8ea4d056a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -378,6 +378,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText2 = data.commentText2 || '' + this.form.startUserName = data.form ? data.form.startUserName : data.startUserName + this.form.startUser = data.form ? data.form.startUser : data.startUser this.form.cid = data.form ? data.form.cid : data.cid this.form.endTime = data.form ? data.form.endTime : data.endTime this.form.fjList = data.form ? data.form.fjList : data.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index bcaf57f6f..bbdfbec0b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -704,6 +704,8 @@ this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.textType = data.form ? data.form.textType : data.textType + this.form.startUser = data.form ? data.form.startUser : data.startUser + this.form.startUserName = data.form ? data.form.startUserName : data.startUserName this.form.cid = data.form ? data.form.cid : data.cid this.form.endTime = data.form ? data.form.endTime : data.endTime this.todoId = res.id From bddf777418aedc8b5841774592650e09df5d2da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 2 Apr 2022 13:53:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?52387=20=E9=A1=B9=E7=9B=AE=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=B7=B2?= =?UTF-8?q?=E5=8F=91=E6=B5=81=E7=A8=8B=E7=9A=84=E6=9F=A5=E7=9C=8B=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E8=83=BD=E5=A1=AB=E5=86=99=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue index 7b845f766..3712d6b7e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue @@ -181,6 +181,7 @@