From eae8ffeaad746217d3d7a6f6637e60376a55f29e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 21 Nov 2021 15:00:05 +0800
Subject: [PATCH 1/3] commit
---
src/pages/localTool/standardWarning.vue | 123 +++++++++++++++---------
1 file changed, 76 insertions(+), 47 deletions(-)
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 074d1edef..b55aa66a9 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -12,51 +12,78 @@
实施预警
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
- 清空
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新车型实施日期预警
@@ -602,7 +629,8 @@ export default {
//标准名称
standName: this.dynamic.standName,
//实施日期
- putTime: this.dynamic.putTime,
+ putTime: this.dynamic.putTime[0],
+ lastTime: this.dynamic.putTime[1],
//适用车型
applyType: this.dynamic.applyType
}, {
@@ -1043,6 +1071,7 @@ export default {
}
.more {
+ width: 100%;
margin-top: 30px;
/deep/ .el-input__inner {
width: 155px;
@@ -1050,7 +1079,7 @@ export default {
.choose-time-area {
/deep/ .el-input__inner {
- width: 170px;
+ width: 220px;
}
}
From f4e39d5ac216c0ae5f3464c8987977cc05f5669e Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Sun, 21 Nov 2021 15:33:04 +0800
Subject: [PATCH 2/3] commit
---
src/components/roleTree/index.vue | 32 +++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 7434afef8..c521386bf 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -26,6 +26,7 @@
style="height: 100%; overflow: auto;"
class="filter-tree tree-line"
:class="treeClass"
+ @check-change="checkChange"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
@@ -116,15 +117,25 @@
}
},
methods: {
+ checkChange (row, type, c) {
+ if (!type) {
+ if (this.nodeList.length > 0) {
+ for (let a = 0; a < this.nodeList.length; a ++) {
+ if (row.id === this.nodeList[a]) {
+ this.nodeList.splice(a, 1)
+ }
+ }
+ }
+ }
+ },
treeClass () {
-
},
handleTreeDrawerCancel () {
this.filterText = ''
this.isVisible2 = false
},
saveUserInfo () {
- if (this.nodeList.length) {
+ if (this.nodeList.length > 0) {
let ids = ''
this.nodeList.forEach(item => {
if (ids.length > 0) {
@@ -134,18 +145,27 @@
ids = item
}
})
- let oldList = []
this.$http.get('SarInstitution/institution/getNextById', {
ids: ids
}, {
_this: this
}, res => {
- oldList = res
+ let oldList2 = res.concat(this.roleList)
+ let result = []
+ let obj = {}
+ for(let i = 0; i < oldList2.length; i++){
+ if(!obj[oldList2[i].id]){
+ result.push(oldList2[i]);
+ obj[oldList2[i].id] = true;
+ }
+ }
+ this.isVisible2 = false
+ this.$emit('checkedRole', result)
})
} else {
+ this.isVisible2 = false
+ this.$emit('checkedRole', this.roleList)
}
- this.isVisible2 = false
- this.$emit('checkedRole', this.roleList)
},
drawerCheck (data) {
if (this.checkBox) {
From 73acf4d7920a55c25ffd075a157b57cb5072e96a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 21 Nov 2021 16:03:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=85=B3=E8=81=94?=
=?UTF-8?q?=E6=9D=A1=E6=AC=BE,=E5=85=B3=E8=81=94=E6=88=90=E5=8A=9F?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/details/otherStandardDetails/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 8557d1325..d414d8724 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3024,7 +3024,13 @@
this.$refs['relatedTermsSelect'].handleSubmit(() => {
this.selectSarStandItems()
this.btnLoading = false
+ this.$message({
+ message: '关联成功',
+ type: 'success'
+ });
})
+
+
},
closeRelatedTermsDrawer() {
this.$refs['relatedTermsDrawer'].closeDrawer()