Merge remote-tracking branch 'origin/master'

dangan-ui/src/views/dangan/areaSort/index.vue

@@ -61,7 +61,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="目录名称" align="center" prop="muName" />

dangan-ui/src/views/dangan/areaSort1/index.vue

@@ -71,7 +71,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="目录名称" align="center" prop="muName" />
@@ -178,7 +178,7 @@ export default {
           { required: true, message: "目录名称不能为空", trigger: "blur" }
         ],
         areaType: [
-          { required: true, message: "区域分类(字典)不能为空", trigger: "change" }
+          { required: true, message: "区域分类不能为空", trigger: "change" }
         ],
         pid: [
           { required: true, message: "父区域ID不能为空", trigger: "blur" }

dangan-ui/src/views/dangan/collection/index.vue

@@ -404,7 +404,7 @@ export default {
     },
     /** 查询档案目录下拉树结构 */
     getDeptTree() {
-      listCatalog({status: '0'}).then(response => {
+      listCatalog().then(response => {
         // this.dangAnOptions = response.data;
         this.dangAnOptions = this.handleTree(response.data, "id","pid");
         if(this.$route.query.id){

dangan-ui/src/views/dangan/pictureRecard/index.vue

@@ -9,7 +9,7 @@
     </div>
 
     <div style="width: calc(100% - 220px);">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="130px">
         <el-form-item label="档案目录ID" prop="muId">
           <el-input
             v-model="queryParams.muId"
@@ -26,26 +26,26 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="图片名称" prop="picName">
+<!--        <el-form-item label="图片名称" prop="picName">
           <el-input
             v-model="queryParams.picName"
             placeholder="请输入图片名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item>-->
-        <el-form-item label="物理书架ID" prop="wlsjId">
+        <el-form-item label="档案室密集柜ID" prop="wlsjId">
           <el-input
             v-model="queryParams.wlsjId"
-            placeholder="请输入物理书架ID"
+            placeholder="请输入档案室密集柜ID"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="物理书架路径" prop="wlsjPath">
+        <el-form-item label="档案室密集柜路径" prop="wlsjPath">
           <el-input
             v-model="queryParams.wlsjPath"
-            placeholder="请输入物理书架路径"
+            placeholder="请输入档案室密集柜路径"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -111,21 +111,21 @@
       <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="50" align="center" fixed/>
         <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="90"/>
-        <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
+<!--        <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-        <el-table-column label="物理书架ID" align="center" prop="wlsjId" min-width="90"/>
+        <el-table-column label="档案室密集柜ID" align="center" prop="wlsjId" min-width="90"/>
-        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
+<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
         <el-table-column label="图片路径" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="50" :height="50"/>

dangan-ui/src/views/system/role/index.vue

@@ -62,7 +62,7 @@
           v-hasPermi="['system:role:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -72,7 +72,7 @@
           @click="handleUpdate"
           v-hasPermi="['system:role:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -97,8 +97,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+<!--    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">-->
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="roleList" border>
+<!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
@@ -121,6 +122,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
+            v-if="!(scope.row.roleKey==='sysAdmin'&&$store.state.user.roles.indexOf('sysAdmin')>-1)"
             size="mini"
             type="text"
             icon="el-icon-edit"

dangan-ui/src/views/system/user/index.vue

@@ -136,7 +136,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />