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) {
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;
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c81555022..0cfdaa0bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -596,7 +596,7 @@
-
+