Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/accessPlan/index.vue

@@ -3,9 +3,8 @@
     <el-row :gutter="20">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
-
-        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" businessTree></org-tree>
+                  <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
+                    @click="clickTreeNode"></org-tree>
       </el-col>
       <!--搜索栏-->
 
@@ -106,7 +105,10 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/> -->
+                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
       </el-col>
@@ -235,6 +237,7 @@
           description: null,
           isDeleted: null,
           isDistribute: null,
+          checkSub: true
         },
         // 表单参数
         form: {},
@@ -281,7 +284,7 @@
         listPlan(this.queryParams).then(response => {
           this.planList = response.data.rows;
           this.check=response.check;
-          this.total = response.total;
+          this.total = response.data.total;
           this.loading = false;
         });
       },

src/views/system/user/index.vue

@@ -118,7 +118,7 @@
             <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-plus" @click="handleExtend(scope.row)"
-                  v-hasPermi="['system:user:extend']" v-if="check == true">补充信息</el-button>
+                  v-hasPermi="['system:user:extend']" v-if="scope.row.isManage == 'Y'">补充信息</el-button>
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:user:edit']" >编辑</el-button>
                 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -208,7 +208,7 @@
 
           </el-col>
           <el-col :span="10">
-            <el-form-item label="是否管理人员">
+            <el-form-item label="是否管理人员" label-width="180">
               <el-radio-group v-model="form.isManage">
                 <el-radio v-for="dict in dict.type.sys_yes_no" :key="`${dict.value}`" :label="dict.value"
                   :disabled="form.source == 1">{{ dict.label }}</el-radio>