浏览代码

修复人员管理bug

凉纪 2 年之前
父节点
当前提交
36688d1f7d
共有 3 个文件被更改,包括 20 次插入17 次删除
  1. 9 9
      src/views/system/user/extend.vue
  2. 10 7
      src/views/system/user/index.vue
  3. 1 1
      src/views/system/workTimeSet/dialog.add.vue

+ 9 - 9
src/views/system/user/extend.vue

@@ -145,8 +145,7 @@
         <el-row>
           <el-col :xs="24" :sm="24" :md="24" :lg="24">
             <el-form-item label="上传相关证书">
-              <image-upload :limit="5" :value="formData.qualificationCertificateUrl" :fileSize="2"
-                @input="getImgUrl"></image-upload>
+              <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
             </el-form-item>
           </el-col>
           <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
@@ -172,6 +171,7 @@ import uploadpng from "@/assets/images/upload.png";
 import uplpng from "@/assets/images/upl.png";
 import { getUser } from "@/api/system/user";
 import TreeSelect from '@riophae/vue-treeselect'
+import ImgsUpload from "@/components/ImgsUpload";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeList } from "@/api/system/public";
 
@@ -179,7 +179,7 @@ import { extendUserInformation } from "@/api/system/information";
 
 export default {
   props: [],
-  components: { TreeSelect },
+  components: { TreeSelect ,ImgsUpload},
   dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position'],
   data() {
     return {
@@ -395,23 +395,23 @@ export default {
         this.roleName = data.roleName;
         this.sex = data.sex;
         this.status = data.status;
-        console.log(data.information.qualificationCertificateUrl, '5555')
-        let img = data.information.qualificationCertificateUrl.split(',');
+        //console.log(data.information.qualificationCertificateUrl, '5555')
+        //let img = data.information.qualificationCertificateUrl.split(',');
         this.formData = data.information;
-        this.formData.qualificationCertificateUrl = img.map((v, i) => { return this.imageUrl(v) });
+        //this.formData.qualificationCertificateUrl = img.map((v, i) => { return this.imageUrl(v) });
       });
     },
 
 
     saveExtend() {
       this.formData.userId = this.$route.params.userId;
-      let imgs = JSON.parse(JSON.stringify(this.imgs));
-      let qualificationCertificateUrl = imgs.toString(',');
+     // let imgs = JSON.parse(JSON.stringify(this.imgs));
+     // let qualificationCertificateUrl = imgs.toString(',');
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let data = {
             ...this.formData,
-            qualificationCertificateUrl
+           // qualificationCertificateUrl
           }
           extendUserInformation(data).then(res => {
             this.$message.success('保存成功!')

+ 10 - 7
src/views/system/user/index.vue

@@ -1,11 +1,14 @@
 <template>
   <div class="app-container">
-    <layoutCom>
-      <org-tree slot="leftBar" v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-        @click="clickTreeNode"></org-tree>
-      <el-row slot="rightBar">
+
+      <el-row :gutter="20">
+        <!--机构数据-->
+        <el-col :span="4" :xs="24">
+          <org-tree  v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange" @click="clickTreeNode">
+          </org-tree>
+        </el-col>
         <!--用户数据-->
-        <el-col>
+        <el-col :span="20" :xs="24">
           <!--    搜索条件    -->
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
@@ -119,7 +122,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="scope.row.isManage == 'Y'">补充信息</el-button>
+                  v-hasPermi="['system:user:extend']" >补充信息</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)"
@@ -142,7 +145,7 @@
             :limit.sync="queryParams.pageSize" @pagination="getList" />
         </el-col>
       </el-row>
-    </layoutCom>
+
 
     <!-- 添加或编辑配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body>

+ 1 - 1
src/views/system/workTimeSet/dialog.add.vue

@@ -6,7 +6,7 @@
         <el-form label-width="90px" label-suffix="" label-position="right">
 
           <el-form-item label="分配机构">
-            <org-tree-select ref="orgTreeSelect" v-model="orgIdList"></org-tree-select>
+            <org-tree-select ref="orgTreeSelect" :checkShow="true"  v-model="orgIdList"></org-tree-select>
           </el-form-item >
           <el-form-item label="调整日期">
             <el-button type="primary" @click="addData">新增日期</el-button>