Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/api/system/public.js

@@ -16,6 +16,44 @@ export function handsheDeptTreeSelect() {
   })
 }
 
+
+export function businessTreeSelect(para) {
+  // return request({
+  //   url: '/system/dept/deptTree/business',
+  //   method: 'get'
+  // })
+  if(!para)
+  {
+    para={
+      excludeOrgCode:"900000000",
+      excludeOrgName:"各部门"
+    }
+  }
+  return request({
+    url: '/system/dept/deptTree/business',
+    method: 'post',
+    data: para,
+  })
+}
+
+
+export function wholeTreeSelect(para) {  
+  if(!para) {
+    para={
+      orgId:"",
+      includeSub:true,
+      excludeOrgName:"各部门"
+    }
+  }
+  return request({
+    url: '/system/dept/deptTree/whole',
+    method: 'post',
+    data: para,
+  })
+}
+
+
+
 // 查询文件
 export function getFile(code) {
   return request({

src/components/orgTree/index.vue

@@ -65,6 +65,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    businessTree: {
+      type: Boolean,
+      default: false,
+    },
+    wholeTree: {
+      type: Boolean,
+      default: false,
+    },    
     defaultProps: {
       type: Object,
       default: () => {
@@ -123,9 +131,20 @@ export default {
           return;
         });
       } else {
+        console.log("getDeptTree",this.hangsheTree,this.businessTree,this.wholeTree)
         if (this.hangsheTree) {
           this.treeList = this.$store.getters.depTree;
-        } else {
+        }
+        else if(this.businessTree)
+        {          
+          this.treeList = this.$store.getters.businessTree;
+        }
+        else if(this.wholeTree)
+        {
+          console.log("wholeTree",this.$store.getters.wholeTree)
+          this.treeList = this.$store.getters.wholeTree;
+        }
+        else {
           this.treeList = this.$store.getters.orgTree;
         }
         this.dataFn(this.treeList);

src/permission.js

@@ -27,6 +27,8 @@ router.beforeEach((to, from, next) => {
           isRelogin.show = false;
           store.dispatch('getOrgTree');
           store.dispatch('getDepTree');
+          store.dispatch('getBusinessTree');
+          store.dispatch('getWholeTree');
           store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表

src/store/getters.js

@@ -23,5 +23,7 @@ const getters = {
   sidebarRouters:state => state.permission.sidebarRouters,
   orgTree:state => state.user.orgTree,
   depTree:state => state.user.depTree,
+  businessTree:state => state.user.businessTree,
+  wholeTree:state => state.user.wholeTree,
 }
 export default getters

src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logout, getInfo, refreshToken ,tokenLogin} from '@/api/login'
 import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
-import {deptTreeSelect,handsheDeptTreeSelect} from "@/api/system/public";
+import {deptTreeSelect,handsheDeptTreeSelect,businessTreeSelect,wholeTreeSelect} from "@/api/system/public";
 
 const user = {
   state: {
@@ -17,6 +17,8 @@ const user = {
     orgTree: [],
     //行社机构树
     depTree: [],
+    businessTree:[],
+    wholeTree:[],
   },
 
   mutations: {
@@ -58,6 +60,12 @@ const user = {
     },
     SET_DEPTREE: (state, val) => {
       state.depTree = val
+    },
+    SET_BUSINESSTREE: (state, val) => {
+      state.businessTree = val
+    },
+    SET_WHOLETREE: (state, val) => {
+      state.wholeTree = val
     }
   },
 
@@ -133,7 +141,7 @@ const user = {
       })
     },
 
-    //获取用户机构树
+    //获取机构、用户管理机构树
     getOrgTree({ commit, state }){
       return new Promise((resolve, reject) => {
         deptTreeSelect().then(res => {
@@ -157,6 +165,33 @@ const user = {
       })
     },
 
+    //获取业务机构树
+    getBusinessTree({ commit, state }){
+      return new Promise((resolve, reject) => {
+        businessTreeSelect().then(res => {
+          commit('SET_BUSINESSTREE', res.data)
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+     //获完整路径树（显示登录用户所在机构的所有下级以及直接上级机构）
+     getWholeTree({ commit, state }){
+      return new Promise((resolve, reject) => {
+        wholeTreeSelect().then(res => {
+          commit('SET_WHOLETREE', res.data)
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    
+
+
     // 刷新token
     RefreshToken({commit, state}) {
       return new Promise((resolve, reject) => {

src/views/resumption/rule/dialog.edit.vue

@@ -22,16 +22,17 @@
               :maxlength="50"
               placeholder="请输入履职内容库名称"
               clearable
+              style="width: 280px"
             />
           </el-form-item>
 
           <el-form-item prop="type" label="履职类型:">
             <el-select
               label="履职类型"
-              style="width: 100%"
               v-model="formData.type"
               placeholder="请选择履职类型"
               clearable
+              style="width: 280px"
             >
               <el-option
                 v-for="item in ruleTypeOptions"
@@ -45,7 +46,7 @@
 
           <el-form-item prop="orgType" label="履职机构类型:">
             <el-select
-              style="width: 100%"
+              style="width: 280px"
               prop="orgType"
               label="履职机构类型"
               v-model="formData.orgType"
@@ -64,7 +65,7 @@
 
           <el-form-item prop="status" label="状态:">
             <el-select
-              style="width: 100%"
+              style="width: 280px"
               prop="status"
               label="状态"
               v-model="formData.status"
@@ -81,13 +82,13 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="remark" label="备注">
-            <el-input v-model="formData.remark" :maxlength="255" clearable />
+            <el-input v-model="formData.remark" :maxlength="255" clearable  style="width:280px;" type="textarea" :rows="3"/>
           </el-form-item>
         </el-form>
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="isShow=false">取消</el-button>
+        <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
     </DialogCom>
@@ -150,14 +151,14 @@ export default {
 
     // 事件
     onHide() {
-      this.formData=this.reset();
+      this.formData = this.reset();
       this.$refs.form.resetFields();
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
         if (!isValidate) return;
         await api.update(this.formData);
-        this.$message.info("保存成功")
+        this.$message.info("保存成功");
         this.$emit("success");
         this.isShow = false;
       });

src/views/safetycheck/rule/dialog.edit.vue

@@ -22,6 +22,7 @@
               :maxlength="50"
               placeholder="请输入检查内容库名称"
               clearable
+              style="width:280px;"
             />
           </el-form-item>
 
@@ -31,6 +32,7 @@
               v-model="formData.type"
               placeholder="请选择检查类型"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in ruleTypeOptions"
@@ -49,6 +51,7 @@
               v-model="formData.orgType"
               placeholder="请选择受检机构类型"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in orgTypeOptions"
@@ -67,6 +70,7 @@
               v-model="formData.status"
               placeholder="请选择状态"
               clearable
+              style="width:280px;"
             >
               <el-option
                 v-for="item in statusOptions"
@@ -78,7 +82,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="remark" label="备注">
-            <el-input v-model="formData.remark" :maxlength="255" clearable />
+            <el-input type="textarea" v-model="formData.remark" :maxlength="255" clearable  style="width:280px;" :rows="3"/>
           </el-form-item>
         </el-form>
       </div>

src/views/safetycheck/taskManager/components/register.vue

@@ -200,7 +200,8 @@ export default {
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
     isRegister() {
-      return this.mode === "register";
+      let r = this.mode === "register";
+      return r;
     },
   },
   mounted() {
@@ -209,22 +210,22 @@ export default {
     if (!mode) {
       mode = "info";
     }
-    this.mode = mode;
 
     api.info(id).then((r) => {
-      if (this.mode != "register") {
+      this.mode = mode;
+      if (mode != "register") {
         this.info = r.data;
         return;
       }
 
       if (r.data.status == 3) {
-        this.mode == "info";
+        this.mode = "info";
         this.info = r.data;
         this.$message.info("任务已完成,将显示详情");
         return;
       }
 
-      let userRoleIds = this.roleList.map((r) => r.roleId+'');
+      let userRoleIds = this.roleList.map((r) => r.roleId + "");
       let taskRoleIds = r.data.checkRoles.map((r) => r.id);
 
       if (
@@ -234,9 +235,8 @@ export default {
       ) {
         this.info = r.data;
       } else {
-        debugger
         this.$message.warning("用户不能执行该任务");
-        this.mode='info'
+        this.mode = "info";
       }
     });
   },