From 279c07ff97158d45213d45b41dd71eea24fa90b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 16 Aug 2021 16:30:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 19 ++- .../pages/creatProcess/bzqdfb/step1.vue | 21 ++- .../pages/creatProcess/xmpg2/step1-1.vue | 136 +++++++++--------- .../pages/creatProcess/xmpg2/step1.vue | 89 ++++++------ .../pages/creatProcess/xmpg2/step5.vue | 69 ++++----- .../pages/details.vue | 23 ++- .../pages/rectificationDatabase.vue | 1 + 7 files changed, 206 insertions(+), 152 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index f914cb989..161d06192 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -26,7 +26,7 @@ 国家/地区清单 - 项目清单 + 车型类别清单 其他清单 @@ -377,7 +377,7 @@ align="center"> @@ -947,6 +947,20 @@ export default { _this: this }, res => { this.sarAccessListDatas = res.data.records; + this.sarAccessListDatas.forEach(item =>{ + // 适用车型转换 + if (item.carType !== null) { + let k = (item.carType || "").split(',') + for (let i in this.energyKindOptions) { + for (let m = 0; m< k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label + } + item.carType = k.join(',') + } + } + } + }) this.total = res.data.total; }, e => { }); @@ -1384,6 +1398,7 @@ export default { this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { + this.energyKindOptions = res.data.ENERGYTYPES //适用车型 this.countryOptions = res.data.COUNTRY; this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.setMap(this.standStateOptions); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index b30151c13..29e7e318c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -26,7 +26,7 @@ 国家/地区清单 - 项目清单 + 车型类别清单 其他清单 @@ -380,8 +380,8 @@ align="center"> { this.sarAccessListDatas = res.data.records; + this.sarAccessListDatas.forEach(item =>{ + // 适用车型转换 + if (item.carType !== null) { + let k = (item.carType || "").split(',') + for (let i in this.energyKindOptions) { + for (let m = 0; m< k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label + } + item.carType = k.join(',') + } + } + } + }) this.total = res.data.total; }, e => { }); @@ -1359,6 +1373,7 @@ export default { this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { + this.energyKindOptions = res.data.ENERGYTYPES //适用车型 this.countryOptions = res.data.COUNTRY; this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.setMap(this.standStateOptions); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 6f7d8b764..8359b012e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -30,7 +30,6 @@ @@ -38,7 +37,6 @@ @@ -68,8 +66,10 @@ label="标准号" > @@ -368,13 +366,13 @@ export default { active: "1", //当前选中的type isSubmit: false, saveLoading: false, - commentText: '', + commentText: "", //表单的数据 listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 - breakdownList: [], //标准下的分解单数据 + breakdownList: [] //标准下的分解单数据 }, dataList: [], //下面标准的数据 breakdownList: [], //标准下的条款数据 @@ -461,8 +459,8 @@ export default { _this: this }, res => { this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total }); - }, //点击清空按钮事件 clearSearch() { @@ -514,7 +512,7 @@ export default { { _this: this }, res => { - this.listForm.breakdownList = res.data + this.listForm.breakdownList = res.data; }); }, //标准的多选框改变 @@ -528,79 +526,83 @@ export default { }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', + name: "OtherStandardDetails", params: { id: item.standId, - pageType: 'INLAND_STAND' + pageType: "INLAND_STAND" } - }) - window.open(routeUrl.href, '_blank') + }); + window.open(routeUrl.href, "_blank"); }, pageSizeChange(pageSize) { }, //流程保存事件 - handleSave(){ - this.saveLoading = true - let _formData = new FormData() - _formData.append('id', this.bpnId || '') - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '6') - _formData.append('json', JSON.stringify({ + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("createUser", this.$store.getters.userInfo.userId); + _formData.append("createUserName", this.$store.getters.userInfo.userName); + _formData.append("prcType", "6"); + _formData.append("json", JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText - })) + })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false - this.$message.success('保存成功') - this.bpnId = res.result + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; }).catch(e => { - this.saveLoading = false - }) + this.saveLoading = false; + }); }, //流程提交事件 - handleSubmit(){ - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm) - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standId = this.listForm.standId; - this.$refs['listForm'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); + handleSubmit() { + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + } }, choiceZRR(type, title, id) { this.nodeList = []; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 93412800f..f5c6021b1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -450,10 +450,10 @@ export default { }, { _this: this }, res => { - if(res.data === null){ - this.ProjectDatas = '' - this.total = 0 - }else{ + if (res.data === null) { + this.ProjectDatas = ""; + this.total = 0; + } else { this.ProjectDatas = res.data.Maintenance.records; this.total = res.data.Maintenance.total; } @@ -491,7 +491,6 @@ export default { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { _this: this }, res => { - console.log(res.data.records); this.listForm.dataList = res.data.records; this.dataList = res.data.records; this.listForm.dataList.forEach(item => { @@ -525,7 +524,7 @@ export default { { _this: this }, res => { - this.listForm.breakdownList = res.data; + this.listForm.breakdownList = res.data; }); }, //标准的多选框改变 @@ -564,43 +563,47 @@ export default { }, //流程提交事件 handleSubmit() { - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standId = this.listForm.standId; - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + } }, // 点击查看 handlePreview(item) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 2828bd0e0..421f5c544 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -44,7 +44,8 @@
- 批量分发责任人 + 批量分发责任人 +
- - - - - + + + + + @@ -259,7 +260,7 @@ export default { userId: this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - selectedId:'', + selectedId: "" }; }, methods: { @@ -322,6 +323,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -413,9 +415,9 @@ export default { }, e => { }); }, - //批量分发按钮 + //批量分发按钮 choiceZRRS(row, type, index) { - this.selectedId=row.id + this.selectedId = row.id; this.type = type; if (type === 1) { this.drawerTitle = "选择责任人"; @@ -458,36 +460,37 @@ export default { //单选操作 if (this.type === 1) { this.dataList.forEach(item => { - if(item.children){ + if (item.children) { item.children.forEach(items => { - if(items.id === this.selectedId){ - items.workPeople = data[0].name - items.workPeopleId = data[0].id - // this.$set(items,'workPeople',data[0].name) - //this.$set(items,'workPeopleId',data[0].id) - } - }) + if (items.id === this.selectedId) { + items.workPeople = data[0].name; + items.workPeopleId = data[0].id; + // this.$set(items,'workPeople',data[0].name) + //this.$set(items,'workPeopleId',data[0].id) + } + }); } - }) - this.dataList = JSON.parse(JSON.stringify(this.dataList)) + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); } else if (this.type === 2) { - this.selectList.forEach(item =>{ - this.dataList.map(items=>{ - if(item.id==items.id){ - items.workPeople = data[0].name - items.workPeopleId = data[0].id + this.selectList.forEach(item => { + this.dataList.map(items => { + if (item.id == items.id) { + items.workPeople = ""; + items.workPeopleId = ""; + this.$message.warning('您只能针对条款进行分发') } - if(items.children.length){ - items.children.map(childrenItem=>{ - if(childrenItem.id==item.id){ - childrenItem.workPeople = data[0].name - childrenItem.workPeopleId = data[0].id + if (items.children.length) { + items.children.map(childrenItem => { + if (childrenItem.id == item.id) { + childrenItem.workPeople = data[0].name; + childrenItem.workPeopleId = data[0].id; } - }) + }); } - }) - }) - this.dataList = JSON.parse(JSON.stringify(this.dataList)) + }); + }); + this.dataList = JSON.parse(JSON.stringify(this.dataList)); } this.modalshowflag = false; }, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 3b1616db0..c56b05480 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -188,7 +188,7 @@ @@ -236,7 +236,7 @@ align="center"> @@ -497,7 +497,7 @@ export default { localProLib: {}, // 查询相关参数 sarSarAccessEOSearch: { - projectName: "", + carType: "", detailedListName: "", }, takeingFlag: false, @@ -525,7 +525,7 @@ export default { this.getStand() }, clearSearchAccess(){ - this.sarSarAccessEOSearch.projectName = '' + this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.detailedListName = '' this.transfer() }, @@ -593,6 +593,20 @@ export default { _this: this }, res => { this.sarAccessListDatas = res.data.records; + this.sarAccessListDatas.forEach(item =>{ + // 适用车型转换 + if (item.carType !== null) { + let k = (item.carType || "").split(',') + for (let i in this.energyKindOptions) { + for (let m = 0; m< k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label + } + item.carType = k.join(',') + } + } + } + }) this.sarSarAccessEOSearch.page = 1 this.totalNo = res.data.total this.detailedListModel = true @@ -937,6 +951,7 @@ export default { _this: this, loading: 'loading' }, res => { + this.energyKindOptions = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.setMap(this.zrbmMap, res.data.ZRBMCLASS) this.setMap(this.textStatusMap, res.data.WBZTCLASS) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 8850b9076..b9a65f2d9 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -459,6 +459,7 @@ export default { }, res => { this.myLoading.loadData = false this.total = res.data.total + this.pageNo = 1 this.nonList = res.data.records this.nonList.forEach(item => { // 责任部门转换 From 7561656166e5212586a883442145d9937c55bb91 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 16 Aug 2021 17:59:50 +0800 Subject: [PATCH 2/3] commit --- .../pages/standInvolveProjectDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 3e6968c6b..b82a765f5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -129,7 +129,7 @@ class="common-button-primary" size="mini" v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'" - @click="querySarProStateZero">查询 + @click="querySarProStateZero(1)">查询 From e9f64211939dd65c5ce7bfdfc42edf8f78b1f1b8 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 23:40:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=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=20=E5=85=A5=E5=88=B0=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=EF=BC=8C=E8=B4=A8=E9=87=8F=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=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 --- .../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 b9a65f2d9..612bd54e5 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -176,17 +176,17 @@ label="责任部门">