Explorar el Código

-修改用户单位查询

jiangbiao hace 2 años
padre
commit
fac2fb8cee

+ 14 - 8
master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceUserUnitController.java

@@ -44,6 +44,11 @@ public class TInvoiceUserUnitController extends BaseController
         List<TInvoiceUserUnit> list = tInvoiceUserUnitService.selectTInvoiceUserUnitList(tInvoiceUserUnit);
         return getDataTable(list);
     }
+    @GetMapping("/getAllUserUnit")
+    public AjaxResult selectAllTInvoiceUserUnit(TInvoiceUserUnit tInvoiceUserUnit)
+    {
+        return AjaxResult.success(tInvoiceUserUnitService.selectAllTInvoiceUserUnit(tInvoiceUserUnit));
+    }
 
     /**
      * 导出用户单位管理列表
@@ -74,16 +79,17 @@ public class TInvoiceUserUnitController extends BaseController
     /**
      * 获取用户单位找到对应的用户主管的信息
      */
-    @GetMapping(value = "/getUserByUnit/{Unit}")
-    public AjaxResult getInfoByUnit(@PathVariable("Unit") Long id)
+    @GetMapping(value = "/getUserByUnit")
+    public AjaxResult getInfoByUnit(@RequestParam("unit") String unit)
     {
-        List<SysUser> sysUserList=new ArrayList<SysUser>();
-       List<TInvoiceUserUnit>  tInvoiceUserUnitList=  tInvoiceUserUnitService.selectTInvoiceUserUnitByUnit(id);
-              for(TInvoiceUserUnit t:tInvoiceUserUnitList){
+        List<SysUser> sysUserList = new ArrayList<SysUser>();
+        List<TInvoiceUserUnit> tInvoiceUserUnitList = tInvoiceUserUnitService.selectTInvoiceUserUnitByUnit(unit);
+        for (TInvoiceUserUnit t : tInvoiceUserUnitList) {
+
+            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(t.getUserIds()));
+            sysUserList.add(sysUser);
+        }
 
-               SysUser sysUser =sysUserService.selectUserById(Long.parseLong(t.getUserIds()));
-                  sysUserList.add(sysUser);
-    };
 
         return AjaxResult.success(sysUserList);
     }

+ 3 - 1
master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceUserUnitMapper.java

@@ -27,7 +27,9 @@ public interface TInvoiceUserUnitMapper
      * @param id 用户单位管理ID
      * @return 用户单位管理
      */
-    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id);
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(String userUnit);
+    @DataScope(deptAlias = "d")
+    public List<TInvoiceUserUnit> selectAllTInvoiceUserUnit(TInvoiceUserUnit tInvoiceUserUnit);
 
     /**
      * 查询用户单位管理列表

+ 2 - 1
master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceUserUnitService.java

@@ -68,5 +68,6 @@ public interface ITInvoiceUserUnitService
      * @param id 用户单位管理
      * @return
      */
-    List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id);
+    List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(String userUnit);
+    List<TInvoiceUserUnit> selectAllTInvoiceUserUnit(TInvoiceUserUnit tInvoiceUserUnit);
 }

+ 8 - 2
master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceUserUnitServiceImpl.java

@@ -39,9 +39,15 @@ public class TInvoiceUserUnitServiceImpl implements ITInvoiceUserUnitService
      * @return
      */
     @Override
-    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id)
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(String userUnit)
     {
-        return tInvoiceUserUnitMapper.selectTInvoiceUserUnitByUnit(id);
+        return tInvoiceUserUnitMapper.selectTInvoiceUserUnitByUnit(userUnit);
+    }
+
+    @Override
+    public List<TInvoiceUserUnit> selectAllTInvoiceUserUnit(TInvoiceUserUnit tInvoiceUserUnit)
+    {
+        return tInvoiceUserUnitMapper.selectAllTInvoiceUserUnit(tInvoiceUserUnit);
     }
 
     /**

+ 8 - 4
master/src/main/java/com/ruoyi/project/listener/invoiceApprove/YhzgTaskCreateListener.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -42,7 +43,9 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
             String email = sysUserService.selectUserById(Long.parseLong(yhzgusers)).getEmail();
             String apNo = approveEntity.getApNo();
             logger.info("apNo:" + apNo);
-            String username = sysUserService.selectUserById(Long.parseLong(yhzgusers)).getNickName();
+            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(yhzgusers));
+            String username = sysUser.getNickName();
+            String loginName = sysUser.getUserName();
             String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
             logger.info("email:" + email);
             logger.info("username:" + username);
@@ -56,8 +59,8 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
             String prime = "";
             String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                     "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                    "Dear usernameEN</font></font></h2>" +
+                    "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN(loginName)</font></font></h2>" +
                     "<p>您有一个新的待办任务:<br>" +
                     "You have a new to-do task:<br>" +
                     "任务名:<b>预约开票审批流程:用户主管签字确认</b><br>" +
@@ -73,7 +76,8 @@ public class YhzgTaskCreateListener implements Serializable, TaskListener {
                     "</div></div></div></td></tr>";
             String one = center.replaceFirst("username", username);
             String two = one.replaceFirst("usernameEN", usernameEN);
-            String four = two.replaceFirst("apNo", apNo);
+            String three = two.replace("loginName", loginName);
+            String four = three.replaceFirst("apNo", apNo);
             String five = four.replaceFirst("apNoEN", apNo);
             String result = five.replaceFirst("date", String.valueOf(new Date()));
             prime = prime + result;

+ 8 - 4
master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzgcsTaskCreateListener.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -43,7 +44,9 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
                 String email = sysUserService.selectUserById(Long.parseLong(zzgcsuser)).getEmail();
                 String apNo = approveEntity.getApNo();
                 logger.info("apNo:" + apNo);
-                String username = sysUserService.selectUserById(Long.parseLong(zzgcsuser)).getNickName();
+                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(zzgcsuser));
+                String username = sysUser.getNickName();
+                String loginName = sysUser.getUserName();
                 String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
                 logger.info("email:" + email);
                 logger.info("username:" + username);
@@ -57,8 +60,8 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
                 String prime = "";
                 String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                         "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "Dear usernameEN</font></font></h2>" +
+                        "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                        "Dear usernameEN(loginName)</font></font></h2>" +
                         "<p>您有一个新的待办任务:<br>" +
                         "You have a new to-do task:<br>" +
                         "任务名:<b>预约开票审批流程:装置工程师签字确认</b><br>" +
@@ -74,7 +77,8 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
                         "</div></div></div></td></tr>";
                 String one = center.replaceFirst("username", username);
                 String two = one.replaceFirst("usernameEN", usernameEN);
-                String four = two.replaceFirst("apNo", apNo);
+                String three = two.replace("loginName", loginName);
+                String four = three.replaceFirst("apNo", apNo);
                 String five = four.replaceFirst("apNoEN", apNo);
                 String result = five.replaceFirst("date", String.valueOf(new Date()));
                 prime = prime + result;

+ 8 - 4
master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzjlTaskCreateListener.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -43,7 +44,9 @@ public class ZzjlTaskCreateListener implements Serializable, TaskListener {
                 String email = sysUserService.selectUserById(Long.parseLong(zzjluser)).getEmail();
                 String apNo = approveEntity.getApNo();
                 logger.info("apNo:" + apNo);
-                String username = sysUserService.selectUserById(Long.parseLong(zzjluser)).getNickName();
+                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(zzjluser));
+                String username = sysUser.getNickName();
+                String loginName = sysUser.getUserName();
                 String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
                 logger.info("email:" + email);
                 logger.info("username:" + username);
@@ -57,8 +60,8 @@ public class ZzjlTaskCreateListener implements Serializable, TaskListener {
                 String prime = "";
                 String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                         "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "Dear usernameEN</font></font></h2>" +
+                        "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                        "Dear usernameEN(loginName)</font></font></h2>" +
                         "<p>您有一个新的待办任务:<br>" +
                         "You have a new to-do task:<br>" +
                         "任务名:<b>预约开票审批流程:装置经理签字确认</b><br>" +
@@ -74,7 +77,8 @@ public class ZzjlTaskCreateListener implements Serializable, TaskListener {
                         "</div></div></div></td></tr>";
                 String one = center.replaceFirst("username", username);
                 String two = one.replaceFirst("usernameEN", usernameEN);
-                String four = two.replaceFirst("apNo", apNo);
+                String three = two.replace("loginName", loginName);
+                String four = three.replaceFirst("apNo", apNo);
                 String five = four.replaceFirst("apNoEN", apNo);
                 String result = five.replaceFirst("date", String.valueOf(new Date()));
                 prime = prime + result;

+ 8 - 4
master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzzgTaskCreateListener.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -43,7 +44,9 @@ public class ZzzgTaskCreateListener implements Serializable, TaskListener {
                 String email = sysUserService.selectUserById(Long.parseLong(zzzguser)).getEmail();
                 String apNo = approveEntity.getApNo();
                 logger.info("apNo:" + apNo);
-                String username = sysUserService.selectUserById(Long.parseLong(zzzguser)).getNickName();
+                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(zzzguser));
+                String username = sysUser.getNickName();
+                String loginName = sysUser.getUserName();
                 String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
                 logger.info("email:" + email);
                 logger.info("username:" + username);
@@ -57,8 +60,8 @@ public class ZzzgTaskCreateListener implements Serializable, TaskListener {
                 String prime = "";
                 String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
                         "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
-                        "Dear usernameEN</font></font></h2>" +
+                        "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                        "Dear usernameEN(loginName)</font></font></h2>" +
                         "<p>您有一个新的待办任务:<br>" +
                         "You have a new to-do task:<br>" +
                         "任务名:<b>预约开票审批流程:装置主管签字确认</b><br>" +
@@ -74,7 +77,8 @@ public class ZzzgTaskCreateListener implements Serializable, TaskListener {
                         "</div></div></div></td></tr>";
                 String one = center.replaceFirst("username", username);
                 String two = one.replaceFirst("usernameEN", usernameEN);
-                String four = two.replaceFirst("apNo", apNo);
+                String three = two.replace("loginName", loginName);
+                String four = three.replaceFirst("apNo", apNo);
                 String five = four.replaceFirst("apNoEN", apNo);
                 String result = five.replaceFirst("date", String.valueOf(new Date()));
                 prime = prime + result;

+ 13 - 5
master/src/main/resources/mybatis/invoice/TInvoiceUserUnitMapper.xml

@@ -44,11 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTInvoiceUserUnitListToExcel" parameterType="TInvoiceUserUnit" resultMap="TInvoiceUserUnitResult">
-        select d.id, sd.dict_label user_unit, d.user_ids, d.del_flag, su.nick_name creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name,u.nick_name from t_invoice_user_unit d
+        select d.id, d.user_unit, d.user_ids, d.del_flag, su.nick_name creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name,u.nick_name from t_invoice_user_unit d
         left join sys_dept s on s.dept_id = d.dept_id
         left join sys_user u on d.user_ids = u.user_id
         left join sys_user su on d.creater_code = su.user_id
-        left join sys_dict_data sd on d.user_unit = sd.dict_value
 
         <where>
             <if test="userUnit != null  and userUnit != ''"> and user_unit = #{userUnit}</if>
@@ -60,21 +59,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             and d.del_flag = 0
-            and sd.dict_type='book_user_unit'
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by user_unit
     </select>
 
+    <select id="selectAllTInvoiceUserUnit" parameterType="TInvoiceUserUnit" resultMap="TInvoiceUserUnitResult">
+        select distinct (d.user_unit) from t_invoice_user_unit d
+        left join SYS_DEPT s on s.dept_id=d.dept_id
+        <where>
+            and d.del_flag = 0
+        </where>
+        group by d.user_unit
+        ${params.dataScope}
+    </select>
+
     <select id="selectTInvoiceUserUnitById" parameterType="Long" resultMap="TInvoiceUserUnitResult">
         <include refid="selectTInvoiceUserUnitVo"/>
         where id = #{id}
     </select>
 
-    <select id="selectTInvoiceUserUnitByUnit" parameterType="Long" resultMap="TInvoiceUserUnitResult">
+    <select id="selectTInvoiceUserUnitByUnit" parameterType="String" resultMap="TInvoiceUserUnitResult">
         <include refid="selectTInvoiceUserUnitVo"/>
-        where user_unit = #{id} and d.del_flag=0
+        where user_unit = #{userUnit} and d.del_flag=0
     </select>
 
     <insert id="insertTInvoiceUserUnit" parameterType="TInvoiceUserUnit">

+ 12 - 4
ui/src/api/invoice/unit.js

@@ -8,6 +8,13 @@ export function listUnit(query) {
     params: query
   })
 }
+export function getAllUserUnit(query) {
+  return request({
+    url: '/invoice/unit/getAllUserUnit',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询用户单位管理详细
 export function getUnit(id) {
@@ -18,10 +25,11 @@ export function getUnit(id) {
 }
 
 // 查询用户单位二级下拉框
-export function getUserByUnit(id) {
+export function getUserByUnit(unit) {
   return request({
-    url: '/invoice/unit/getUserByUnit/' + id,
-    method: 'get'
+    url: '/invoice/unit/getUserByUnit',
+    method: 'get',
+    params: {unit: unit}
   })
 }
 
@@ -58,4 +66,4 @@ export function exportUnit(query) {
     method: 'get',
     params: query
   })
-}
+}

+ 10 - 6
ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -141,9 +141,9 @@
                          @change="checkCategoryPromotion(form.userUnit)" :disabled="isDevSup">
                 <el-option
                   v-for="dict in userUnitOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
+                  :key="dict.userUnit"
+                  :label="dict.userUnit"
+                  :value="dict.userUnit"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -238,7 +238,7 @@ import record from "./spec-itemDetail";
 import {getInvoice, listInvoice, handleApprove, addInvoice} from "@/api/invoice/invoice";
 import Bookingworkticket from "@/views/invoice/bookingworkticket/index"
 import log from "@/views/monitor/job/log";
-import {getUserByUnit} from "@/api/invoice/unit";
+import {getAllUserUnit, getUserByUnit} from "@/api/invoice/unit";
 import {treeselect} from "@/api/system/dept";
 import {addBookingworkticket, getBookingworkticket, updateBookingworkticket} from "@/api/invoice/bookingworkticket";
 import Treeselect from "@riophae/vue-treeselect";
@@ -504,8 +504,11 @@ export default {
       this.getDicts("book_user_unit").then(response => {
         this.userUnitOptions = response.data;
       });
-      this.getDicts("book_work_unit").then(response => {
-        this.workUnitOptions = response.data;
+      // this.getDicts("book_user_unit").then(response => {
+      //   this.userUnitOptions = response.data;
+      // });
+      getAllUserUnit({}).then(response => {
+        this.userUnitOptions = response.data;
       });
       this.getDicts("book_work_type").then(response => {
         this.workTypeOptions = response.data;
@@ -619,6 +622,7 @@ export default {
       this.devList = [];
       this.isUserMag=false;
       this.isDevSup=false;
+      this.userUnitOptions=[];
     },
     detailReset() {
       this.form = {

+ 19 - 5
ui/src/views/invoice/bookingworkticket/index.vue

@@ -325,9 +325,9 @@
                          @change="checkCategoryPromotionUpdate(form.userUnit)">
                 <el-option
                   v-for="dict in userUnitOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
+                  :key="dict.userUnit"
+                  :label="dict.userUnit"
+                  :value="dict.userUnit"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -521,7 +521,16 @@ import {
 } from "@/api/invoice/workcontent";
 import {listDevice, getDevice, delDevice, updateDevice, exportDevice, selectDevice} from "@/api/invoice/device";
 import {listTagAll} from "@/api/invoice/tag";
-import {listUnit, getUnit, delUnit, addUnit, updateUnit, exportUnit, getUserByUnit} from "@/api/invoice/unit";
+import {
+  listUnit,
+  getUnit,
+  delUnit,
+  addUnit,
+  updateUnit,
+  exportUnit,
+  getUserByUnit,
+  getAllUserUnit
+} from "@/api/invoice/unit";
 import {
   listUser,
   getUser,
@@ -729,8 +738,12 @@ export default {
     this.getDicts("book_floor_location").then(response => {
       this.floorLocationOptions = response.data;
     });
-    this.getDicts("book_user_unit").then(response => {
+    // this.getDicts("book_user_unit").then(response => {
+    //   this.userUnitOptions = response.data;
+    // });
+    getAllUserUnit({}).then(response => {
       this.userUnitOptions = response.data;
+      console.log(this.userUnitOptions)
     });
     this.getDicts("book_work_type").then(response => {
       this.workTypeOptions = response.data;
@@ -1033,6 +1046,7 @@ export default {
         userUnit: null
       };
       this.resetForm("form");
+      this.userMgOptions=[];
     },
     /** 搜索按钮操作 */
     handleQuery() {

+ 2 - 10
ui/src/views/invoice/unit/index.vue

@@ -74,8 +74,7 @@
     <el-table v-loading="loading" ref="unitTable" :span-method="mergeMethod" :data="unitList" @selection-change="handleSelectionChange" :height="clientHeight"
               border >
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="单位" align="center" prop="userUnit" :show-overflow-tooltip="true"
-                       :formatter="unitFormat"/>
+      <el-table-column label="单位" align="center" prop="userUnit" :show-overflow-tooltip="true"/>
       <el-table-column label="用户" align="center" prop="nickName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
@@ -112,14 +111,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="单位" prop="userUnit" >
-          <el-select v-model="form.userUnit" :placeholder="$t('请选择') + $t('用户单位')" style="width: 100%">
-            <el-option
-              v-for="dict in unitOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue">
-            </el-option>
-          </el-select>
+          <el-input v-model="form.userUnit" placeholder="请输入用户单位"/>
         </el-form-item>
         <el-form-item label="用户" prop="userIds">
           <el-select v-model="form.userIds" filterable :placeholder="$t('请选择') + $t('关联用户')" style="width: 100%">