From 795c722ebcc1304458949c2ed0362bfe847cc4cd Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 16 Aug 2021 11:27:02 +0800 Subject: [PATCH 01/11] =?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=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 4 ---- .../pages/addEdit.vue | 20 ++++++++++--------- .../pages/otherAddEit.vue | 19 +++++++++--------- .../pages/projectAddEit.vue | 20 +++++++++++-------- 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d9fbcfd23..b30151c13 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -994,8 +994,6 @@ export default { }, // 点击批量删除事件 deleteList() { - console.log(this.selectList); - console.log(this.dataList); if (this.selectList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -1011,10 +1009,8 @@ export default { index = this.dataList.findIndex(items => { return items.id === item; }); - console.log(index); if (index > -1) { this.dataList.splice(index, 1); - console.log(this.dataList); } exits.push(item); }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 039d01430..5355d49b4 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -177,8 +177,8 @@ prop="code" show-overflow-tooltip fixed="left" - width="180px" align="center" + width="180px" label="标准号"> - - - - - + + + + + @@ -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 => { // 责任部门转换