Merge branch 'develop' into FOTON

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -145,9 +145,8 @@ export default {
   watch: {
     value (val) {
       this.tagList = val !== '' && val !== null ? val.split(',') : []
+      // 把日期的时分秒去掉
       this.tagList=this.tagList.map((item)=>item.substring(0,10))
-      console.log("this.tagList",this.tagList);
-
     },
     tagList: {
       handler (val) {

src/components/mechanismTree/index.vue

@@ -23,6 +23,7 @@
           class="filter-tree tree-line"
           :data="treeData"
           :props="defaultProps"
+          icon-class="icon-tree"
           :check-strictly="true"
           :current-node-key="nodeKeyId"
           node-key="id"
@@ -169,6 +170,12 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/ .icon-tree {
+  margin: 0 5px 0 10px;
+  position: relative;
+  background: url('~@/assets/images/shangqi/img/tree-add.png');
+  background-size: 100% 100%;
+}
 /deep/ .el-tree-node__content {
   padding-left: 0px !important;
 }

src/components/roleTree/index.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="roleTree">
         <el-drawer
-            @keyup.enter.native="saveUserInfo"
                 :title="isTitle"
                 :visible.sync="isVisible2"
                 :wrapperClosable="false"
@@ -26,6 +25,7 @@
                     node-key="id"
                     style="height: 100%; overflow: auto;"
                     class="filter-tree tree-line"
+                    icon-class="icon-tree"
                     @check-change="checkChange"
                     :data="treeData"
                     :props="defaultProps"
@@ -48,6 +48,7 @@
                     node-key="id"
                     style="height: 100%; overflow: auto;"
                     class="filter-tree tree-line"
+                    icon-class="icon-tree"
                     :data="treeData1"
                     :props="defaultProps"
                     @check-change="checkChange2"
@@ -250,6 +251,12 @@
 </script>
 
 <style lang="less" scoped>
+/deep/ .icon-tree {
+  margin: 0 5px 0 10px;
+  position: relative;
+  background: url('~@/assets/images/shangqi/img/tree-add.png');
+  background-size: 100% 100%;
+}
     /deep/.el-tree-node__content {
         padding-left: 0px !important;
     }