Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/system/public.js

@@ -8,6 +8,13 @@ export function deptTreeSelect() {
   })
 }
 
+export function handsheDeptTreeSelect() {
+  return request({
+    url: '/system/dept/deptTree/hangshe',
+    method: 'get'
+  })
+}
+
 // 查询文件
 export function getFile(code) {
   return request({

src/components/orgTree/index.vue

@@ -30,7 +30,7 @@
 
 <script>
 import tableListMixins from "@/mixins/tableList";
-import {deptTreeSelect} from "@/api/system/public";
+import {deptTreeSelect,handsheDeptTreeSelect} from "@/api/system/public";
 
 export default {
   name: "orgTree",
@@ -54,6 +54,12 @@ export default {
       defaultKey:null,
     }
   },
+  props:{
+    hangsheTree:{
+      type:Boolean,
+      default:false,
+    }
+  },
   watch: {
     // 根据名称筛选机构树
     deptName(val) {
@@ -70,7 +76,11 @@ export default {
     },
     /** 查询机构下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      let method=deptTreeSelect;
+      if(this.hangsheTree){
+        method=handsheDeptTreeSelect
+      }
+      method().then(response => {
         this.treeList = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.$emit('defaultKey',response.data[0].id);

src/views/core/edu/plan/index.vue

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode"></org-tree>
+                  @click="clickTreeNode" hangsheTree></org-tree>
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">

src/views/resumption/plan/index.vue

@@ -8,6 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
+          hangsheTree
         ></org-tree>
       </el-col>
 
@@ -165,10 +166,10 @@
           :tree-props="{ children: 'children' }"
         >
           <el-table-column
-            type="index"
+            prop="index"
             label="序号"
-            v-if="columns[0].visible"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+            width="80px"
+            v-if="columns[0].visible"            
           ></el-table-column>
           <el-table-column
             prop="planName"
@@ -362,6 +363,7 @@ export default {
         planName: null,
         pageNum: 1,
         pageSize: 10,
+        checkSub:false,
         ...query,
       },
       pageData: [],
@@ -418,8 +420,8 @@ export default {
       api
         .list(this.queryParams)
         .then((response) => {
-          this.pageData = response.data.records;
-          this.total = response.data.total;
+          this.pageData = response.rows;
+          this.total = response.total;
           this.loading = false;
         })
         .catch(() => {

src/views/resumption/rule/index.vue

@@ -8,6 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
+          hangsheTree
         ></org-tree>
       </el-col>