Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/DatePicker.vue

@@ -14,7 +14,7 @@
         :value-format="valueFormat"
         format="yyyy-MM-dd"
         :value="value"
-        type="date"
+        type="dates"
         :editable="true"
         :disabled="disabled"
         :placeholder="placeholder"
@@ -74,5 +74,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-input__inner {
+  padding-left: 30px;
+}
 </style>

src/components/treeSelect/treeSelectNew.vue

@@ -175,7 +175,7 @@
 
                 if (node.level >= 1) {
                     setTimeout(() => {
-                        this.getChildByList(node.data.level,node.data.vppsCode, resolve);
+                        this.getChildByList(node.data.level,node.data.id, resolve);
                     }, 500);
                     return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
                 }
@@ -192,8 +192,8 @@
                     }
                 })
             },
-            getChildByList( level,vppsCode,resolve) {     // 获取子节点请求
-                let params = {level : level,vppsCode :vppsCode,type : this.type};
+            getChildByList( level,id,resolve) {     // 获取子节点请求
+                let params = {level : level,id :id,type : this.type};
                 this.$http.get(this.urlChild, params, {
                     _this: this
                 }, res => {