浏览代码

Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

 Conflicts:
	src/views/system/bind/index.vue
zhulu 1 年之前
父节点
当前提交
2f6436f5f3
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      src/views/system/bind/index.vue
  2. 4 3
      src/views/system/dept/extend.vue

+ 1 - 1
src/views/system/bind/index.vue

@@ -395,7 +395,7 @@ export default {
   },
 
   created() {
-   this.getDeptTree();
+    this.getDeptTree();
   },
 
   methods: {

+ 4 - 3
src/views/system/dept/extend.vue

@@ -511,6 +511,8 @@
   import {selectCityInfoVoList} from "@/api/core/weather";
   import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
 export default {
+  fillter: {},
+
   dicts: [
   "duty_options",
     "sys_org_type",
@@ -525,10 +527,9 @@ export default {
     "org_extend_detached_standard",
     "org_extend_is",
     "property_situation",
+  
   ],
 
-  fillter: {},
-
   components: {
     ImgsUpload,
     "el-image-viewer": () =>
@@ -1559,4 +1560,4 @@ export default {
   }
 
 
-</style>
+</style>