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

src/App.vue

@@ -22,6 +22,9 @@ export default {
 };
 </script>
 <style scoped>
+#app{
+  font-size: 14px;
+}
 #app .theme-picker {
   display: none;
 }

src/api/login.js

@@ -8,7 +8,7 @@ export function login(data) {
       isToken: false
     },
     method: 'post',
-    hideLoading:true,
+    showLoading:false,
     data
   })
 }

src/assets/styles/element-ui.scss

@@ -82,3 +82,14 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+
+.tree-container{
+  .el-tree-node>.el-tree-node__children{
+    overflow: visible!important; /* 添加横向滚动条*/
+  }
+}
+
+.tree-container{
+  height: calc(100vh - 185px);
+  overflow: auto;
+}

src/permission.js

@@ -32,6 +32,7 @@ router.beforeEach((to, from, next) => {
           })
         }).catch(err => {
           console.log(err,'err')
+          sessionStorage.clear();
           next({ path: '/login' })
           // store.dispatch('LogOut').then(() => {
           //   Message.error(err)

src/utils/request.js

@@ -23,8 +23,8 @@ const service = axios.create({
 
 // request拦截器
 service.interceptors.request.use(config => {
-  // 不传递默认开启loading
-  if (!config.hideLoading) loading = Loading.service({ fullscreen: true, background: "transparent" });
+  // 不传递默认关闭loading
+  if (config.showLoading) loading = Loading.service({ fullscreen: true, background: "transparent" });
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   // 是否需要防止数据重复提交

src/views/business/checkManager/api.js

@@ -5,7 +5,7 @@ export function treeData(data) {
   return request({
     url: '/appRule/group',
     method: 'post',
-    hideLoading:true,
+    showLoading:true,
     data
   })
 }

src/views/business/checkManager/index.vue

@@ -5,7 +5,6 @@
       <el-form-item prop="ruleName" label="规范名称">
         <el-input
           v-model="search.ruleName"
-          :maxlength="50"
           placeholder="请输入规范名称"
           clearable
         />
@@ -18,7 +17,6 @@
           placeholder="请选择规范类型"
         ></el-select>
       </el-form-item>
-
       <el-form-item prop="orgType" label="受检对象">
         <el-select
           prop="orgType"

src/views/business/checkNote/api.js

@@ -5,7 +5,7 @@ export function treeData(data) {
   return request({
     url: '/appRule/group',
     method: 'post',
-    hideLoading:true,
+    showLoading:true,
     data
   })
 }

src/views/system/user/index.vue

@@ -13,7 +13,10 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="tree-container">
+          <div style="margin-bottom: 10px;">
+            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">是否关联下级机构</el-checkbox>
+          </div>
           <el-tree
             :data="deptOptions"
             :props="defaultProps"
@@ -21,7 +24,8 @@
             :filter-node-method="filterNode"
             ref="tree"
             node-key="id"
-            :default-expanded-keys="[2283]"
+            :default-expanded-keys="defaultKeys"
+            :default-checked-keys="defaultKeys"
             highlight-current
             @node-click="handleNodeClick"
           />
@@ -29,6 +33,8 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
+
+        <!--    搜索条件    -->
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="username">
             <el-input
@@ -80,6 +86,7 @@
           </el-form-item>
         </el-form>
 
+        <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -113,26 +120,26 @@
               v-hasPermi="['system:user:remove']"
             >删除</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="info"-->
+<!--              plain-->
+<!--              icon="el-icon-upload2"-->
+<!--              size="mini"-->
+<!--              @click="handleImport"-->
+<!--              v-hasPermi="['system:user:import']"-->
+<!--            >导入</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="warning"-->
+<!--              plain-->
+<!--              icon="el-icon-download"-->
+<!--              size="mini"-->
+<!--              @click="handleExport"-->
+<!--              v-hasPermi="['system:user:export']"-->
+<!--            >导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -384,6 +391,8 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {},
+      //是否关联下级
+      checked: false,
       defaultProps: {
         children: "children",
         label: "name"
@@ -407,10 +416,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        username: undefined,
-        phone: undefined,
-        status: undefined,
-        deptId: undefined
+        username: null,
+        phone: null,
+        status: null,
+        orgId: null,
+        checkSub:false
       },
       // 列信息
       columns: [
@@ -449,7 +459,9 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      //默认选中节点
+      defaultKeys:[]
     };
   },
   watch: {
@@ -459,29 +471,38 @@ export default {
     }
   },
   created() {
-    this.getList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
   },
   methods: {
+    /** 下穿状态改变*/
+    changeCheckBox(){
+      this.getList();
+    },
     /** 查询用户列表 */
-    getList() {
+    getList(id) {
       this.loading = true;
-      console.log(111);
-      console.log(this.queryParams);
+      console.log(this.queryParams,111);
+      console.log(this.addDateRange(this.queryParams, this.dateRange),2222);
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
         }
-      );
+      ).catch(err=>{
+        this.loading = false;
+      })
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
+        this.defaultKeys.push(response.data[0].id);
+        console.log( this.defaultKeys,' this.defaultKeys')
+        this.queryParams.orgId = response.data[0].id;
+        this.handleQuery();
       });
     },
     // 筛选节点
@@ -514,7 +535,7 @@ export default {
     reset() {
       this.form = {
         userId: undefined,
-        deptId: undefined,
+        orgId: undefined,
         userName: undefined,
         nickName: undefined,
         password: undefined,
@@ -537,7 +558,7 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.queryParams.deptId = undefined;
+      this.queryParams.orgId = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
@@ -673,3 +694,9 @@ export default {
   }
 };
 </script>
+<style lang="scss">
+
+</style>
+<style lang="scss" scoped>
+
+</style>