From 500fdb920a32cf96e87c6999b7bd0d36b93f81b4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 13 Aug 2021 17:08:03 +0800 Subject: [PATCH 1/4] feat: There is no way the --- src/pages/searchCenter/pages/standardSearch.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index ee9ce00ec..cc2b2a429 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -2533,6 +2533,11 @@ /deep/.highlight-class { color: red !important; } + /deep/.pagination{ + position: static !important; + border-bottom-right-radius: 20px; + border-bottom-left-radius: 20px; + } .standard-search { padding: 6px 26px; @borderColor: #BFBFBF; @@ -2849,11 +2854,6 @@ } } } - .pagination{ - position: static; - border-bottom-right-radius: 20px; - border-bottom-left-radius: 20px; - } } } .content-right{ From fb7cf361752d433908a72d6f429c5054287c216c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 13 Aug 2021 17:30:58 +0800 Subject: [PATCH 2/4] commit --- .../pages/creatProcess/bzdy/step4.vue | 1 - .../pages/creatProcess/bzjd/step2.vue | 22 ++++++++----- .../pages/creatProcess/bzjd/step3.vue | 33 +++++++++++++++---- .../pages/creatProcess/bzjd/step4.vue | 10 +++--- .../pages/creatProcess/bzjd/step5.vue | 10 +++--- .../pages/creatProcess/bzjd/step6.vue | 10 +++--- .../pages/creatProcess/bzzqyj/step2.vue | 1 - .../pages/creatProcess/bzzqyj/step5.vue | 1 - 8 files changed, 54 insertions(+), 34 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d991f2dac..1ce3a071e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,7 +252,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index c89b69426..0c8c81b6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -333,13 +333,12 @@ this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) - _formData.append('pId', this.pId) _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText, itemList: this.itemList, - sarType: this.sarType + standInData: this.sarType })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -394,14 +393,19 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data - var arr = [] - arr = JSON.parse(data.itemList) + let arr + if (typeof(data.itemList) === 'string') { + arr = JSON.parse(data.itemList) + } else { + arr = data.itemList + } arr.forEach(item => { item.zxUserId = '' item.zxUserIdName = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index e953869f4..6151086e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -288,6 +288,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -558,11 +576,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data let itemList if (typeof (data.itemList) == 'string') { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 6b90b2415..68fabb96b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 834bc18af..f71fe132b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 67a6dabe4..a9b831392 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -377,11 +377,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 0804ddc82..895b38f72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -263,7 +263,6 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - console.log(data); }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index b5642945f..ba084d8ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -317,7 +317,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname From 76d4cf782e118fae34a6f04784c71f80a0f98337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 13 Aug 2021 21:34:18 +0800 Subject: [PATCH 3/4] commit --- .../processCenter/pages/creatProcess/bzqdfb/step1-1.vue | 2 +- .../processCenter/pages/creatProcess/bzqdfb/step1-3.vue | 2 +- .../processCenter/pages/creatProcess/bzqdfb/step1.vue | 6 +++++- .../processCenter/pages/creatProcess/bzqdfb/step3.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/xmpg/step1-1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg/step1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 9 +++++++-- .../processCenter/pages/creatProcess/xmpg2/step5.vue | 1 + .../accessStandardsAndRegulations/pages/addEdit.vue | 4 ++-- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 4 ++-- .../pages/projectAddEit.vue | 4 ++-- .../localProductsOrProjectLibrary/pages/details.vue | 7 ++++++- 13 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index b5a354cbf..f914cb989 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1035,7 +1035,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 7551a83f2..29e3b1b73 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -595,7 +595,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index bb41705bd..d9fbcfd23 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -994,6 +994,8 @@ export default { }, // 点击批量删除事件 deleteList() { + console.log(this.selectList); + console.log(this.dataList); if (this.selectList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -1007,10 +1009,12 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + 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/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 3fc280f48..04d2e535d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -598,7 +598,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index d3f760def..dce75e757 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -394,7 +394,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); @@ -430,7 +430,7 @@ export default { this.selectedList.map(item => { let addList; addList = this.dataList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 454d4c8bc..c38ec4a01 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -631,7 +631,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 1d9ea32d5..3f3b33a3b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -605,7 +605,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.productLine = item; + return items.productLine === item; }); if (index > -1) { this.dataList.splice(index, 1); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 296f65bc7..93412800f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -450,8 +450,13 @@ export default { }, { _this: this }, res => { - this.ProjectDatas = res.data.Maintenance.records; - this.total = res.data.Maintenance.total; + if(res.data === null){ + this.ProjectDatas = '' + this.total = 0 + }else{ + this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; + } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index d53cb2820..80c2f261d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -421,6 +421,7 @@ export default { //标准表格选择框改变 selectStandChange(data) { this.selectList = data; + console.log(this.selectList); }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 0b3225713..c591e0cb6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1124,7 +1124,7 @@ export default { this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1211,7 +1211,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index ce62849a4..a3ced34d9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1093,7 +1093,7 @@ export default { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1183,7 +1183,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 31fa260f8..ac931a8aa 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1092,7 +1092,7 @@ export default { this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id + return items.id === item.id }) if(addList > -1){ // this.$refs.accessTypeSelect.clearSelection() @@ -1182,7 +1182,7 @@ export default { this.sarAccessInfoListArry.map(item => { let index index = this.sarAccessInfoList.findIndex(items => { - return items.id = item + return items.id === item }) if (index > -1) { this.sarAccessInfoList.splice(index, 1) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 03148760b..3b1616db0 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -631,7 +631,7 @@ export default { this.selectList.map(item => { let index; index = this.dataList.findIndex(items => { - return items.id = item; + return items.id === item; }); if (index > -1) { this.dataList.splice(index, 1); @@ -743,6 +743,11 @@ export default { }, { _this: this }, res => { + if(res.data === null){ + this.standardData = '' + this.totalDo ='' + this.standModel = true; + } this.standardData = res.data.records this.totalDo = res.data.total this.standModel = true; From 1217719f7aa1619a21cbb430e72242cd8e05f461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 13 Aug 2021 23:03:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step5.vue | 118 ++++++++++-------- 1 file changed, 64 insertions(+), 54 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 80c2f261d..2828bd0e0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -44,7 +44,7 @@
- 批量分发责任人 + 批量分发责任人
-