From 92138d25bc7f63e56c7e8f014a431af6546daaf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=B8=85?= <ls1006@126.com>
Date: Wed, 23 Jul 2025 00:04:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/tool/ReportController.java | 13 ++-
 .../controller/ErpClientController.java       | 10 +++
 .../business/domain/ErpMaintainCause.java     | 12 +--
 .../domain/bo/ErpMaintainCauseBo.java         |  8 ++
 .../business/domain/bo/ErpMaterialBo.java     |  3 +-
 .../domain/vo/ErpMaintainCauseVo.java         |  7 ++
 .../business/domain/vo/ErpMaterialVo.java     |  3 +-
 .../impl/ErpMaintainCauseServiceImpl.java     |  1 +
 ...ErpMaterialInventoryRecordServiceImpl.java |  2 +-
 .../impl/ErpMaterialPutawayServiceImpl.java   |  3 +
 .../common/core/domain/entity/SysDept.java    |  4 +
 .../src/views/business/client/index.vue       |  2 +-
 .../views/business/examineProject/index.vue   | 12 +--
 .../views/business/maintainCause/index.vue    | 15 +++-
 .../business/malfunctionProject/index.vue     | 12 +--
 .../src/views/business/material/index.vue     | 12 ++-
 .../views/business/materialCheck/index.vue    | 20 ++++-
 .../business/materialCheckInfo/index.vue      | 11 ++-
 .../views/business/materialPicking/add.vue    | 14 +++-
 .../views/business/materialPicking/index.vue  | 20 ++++-
 .../business/materialPickingInfo/index.vue    | 20 ++++-
 .../views/business/materialPutaway/index.vue  | 29 ++++---
 .../business/materialPutawayInfo/index.vue    | 12 ++-
 .../views/business/materialReturns/index.vue  | 14 +++-
 .../business/materialReturnsInfo/index.vue    | 11 ++-
 .../views/business/materialStock/index.vue    | 10 ++-
 .../views/business/pickingReturn/index.vue    | 14 +++-
 .../src/views/business/repairForm/index.vue   |  6 +-
 .../src/views/business/repairForm/info.vue    | 80 +++++++++++--------
 .../business/repairFormProject/index.vue      | 20 ++---
 .../repairFormProjectDispatch/index.vue       |  1 +
 .../business/settlementConfirm/index.vue      |  2 +-
 .../settlementMaterial/info/index1.vue        | 22 +++--
 .../settlementMaterial/info/index2.vue        |  6 +-
 maintain-ui/src/views/business/user/index.vue |  4 +
 maintain-ui/src/views/system/dept/index.vue   | 19 ++++-
 maintain-ui/src/views/system/role/index.vue   |  2 +-
 37 files changed, 318 insertions(+), 138 deletions(-)

diff --git a/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java b/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java
index 11f264d..6a2508a 100644
--- a/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java
+++ b/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java
@@ -1,13 +1,10 @@
 package com.maintain.web.controller.tool;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.maintain.common.utils.ip.IpUtils;
-import groovy.transform.AnnotationCollector;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.beans.factory.annotation.Autowired;
 
 
 @RestController
@@ -20,24 +17,24 @@ public class ReportController {
     //报表设计
     @GetMapping(value = "/reportList")
     public String ReportList(){
-        return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/list";
+        return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/list";
     }
 
     //报表查看
     @GetMapping(value = "/reportView")
     public String ReportView(){
-        return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/view";
+        return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/view";
     }
 
     //报表查看
     @GetMapping(value = "/biList")
     public String bi(){
-        return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/list";
+        return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/list";
     }
 
     //报表查看
     @GetMapping(value = "/biView")
     public String biView(){
-        return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/share/view";
+        return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/share/view";
     }
 }
diff --git a/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java b/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java
index 77bd707..f5e8291 100644
--- a/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java
+++ b/maintain-business/src/main/java/com/maintain/business/controller/ErpClientController.java
@@ -1,12 +1,15 @@
 package com.maintain.business.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.maintain.business.domain.ErpCar;
 import com.maintain.business.domain.ErpClient;
 import com.maintain.business.domain.bo.ErpClientBo;
 import com.maintain.business.domain.vo.ErpClientVo;
 import com.maintain.business.listener.ErpClientImportListener;
+import com.maintain.business.mapper.ErpCarMapper;
 import com.maintain.business.mapper.ErpClientMapper;
 import com.maintain.business.service.IErpClientService;
 import com.maintain.common.annotation.Log;
@@ -19,6 +22,7 @@ import com.maintain.common.core.validate.AddGroup;
 import com.maintain.common.core.validate.EditGroup;
 import com.maintain.common.enums.BusinessType;
 import com.maintain.common.excel.ExcelResult;
+import com.maintain.common.exception.ServiceException;
 import com.maintain.common.utils.poi.ExcelUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
@@ -47,6 +51,7 @@ public class ErpClientController extends BaseController {
 
     private final IErpClientService iErpClientService;
     private final ErpClientMapper clientMapper;
+    private final ErpCarMapper carMapper;
 
     /**
      * 查询客户信息-客户列表
@@ -141,6 +146,11 @@ public class ErpClientController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
+        LambdaQueryWrapper<ErpCar> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.in(ErpCar::getClientId, Arrays.asList(ids));
+        if (!carMapper.selectList(lambdaQuery).isEmpty()) {
+            throw new ServiceException("客户已绑定车辆，无法删除！");
+        }
         // 状态更改为注销
         LambdaUpdateWrapper<ErpClient> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.in(ErpClient::getId, Arrays.asList(ids)).set(ErpClient::getState, 1);
diff --git a/maintain-business/src/main/java/com/maintain/business/domain/ErpMaintainCause.java b/maintain-business/src/main/java/com/maintain/business/domain/ErpMaintainCause.java
index acfab91..2cf1c05 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/ErpMaintainCause.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/ErpMaintainCause.java
@@ -35,6 +35,10 @@ public class ErpMaintainCause extends BaseEntity {
      * 维修原因编号
      */
     private String maintainCauseCode;
+    /**
+     * 类型（1修理 2维护 3修理与维护）
+     */
+    private String type;
     /**
      * 是否删除（0否 1是 默认0）
      */
@@ -43,13 +47,5 @@ public class ErpMaintainCause extends BaseEntity {
      * 是否启用（0否 1是 默认1）
      */
     private Integer isEnable;
-    /**
-     * 创建者
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
 
 }
diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaintainCauseBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaintainCauseBo.java
index f386614..d36d3e9 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaintainCauseBo.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaintainCauseBo.java
@@ -1,5 +1,8 @@
 package com.maintain.business.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.maintain.common.annotation.ExcelDictFormat;
+import com.maintain.common.convert.ExcelDictConvert;
 import com.maintain.common.core.validate.AddGroup;
 import com.maintain.common.core.validate.EditGroup;
 import lombok.Data;
@@ -39,6 +42,11 @@ public class ErpMaintainCauseBo extends BaseEntity {
     @NotBlank(message = "维修原因编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String maintainCauseCode;
 
+    /**
+     * 类型（1修理 2维护 3修理与维护）
+     */
+    private String type;
+
     /**
      * 是否删除（0否 1是 默认0）
      */
diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java
index e07212a..82f203f 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialBo.java
@@ -33,7 +33,6 @@ public class ErpMaterialBo extends BaseEntity {
     /**
      * 物资分类ID
      */
-    @NotNull(message = "物资分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialTypeId;
 
     /**
@@ -79,7 +78,7 @@ public class ErpMaterialBo extends BaseEntity {
     /**
      * 供应商ID
      */
-    @NotNull(message = "供应商ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "供应商不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long vendorId;
 
     /**
diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainCauseVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainCauseVo.java
index 4710487..96e4205 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainCauseVo.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainCauseVo.java
@@ -39,6 +39,13 @@ public class ErpMaintainCauseVo implements Serializable {
     @ExcelProperty(value = "维修原因编号")
     private String maintainCauseCode;
 
+    /**
+     * 类型（1修理 2维护 3修理与维护）
+     */
+    @ExcelProperty(value = "类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "baoxiudanleixing")
+    private String type;
+
     /**
      * 是否删除（0否 1是 默认0）
      */
diff --git a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java
index 67c9cee..d78345f 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java
@@ -69,7 +69,8 @@ public class ErpMaterialVo implements Serializable {
     /**
      * 物资单位
      */
-    @ExcelProperty(value = "物资单位")
+    @ExcelProperty(value = "物资单位", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "material_unit")
     private String materialUnit;
 
     /**
diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainCauseServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainCauseServiceImpl.java
index 801e80e..c18f5e5 100644
--- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainCauseServiceImpl.java
+++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainCauseServiceImpl.java
@@ -63,6 +63,7 @@ public class ErpMaintainCauseServiceImpl implements IErpMaintainCauseService {
         LambdaQueryWrapper<ErpMaintainCause> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getMaintainCauseName()), ErpMaintainCause::getMaintainCauseName, bo.getMaintainCauseName());
         lqw.like(StringUtils.isNotBlank(bo.getMaintainCauseCode()), ErpMaintainCause::getMaintainCauseCode, bo.getMaintainCauseCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), ErpMaintainCause::getType, bo.getType());
         lqw.eq(bo.getIsDelete() != null, ErpMaintainCause::getIsDelete, bo.getIsDelete());
         lqw.eq(bo.getIsEnable() != null, ErpMaintainCause::getIsEnable, bo.getIsEnable());
         return lqw;
diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialInventoryRecordServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialInventoryRecordServiceImpl.java
index 7264775..396cfcb 100644
--- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialInventoryRecordServiceImpl.java
+++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialInventoryRecordServiceImpl.java
@@ -70,7 +70,7 @@ public class ErpMaterialInventoryRecordServiceImpl implements IErpMaterialInvent
             .like(StringUtils.isNotBlank(bo.getMaterialCode()),"t.material_code", bo.getMaterialCode())
             .like(StringUtils.isNotBlank(bo.getMaterialSpecifications()),"t.material_specifications", bo.getMaterialSpecifications())
             .like(StringUtils.isNotBlank(bo.getVendorName()),"t.vendor_name", bo.getVendorName())
-            .like(StringUtils.isNotBlank(bo.getWarehouseName()), "t.name", bo.getWarehouseName());
+            .like(StringUtils.isNotBlank(bo.getWarehouseName()), "t.warehouseName", bo.getWarehouseName());
         return query;
     }
 
diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java
index ac59bd2..7a3c33b 100644
--- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java
+++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java
@@ -93,6 +93,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
         lqw.eq(bo.getVendorId() != null, ErpMaterialPutaway::getVendorId, bo.getVendorId());
         lqw.like(StringUtils.isNotBlank(bo.getVendorName()), ErpMaterialPutaway::getVendorName, bo.getVendorName());
         lqw.eq(bo.getCreateDeptId() != null, ErpMaterialPutaway::getCreateDeptId, bo.getCreateDeptId());
+        lqw.eq(bo.getState() != null, ErpMaterialPutaway::getState, bo.getState());
         lqw.orderByDesc(BaseEntity::getCreateTime);
         return lqw;
     }
@@ -118,6 +119,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
                 ErpMaterial material = materialMapper.selectById(item.getMaterialId());
                 BeanUtil.copyProperties(material, putawayInfo);
                 putawayInfo.setId(null);
+                putawayInfo.setMaterialId(material.getId());
                 putawayInfo.setPutawayId(add.getId());
                 putawayInfo.setState(bo.getState());
                 return putawayInfo;
@@ -222,6 +224,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService
                 ErpMaterial material = materialMapper.selectById(item.getMaterialId());
                 BeanUtil.copyProperties(material, putawayInfo);
                 putawayInfo.setId(null);
+                putawayInfo.setMaterialId(material.getId());
                 putawayInfo.setPutawayId(update.getId());
                 putawayInfo.setState(bo.getState());
                 return putawayInfo;
diff --git a/maintain-common/src/main/java/com/maintain/common/core/domain/entity/SysDept.java b/maintain-common/src/main/java/com/maintain/common/core/domain/entity/SysDept.java
index aaa486c..287bc28 100644
--- a/maintain-common/src/main/java/com/maintain/common/core/domain/entity/SysDept.java
+++ b/maintain-common/src/main/java/com/maintain/common/core/domain/entity/SysDept.java
@@ -81,5 +81,9 @@ public class SysDept extends TreeEntity<SysDept> {
      * 祖级列表
      */
     private String ancestors;
+    /**
+     * 类型（1总公司 2分公司 3车队 4车间 5总公司管理部门 6分公司管理部门 7维修点）
+     */
+    private String type;
 
 }
diff --git a/maintain-ui/src/views/business/client/index.vue b/maintain-ui/src/views/business/client/index.vue
index 2930cff..ade0fdf 100644
--- a/maintain-ui/src/views/business/client/index.vue
+++ b/maintain-ui/src/views/business/client/index.vue
@@ -102,7 +102,7 @@
             style="color: brown"
             @click="handleDelete(scope.row)"
             v-hasPermi="['business:client:remove']"
-          >注销</el-button>
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/maintain-ui/src/views/business/examineProject/index.vue b/maintain-ui/src/views/business/examineProject/index.vue
index 4aa1247..e628496 100644
--- a/maintain-ui/src/views/business/examineProject/index.vue
+++ b/maintain-ui/src/views/business/examineProject/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="115px">
-      <el-form-item label="检验项目名称" prop="examineName">
+      <el-form-item label="分类名称" prop="typeName">
         <el-input
-          v-model="queryParams.examineName"
-          placeholder="请输入检验项目名称"
+          v-model="queryParams.typeName"
+          placeholder="请输入分类名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分类名称" prop="typeName">
+      <el-form-item label="检验项目名称" prop="examineName">
         <el-input
-          v-model="queryParams.typeName"
-          placeholder="请输入分类名称"
+          v-model="queryParams.examineName"
+          placeholder="请输入检验项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/maintain-ui/src/views/business/maintainCause/index.vue b/maintain-ui/src/views/business/maintainCause/index.vue
index 5bd8652..bc37132 100644
--- a/maintain-ui/src/views/business/maintainCause/index.vue
+++ b/maintain-ui/src/views/business/maintainCause/index.vue
@@ -80,6 +80,11 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="维修原因" align="center" prop="maintainCauseName" />
       <el-table-column label="维修原因编号" align="center" prop="maintainCauseCode" />
+      <el-table-column label="类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.baoxiudanleixing" :value="scope.row.type" />
+        </template>
+      </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -119,6 +124,11 @@
         <el-form-item label="维修原因编号" prop="maintainCauseCode">
           <el-input v-model="form.maintainCauseCode" placeholder="请输入维修原因编号" />
         </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;">
+            <el-option v-for="item in dict.type.baoxiudanleixing" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -164,6 +174,7 @@ import { getToken } from '@/utils/auth'
 
 export default {
   name: "MaintainCause",
+  dicts: ['baoxiudanleixing'],
   data() {
     return {
       // 按钮loading
@@ -223,8 +234,8 @@ export default {
         maintainCauseCode: [
           { required: true, message: "维修原因编号不能为空", trigger: "blur" }
         ],
-        isDelete: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" }
+        type: [
+          { required: true, message: "类型不能为空", trigger: "blur" }
         ],
         isEnable: [
           { required: true, message: "是否启用不能为空", trigger: "blur" }
diff --git a/maintain-ui/src/views/business/malfunctionProject/index.vue b/maintain-ui/src/views/business/malfunctionProject/index.vue
index 4c7b913..4420520 100644
--- a/maintain-ui/src/views/business/malfunctionProject/index.vue
+++ b/maintain-ui/src/views/business/malfunctionProject/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
-      <el-form-item label="故障项目名称" prop="malfunctionName">
+      <el-form-item label="故障项目编号" prop="malfunctionCode">
         <el-input
-          v-model="queryParams.malfunctionName"
-          placeholder="请输入故障项目名称"
+          v-model="queryParams.malfunctionCode"
+          placeholder="请输入故障项目编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="故障项目编号" prop="malfunctionCode">
+      <el-form-item label="故障项目名称" prop="malfunctionName">
         <el-input
-          v-model="queryParams.malfunctionCode"
-          placeholder="请输入故障项目编号"
+          v-model="queryParams.malfunctionName"
+          placeholder="请输入故障项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/maintain-ui/src/views/business/material/index.vue b/maintain-ui/src/views/business/material/index.vue
index 7255de4..e57f454 100644
--- a/maintain-ui/src/views/business/material/index.vue
+++ b/maintain-ui/src/views/business/material/index.vue
@@ -139,7 +139,11 @@
       <el-table-column label="物资名称" align="center" fixed="left" prop="materialName" />
       <el-table-column label="物资规格" align="center" fixed="left" prop="materialSpecifications" />
       <el-table-column label="物资品牌" align="center" fixed="left" prop="materialBrand" />
-      <el-table-column label="物资单位" align="center" fixed="left" prop="materialUnit" />
+      <el-table-column label="物资单位" align="center" fixed="left" prop="materialUnit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="所在仓库" align="center" prop="warehouseName" />-->
 <!--      <el-table-column label="分类名称" align="center" prop="materialTypeName" />-->
       <el-table-column label="供应商" align="center" prop="vendorName" show-overflow-tooltip />
@@ -239,7 +243,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="物资单位" prop="materialUnit">
-              <el-input v-model="form.materialUnit" placeholder="请输入物资单位" />
+              <el-select v-model="form.materialUnit" placeHolder="请选择物资单位">
+                <el-option v-for="dict in dict.type.material_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -364,7 +370,7 @@ import {getToken} from "@/utils/auth";
 
 export default {
   name: "Material",
-  dicts:['sys_is_enable'],
+  dicts:['sys_is_enable', 'material_unit'],
   components: { Treeselect },
   data() {
     return {
diff --git a/maintain-ui/src/views/business/materialCheck/index.vue b/maintain-ui/src/views/business/materialCheck/index.vue
index adb9fd6..5531c2d 100644
--- a/maintain-ui/src/views/business/materialCheck/index.vue
+++ b/maintain-ui/src/views/business/materialCheck/index.vue
@@ -255,7 +255,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="库存" align="center" prop="inventory" />
@@ -326,7 +330,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -369,7 +377,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="库存" align="center" prop="inventory" />
@@ -404,7 +416,7 @@ import { formatDate } from '@/utils'
 export default {
   name: "MaterialCheck",
   components: { Treeselect },
-  dicts: ['check_state', 'check_type', 'check_state', 'check_info_state'],
+  dicts: ['check_state', 'check_type', 'check_state', 'check_info_state', 'material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/materialCheckInfo/index.vue b/maintain-ui/src/views/business/materialCheckInfo/index.vue
index 34b0e20..08e0eab 100644
--- a/maintain-ui/src/views/business/materialCheckInfo/index.vue
+++ b/maintain-ui/src/views/business/materialCheckInfo/index.vue
@@ -203,7 +203,11 @@
       <el-table-column label="物资编码" align="center" prop="materialCode" />
       <el-table-column label="物资名称" align="center" prop="materialName" />
       <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-      <el-table-column label="物资单位" align="center" prop="materialUnit" />
+      <el-table-column label="物资单位" align="center" prop="materialUnit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+        </template>
+      </el-table-column>
       <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
       <el-table-column label="库存数量" align="center" prop="inventory" />
       <el-table-column label="盘点数量" align="center" prop="checkNum" />
@@ -272,7 +276,9 @@
           <el-input v-model="form.materialSpecifications" placeholder="请输入物资规格" />
         </el-form-item>
         <el-form-item label="物资单位" prop="materialUnit">
-          <el-input v-model="form.materialUnit" placeholder="请输入物资单位" />
+          <el-select v-model="form.materialUnit" placeHolder="请选择物资单位">
+            <el-option v-for="dict in dict.type.material_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="质保期" prop="materialWarrantyPeriod">
           <el-input v-model="form.materialWarrantyPeriod" placeholder="请输入质保期" />
@@ -306,6 +312,7 @@ import { listMaterialCheckInfo, getMaterialCheckInfo, delMaterialCheckInfo, addM
 
 export default {
   name: "MaterialCheckInfo",
+  dicts: ['material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/materialPicking/add.vue b/maintain-ui/src/views/business/materialPicking/add.vue
index a6b038a..1c4e64a 100644
--- a/maintain-ui/src/views/business/materialPicking/add.vue
+++ b/maintain-ui/src/views/business/materialPicking/add.vue
@@ -65,7 +65,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -139,7 +143,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -170,7 +178,7 @@ import {listWarehouseAll} from "@/api/business/siteWarehouse";
 
 export default {
   name: "MaterialPickingAdd",
-  dicts: ['sys_is_enable', 'picking_state'],
+  dicts: ['sys_is_enable', 'picking_state', 'material_unit'],
   props: {
     repairFormId:{},
     repairNumber:{},
diff --git a/maintain-ui/src/views/business/materialPicking/index.vue b/maintain-ui/src/views/business/materialPicking/index.vue
index ceb42c5..df40aee 100644
--- a/maintain-ui/src/views/business/materialPicking/index.vue
+++ b/maintain-ui/src/views/business/materialPicking/index.vue
@@ -254,7 +254,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -333,7 +337,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -378,7 +386,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -407,7 +419,7 @@ import {listSiteWarehouse, listWarehouseAll} from "@/api/business/siteWarehouse"
 
 export default {
   name: "MaterialPicking",
-  dicts: ['sys_is_enable', 'picking_state', 'picking_type'],
+  dicts: ['sys_is_enable', 'picking_state', 'picking_type', 'material_unit'],
   data() {
     return {
       // 新增loading
diff --git a/maintain-ui/src/views/business/materialPickingInfo/index.vue b/maintain-ui/src/views/business/materialPickingInfo/index.vue
index 6adfbd8..47e7853 100644
--- a/maintain-ui/src/views/business/materialPickingInfo/index.vue
+++ b/maintain-ui/src/views/business/materialPickingInfo/index.vue
@@ -151,7 +151,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -224,7 +228,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -267,7 +275,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -293,7 +305,7 @@ import { listMaterial } from '@/api/business/material'
 
 export default {
   name: "MaterialPickingInfo",
-  dicts: ['sys_is_enable', 'picking_state'],
+  dicts: ['sys_is_enable', 'picking_state', 'material_unit'],
   props: {
     repairFormId:{},
     repairNumber:{},
diff --git a/maintain-ui/src/views/business/materialPutaway/index.vue b/maintain-ui/src/views/business/materialPutaway/index.vue
index 2e56a21..ff5e7ca 100644
--- a/maintain-ui/src/views/business/materialPutaway/index.vue
+++ b/maintain-ui/src/views/business/materialPutaway/index.vue
@@ -250,7 +250,11 @@
           <el-table-column label="物资编码" align="center" prop="materialCode" />
           <el-table-column label="物资名称" align="center" prop="materialName" />
           <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-          <el-table-column label="物资单位" align="center" prop="materialUnit" />
+          <el-table-column label="物资单位" align="center" prop="materialUnit">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+            </template>
+          </el-table-column>
           <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
           <el-table-column label="参考价" align="center" prop="referencePrice" />
           <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -323,7 +327,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" width="110px" />
         <el-table-column label="物资名称" align="center" prop="materialName" width="180px" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -365,7 +373,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -394,7 +406,7 @@ import { formatDate } from '@/utils'
 
 export default {
   name: "MaterialPutaway",
-  dicts:['putaway_type','putaway_state','sys_is_enable'],
+  dicts:['putaway_type','putaway_state','sys_is_enable', 'material_unit'],
   data() {
     return {
       // 按钮loading
@@ -689,13 +701,8 @@ export default {
             this.buttonLoading = false;
             return
           }
-          this.form.putawayInfoList = this.form.putawayInfoList.map(item =>{
-            return {
-              materialId: item.materialId || item.id,
-              putawayNumber: item.putawayNumber,
-              putawayPrice: item.putawayPrice,
-              putawayMoney: item.putawayMoney,
-            }
+          this.form.putawayInfoList.forEach(item =>{
+            item.materialId = item.materialId || item.id
           })
           if (this.form.id != null) {
             updateMaterialPutaway(this.form).then(response => {
diff --git a/maintain-ui/src/views/business/materialPutawayInfo/index.vue b/maintain-ui/src/views/business/materialPutawayInfo/index.vue
index ffb8b2e..d08992e 100644
--- a/maintain-ui/src/views/business/materialPutawayInfo/index.vue
+++ b/maintain-ui/src/views/business/materialPutawayInfo/index.vue
@@ -92,7 +92,11 @@
       <el-table-column label="物资编码" align="center" prop="materialCode" />
       <el-table-column label="物资名称" align="center" prop="materialName" />
       <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-      <el-table-column label="物资单位" align="center" prop="materialUnit" />
+      <el-table-column label="物资单位" align="center" prop="materialUnit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+        </template>
+      </el-table-column>
       <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
       <el-table-column label="参考价" align="center" prop="referencePrice" />
       <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -172,7 +176,9 @@
           <el-input v-model="form.materialSpecifications" placeholder="请输入物资规格" />
         </el-form-item>
         <el-form-item label="物资单位" prop="materialUnit">
-          <el-input v-model="form.materialUnit" placeholder="请输入物资单位" />
+          <el-select v-model="form.materialUnit" placeHolder="请选择物资单位">
+            <el-option v-for="dict in dict.type.material_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="质保期" prop="materialWarrantyPeriod">
           <el-input v-model="form.materialWarrantyPeriod" placeholder="请输入质保期" />
@@ -218,7 +224,7 @@ import { listMaterialPutawayInfo, getMaterialPutawayInfo, delMaterialPutawayInfo
 
 export default {
   name: "MaterialPutawayInfo",
-  dicts: ['putaway_info_state', 'sys_is_enable'],
+  dicts: ['putaway_info_state', 'sys_is_enable','material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/materialReturns/index.vue b/maintain-ui/src/views/business/materialReturns/index.vue
index 13e631f..e2cf9d5 100644
--- a/maintain-ui/src/views/business/materialReturns/index.vue
+++ b/maintain-ui/src/views/business/materialReturns/index.vue
@@ -224,7 +224,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="入库数量" align="center" prop="putawayNumber" />
         <el-table-column label="入库单价" align="center" prop="putawayPrice" />
@@ -284,7 +288,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="退货数量" align="center" prop="returnsNumber" />
         <el-table-column label="退货单价" align="center" prop="returnsPrice" />
@@ -301,7 +309,7 @@ import { formatDate } from '@/utils'
 
 export default {
   name: "MaterialReturns",
-  dicts:['sys_is_enable', 'putaway_type'],
+  dicts:['sys_is_enable', 'putaway_type','material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/materialReturnsInfo/index.vue b/maintain-ui/src/views/business/materialReturnsInfo/index.vue
index 4585836..2e81b7b 100644
--- a/maintain-ui/src/views/business/materialReturnsInfo/index.vue
+++ b/maintain-ui/src/views/business/materialReturnsInfo/index.vue
@@ -203,7 +203,11 @@
       <el-table-column label="物资编码" align="center" prop="materialCode" />
       <el-table-column label="物资名称" align="center" prop="materialName" />
       <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-      <el-table-column label="物资单位" align="center" prop="materialUnit" />
+      <el-table-column label="物资单位" align="center" prop="materialUnit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+        </template>
+      </el-table-column>
       <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
       <el-table-column label="参考价" align="center" prop="referencePrice" />
       <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -272,7 +276,9 @@
           <el-input v-model="form.materialSpecifications" placeholder="请输入物资规格" />
         </el-form-item>
         <el-form-item label="物资单位" prop="materialUnit">
-          <el-input v-model="form.materialUnit" placeholder="请输入物资单位" />
+          <el-select v-model="form.materialUnit" placeHolder="请选择物资单位">
+            <el-option v-for="dict in dict.type.material_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="质保期" prop="materialWarrantyPeriod">
           <el-input v-model="form.materialWarrantyPeriod" placeholder="请输入质保期" />
@@ -306,6 +312,7 @@ import { listMaterialReturnsInfo, getMaterialReturnsInfo, delMaterialReturnsInfo
 
 export default {
   name: "MaterialReturnsInfo",
+  dicts: ['material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/materialStock/index.vue b/maintain-ui/src/views/business/materialStock/index.vue
index 60a0af2..1f37d7b 100644
--- a/maintain-ui/src/views/business/materialStock/index.vue
+++ b/maintain-ui/src/views/business/materialStock/index.vue
@@ -48,10 +48,14 @@
       <el-table-column label="物资编码" align="center" fixed="left" prop="materialCode" />
       <el-table-column label="物资名称" align="center" fixed="left" prop="materialName" />
       <el-table-column label="物资规格" align="center" fixed="left" prop="materialSpecifications" />
-      <el-table-column label="物资品牌" align="center" fixed="left" prop="materialBrand" />
-      <el-table-column label="物资单位" align="center" fixed="left" prop="materialUnit" />
+<!--      <el-table-column label="物资品牌" align="center" fixed="left" prop="materialBrand" />-->
+      <el-table-column label="物资单位" align="center" fixed="left" prop="materialUnit">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+        </template>
+      </el-table-column>
       <el-table-column label="供应商" align="center" prop="vendorName" show-overflow-tooltip />
-      <el-table-column label="采购标的" align="center" prop="procurementSubject" />
+<!--      <el-table-column label="采购标的" align="center" prop="procurementSubject" />-->
       <el-table-column label="适用车型" align="center" prop="compatibleWith" />
       <el-table-column label="物资图片" align="center" prop="materialUrl">
         <template slot-scope="scope">
diff --git a/maintain-ui/src/views/business/pickingReturn/index.vue b/maintain-ui/src/views/business/pickingReturn/index.vue
index cdcd24a..9e2ebc8 100644
--- a/maintain-ui/src/views/business/pickingReturn/index.vue
+++ b/maintain-ui/src/views/business/pickingReturn/index.vue
@@ -194,7 +194,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -234,7 +238,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="vendorName" />
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
@@ -259,7 +267,7 @@ import {formatDate} from '@/utils'
 
 export default {
   name: "MaterialPicking",
-  dicts: ['sys_is_enable', 'picking_state'],
+  dicts: ['sys_is_enable', 'picking_state','material_unit'],
   data() {
     return {
       // 按钮loading
diff --git a/maintain-ui/src/views/business/repairForm/index.vue b/maintain-ui/src/views/business/repairForm/index.vue
index 9d3a002..bb0969b 100644
--- a/maintain-ui/src/views/business/repairForm/index.vue
+++ b/maintain-ui/src/views/business/repairForm/index.vue
@@ -438,15 +438,15 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push({name: "repairFormEdit", params:{repairFormId: undefined, flag: 0, isDelivery: undefined}});
+      this.$router.push({name: "repairFormEdit", query: {repairFormId: undefined, flag: 0, isDelivery: undefined}});
     },
     /** 详情按钮操作 */
     handleDetail(row) {
-      this.$router.push({name: "repairFormEdit", params:{repairFormId: row.id, flag: 2, isDelivery: row.isDelivery}});
+      this.$router.push({name: "repairFormEdit", query: {repairFormId: row.id, flag: 2, isDelivery: row.isDelivery}});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push({name: "repairFormEdit", params:{repairFormId: row.id, flag: 1, isDelivery: row.isDelivery}});
+      this.$router.push({name: "repairFormEdit", query: {repairFormId: row.id, flag: 1, isDelivery: row.isDelivery}});
     },
     /** 删除按钮操作 */
     handleDelete(row) {
diff --git a/maintain-ui/src/views/business/repairForm/info.vue b/maintain-ui/src/views/business/repairForm/info.vue
index bf20350..0723da3 100644
--- a/maintain-ui/src/views/business/repairForm/info.vue
+++ b/maintain-ui/src/views/business/repairForm/info.vue
@@ -108,24 +108,24 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="报修单类型" prop="repairType">
-              <el-select v-model="form.repairType" placeholder="请选择" style="width: 100%;" :disabled="flag == 2">
+              <el-select v-model="form.repairType" placeholder="请选择" @change="this.repairTypeChange" style="width: 100%;" :disabled="flag == 2">
                 <el-option v-for="item in dict.type.baoxiudanleixing" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否返修" prop="isRebuild">
-              <el-select v-model="form.isRebuild" placeholder="请选择" style="width: 100%;" :disabled="flag == 2">
-                <el-option v-for="item in dict.type.shifou" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="维修原因" prop="repairCause">
+              <el-select v-model="form.repairCause" placeholder="请选择" style="width: 100%;" multiple :disabled="flag == 2 || form.repairType === undefined">
+                <el-option v-for="item in reasonList" :key="item.id" :label="item.maintainCauseName" :value="item.maintainCauseName" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="维修原因" prop="repairCause">
-              <el-select v-model="form.repairCause" placeholder="请选择" style="width: 100%;" multiple :disabled="flag == 2">
-                <el-option v-for="item in reasonList" :key="item.id" :label="item.maintainCauseName" :value="item.maintainCauseName" />
+            <el-form-item label="是否返修" prop="isRebuild">
+              <el-select v-model="form.isRebuild" placeholder="请选择" style="width: 100%;" :disabled="flag == 2">
+                <el-option v-for="item in dict.type.shifou" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -200,38 +200,38 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="拖车公司" prop="trailerCompany">
-              <el-input v-model="form.trailerCompany" placeholder="请输入" :disabled="flag == 2"/>
+              <el-input v-model="form.trailerCompany" placeholder="请输入" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="拖车车牌号" prop="trailerPlateNumber">
-              <el-input v-model="form.trailerPlateNumber" placeholder="请输入" :disabled="flag == 2"/>
+              <el-input v-model="form.trailerPlateNumber" placeholder="请输入" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="拖车公里" prop="trailerVehicleKilometers">
-              <el-input v-model="form.trailerVehicleKilometers" :min="0" placeholder="请输入" style="width: 100%" :disabled="flag == 2">
+              <el-input v-model="form.trailerVehicleKilometers" :min="0" placeholder="请输入" style="width: 100%" :disabled="flag == 2 || form.isTrailer === '0'">
                 <template slot="append">KM</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="拖车司机" prop="trailerDriver">
-              <el-input v-model="form.trailerDriver" placeholder="请输入" :disabled="flag == 2"/>
+              <el-input v-model="form.trailerDriver" placeholder="请输入" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="拖车联系电话" prop="trailerPhone">
-              <el-input v-model="form.trailerPhone" placeholder="请输入" maxlength="11" @input="form.trailerPhone=form.trailerPhone.replace(/\D/g,'')" :disabled="flag == 2"/>
+              <el-input v-model="form.trailerPhone" placeholder="请输入" maxlength="11" @input="form.trailerPhone=form.trailerPhone.replace(/\D/g,'')" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="费用" prop="trailerMoney">
-              <el-input-number v-model="form.trailerMoney" placeholder="请输入" :min="0" style="width: 100%" :disabled="flag == 2"/>
+              <el-input-number v-model="form.trailerMoney" placeholder="请输入" :min="0" style="width: 100%" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -240,7 +240,7 @@
                               v-model="form.trailerStartTime"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm:ss"
-                              :disabled="flag == 2"
+                              :disabled="flag == 2 || form.isTrailer === '0'"
                               @change="trailerStartTimeChange"
                               placeholder="请选择">
               </el-date-picker>
@@ -252,7 +252,7 @@
                               v-model="form.trailerEndTime"
                               type="datetime"
                               value-format="yyyy-MM-dd HH:mm:ss"
-                              :disabled="flag == 2"
+                              :disabled="flag == 2 || form.isTrailer === '0'"
                               @change="trailerEndTimeChange"
                               placeholder="请选择">
               </el-date-picker>
@@ -262,19 +262,19 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="救援地点" prop="rescueLocation">
-              <el-input v-model="form.rescueLocation" placeholder="请输入"  :disabled="flag == 2"/>
+              <el-input v-model="form.rescueLocation" placeholder="请输入"  :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="目的地点" prop="destinationLocation">
-              <el-input v-model="form.destinationLocation" placeholder="请输入" :disabled="flag == 2"/>
+              <el-input v-model="form.destinationLocation" placeholder="请输入" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="备注" prop="trailerRemark">
-              <el-input v-model="form.trailerRemark" placeholder="请输入" type="textarea" rows="4" :disabled="flag == 2"/>
+              <el-input v-model="form.trailerRemark" placeholder="请输入" type="textarea" rows="4" :disabled="flag == 2 || form.isTrailer === '0'"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -282,7 +282,7 @@
         <el-divider />
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="部门" prop="repairerDeptId">
+            <el-form-item label="车间" prop="repairerDeptId">
               <treeselect v-model="form.repairerDeptId" :options="treeData" placeholder="请选择" style="width: 100%;" :show-count="true" @select="handleDeptChange" :loadOptions="()=>{}" :normalizer="normalizer" :disabled="flag == 2"/>
             </el-form-item>
           </el-col>
@@ -319,8 +319,8 @@
           </el-col>
         </el-row>
         <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px;">
-          <span style="font-weight: bold; font-size: 18px;">故障信息</span>
-          <el-button type="primary" :disabled="flag == 2" @click="guzhangOpen=true">添加</el-button>
+          <span style="font-weight: bold; font-size: 18px;">创建信息</span>
+<!--          <el-button type="primary" :disabled="flag == 2" @click="guzhangOpen=true">添加</el-button>-->
         </div>
         <el-divider />
         <el-row :gutter="20">
@@ -337,7 +337,7 @@
         </el-row>
       </el-form>
     </div>
-      <el-tabs v-model="activeTab" v-if="flag == 2" style="padding: 10px; margin-bottom: 100px">
+    <el-tabs v-model="activeTab" v-if="flag == 2" style="padding: 10px; margin-bottom: 100px">
         <el-tab-pane label="维修项目" name="0">
           <repairFormProject
             :type="1"
@@ -504,7 +504,7 @@ export default {
         totalActualTime: undefined,
         repairType: undefined,
         isRebuild: undefined,
-        repairCause: undefined,
+        repairCause: [],
         vehicleKilometers: undefined,
         isOldPart: undefined,
         isByoPart: undefined,
@@ -513,7 +513,7 @@ export default {
         byoPartUrl: undefined,
         dashboardUrl: undefined,
         bodyConditionUrl: undefined,
-        isTrailer: undefined,
+        isTrailer: '0',
         trailerCompany: undefined,
         trailerPlateNumber: undefined,
         trailerDriver: undefined,
@@ -550,7 +550,6 @@ export default {
         state: undefined,
         maintainEndTime: undefined,
         isDelivery: undefined,
-        deliveryTime: undefined,
         settlementTime: undefined,
         createBy: this.$store.state.user.userInfo.userName,
         createTime: formatDate(new Date().getTime()),
@@ -586,7 +585,9 @@ export default {
           carPickupUrl: undefined,
         },
       },
-      deliveryForm: {},
+      deliveryForm: {
+        deliveryTime: formatDate(new Date().getTime()),
+      },
       activeTab: '0',
       flag: false,
       maintainUserList: [],
@@ -679,13 +680,12 @@ export default {
     };
   },
   created() {
-    this.repairFormId = this.$route.params && this.$route.params.repairFormId
-    this.isDelivery = this.$route.params && this.$route.params.isDelivery;
+    this.repairFormId = this.$route.query && this.$route.query.repairFormId
+    this.isDelivery = this.$route.query && this.$route.query.isDelivery;
     this.getCarList();
     this.getClientList();
-    this.getReason();
     this.getTreeData();
-    this.flag = this.$route.params && this.$route.params.flag;
+    this.flag = this.$route.query && this.$route.query.flag;
     if (this.flag && this.flag != 0) {
       this.getDetail();
       this.getMaintainUserList()
@@ -719,7 +719,12 @@ export default {
         response.data.repairerGroupId=''+response.data.repairerGroupId;
         this.carList.push(response.data.car);
         this.form = response.data;
-        this.deliveryForm = response.data.deliveryVo
+        if (response.data.deliveryVo && response.data.deliveryTime) {
+          this.deliveryForm = response.data.deliveryVo
+        }else {
+          this.deliveryForm.deliveryTime = formatDate(new Date().getTime())
+        }
+
 
       })
     },
@@ -754,8 +759,12 @@ export default {
         this.clientList = res.rows
       })
     },
+    /* 报修单类型更改 */
+    repairTypeChange(e) {
+      this.getReason();
+    },
     getReason(){
-      listMaintainCause({ pageSize: 99, pageNum: 1, }).then(res=>{
+      listMaintainCause({ pageSize: 99, pageNum: 1, type: this.form.repairType}).then(res=>{
         this.reasonList = res.rows
       })
     },
@@ -788,14 +797,14 @@ export default {
       let item = this.carList.find(item=>item.id == e);
       if(item){
         this.form.carId = item.id;
-        let clientForm = ['plateNumber','clientName','phone','clientType','clientId']
+        let clientForm = ['plateNumber','clientName','phone','clientType','clientId','carVin']
         clientForm.forEach(item1=>{
           if (item[item1]) {
             this.form[item1]='' + item[item1]
           }
         })
         if (item.carTypeId) {
-          let carTypeForm = ['carVin','carTypeCode','carBrand','carModel','expendType','carConfiguration','carColour','chassisNumber','motorNumber']
+          let carTypeForm = ['carTypeCode','carBrand','carModel','expendType','carConfiguration','carColour','chassisNumber','motorNumber']
           this.form.vehicleModelId = item.carTypeId;
           getVehicleModel(item.carTypeId).then(res=>{
             carTypeForm.forEach(item1=>{
@@ -803,7 +812,6 @@ export default {
                 this.form[item1]='' + res.data[item1]
               }
             })
-            console.log('this.form', this.form)
           })
         }
       }
@@ -846,6 +854,7 @@ export default {
       if(this.$refs.jianyan.names){
         this.form.examineItem = this.$refs.jianyan.names;
         this.jianyanOpen = false;
+        this.$refs.form.clearValidate('examineItem');
       }else{
         this.$message.error('至少选择一项');
       }
@@ -854,6 +863,7 @@ export default {
       if(this.$refs.guzhang.names){
         this.form.malfunctionItem = this.$refs.guzhang.names;
         this.guzhangOpen = false;
+        this.$refs.form.clearValidate('malfunctionItem');
       }else{
         this.$message.error('至少选择一项');
       }
diff --git a/maintain-ui/src/views/business/repairFormProject/index.vue b/maintain-ui/src/views/business/repairFormProject/index.vue
index bd013da..38b47d0 100644
--- a/maintain-ui/src/views/business/repairFormProject/index.vue
+++ b/maintain-ui/src/views/business/repairFormProject/index.vue
@@ -9,7 +9,7 @@
             size="mini"
             :disabled="isDelivery == 1"
             @click="handleAdd"
-            v-hasPermi="['business:repairFormPeoject:add']"
+            v-hasPermi="['business:repairFormProject:add']"
         >新增</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -121,7 +121,7 @@
       <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getMaintainList"></right-toolbar>
       </el-row>
-      <el-table v-loading="loading" :data="maintainProjectList" @selection-change="handleMaintainSelectionChange">
+      <el-table v-loading="loading" :data="maintainProjectList" max-height="450px" @selection-change="handleMaintainSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="维修项目类别" align="center" prop="typeName" />
@@ -141,7 +141,7 @@
       />
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button :loading="buttonLoading" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -149,7 +149,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="115px">
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="站点名称">
+            <el-form-item label="班组名称">
               <el-input v-model="form.groupName" placeholder="请输入" disabled />
             </el-form-item>
           </el-col>
@@ -168,12 +168,12 @@
       <repairFormProjectDispatch ref="projectDispatch" :data="form" />
       <div slot="footer" class="dialog-footer">
 <!--        <el-button :loading="buttonLoading" type="primary" @click="submitForm2">确 定</el-button>-->
-        <el-button @click="open1 = false">取 消</el-button>
+        <el-button @click="open1 = false">关 闭</el-button>
       </div>
     </el-dialog>
 
     <el-dialog title="检验人员" :visible.sync="open2" width="400px" append-to-body destroy-on-close>
-      <el-form ref="examineForm" :model="examineForm" :rules="examineRules" label-width="80px">
+      <el-form ref="examineForm" :model="examineForm" :rules="examineRules" label-width="100px">
         <el-col>
           <el-form-item label="检验人员" prop="examineUserId">
             <el-select v-model="examineForm.examineUserId" filterable style="width: 100%">
@@ -257,7 +257,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 100,
+        pageSize: 1000,
         repairFormId: undefined,
         typeId: undefined,
         typeName: undefined,
@@ -277,7 +277,7 @@ export default {
       // 查询参数
       queryMaintainParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 1000,
         typeId: undefined,
         typeName: undefined,
         projectCode: undefined,
@@ -404,7 +404,7 @@ export default {
     /** 查询维修项目列表 */
     getMaintainList() {
       this.loading = true;
-      listMaintainProject({ ...this.queryParams, notInIdList: this.repairFormProjectList.map(item => item.maintainId) }).then(response => {
+      listMaintainProject({ ...this.queryMaintainParams, notInIdList: this.repairFormProjectList.map(item => item.maintainId) }).then(response => {
         this.maintainProjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -417,7 +417,7 @@ export default {
     },
     /** 查询人员-人员列表 */
     getMaintainUserList() {
-      listUser({ type: 1, pageNum: 1, pageSize: 100 }).then(response => {
+      listUser({ type: 1, pageNum: 1, pageSize: 1000 }).then(response => {
         this.maintainUserList = response.rows;
       });
     },
diff --git a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
index c582940..9b04962 100644
--- a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
+++ b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue
@@ -286,6 +286,7 @@ export default {
         });
       }
       this.open = false
+      this.$refs.user.selectList = []
     },
     /** 删除按钮操作 */
     handleDelete(row) {
diff --git a/maintain-ui/src/views/business/settlementConfirm/index.vue b/maintain-ui/src/views/business/settlementConfirm/index.vue
index cf1c2cd..712e164 100644
--- a/maintain-ui/src/views/business/settlementConfirm/index.vue
+++ b/maintain-ui/src/views/business/settlementConfirm/index.vue
@@ -103,7 +103,7 @@
             icon="el-icon-edit"
             v-if="scope.row.state === 1"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:settlementConfirm:receipt']"
+            v-hasPermi="['business:settlementMaintain:receipt']"
           >回执</el-button>
         </template>
       </el-table-column>
diff --git a/maintain-ui/src/views/business/settlementMaterial/info/index1.vue b/maintain-ui/src/views/business/settlementMaterial/info/index1.vue
index 4de7e06..8399e30 100644
--- a/maintain-ui/src/views/business/settlementMaterial/info/index1.vue
+++ b/maintain-ui/src/views/business/settlementMaterial/info/index1.vue
@@ -56,7 +56,11 @@
             <el-table-column label="物资编码" align="center" prop="materialCode" />
             <el-table-column label="物资名称" align="center" prop="materialName" />
             <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-            <el-table-column label="物资单位" align="center" prop="materialUnit" />
+            <el-table-column label="物资单位" align="center" prop="materialUnit">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+              </template>
+            </el-table-column>
             <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
             <el-table-column label="数量" align="center" prop="collectNumber" width="120px" />
             <el-table-column label="单价" align="center" prop="price" width="120px" />
@@ -189,7 +193,11 @@
                 <el-table-column label="物资编码" align="center" prop="materialCode" />
                 <el-table-column label="物资名称" align="center" prop="materialName" />
                 <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-                <el-table-column label="物资单位" align="center" prop="materialUnit" />
+                <el-table-column label="物资单位" align="center" prop="materialUnit">
+                  <template slot-scope="scope">
+                    <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+                  </template>
+                </el-table-column>
                 <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
                 <el-table-column label="数量" align="center" prop="settlementNumber" width="120px" />
                 <el-table-column label="单价" align="center" prop="settlementPrice" width="120px">
@@ -261,7 +269,11 @@
         <el-table-column label="物资编码" align="center" prop="materialCode" />
         <el-table-column label="物资名称" align="center" prop="materialName" />
         <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-        <el-table-column label="物资单位" align="center" prop="materialUnit" />
+        <el-table-column label="物资单位" align="center" prop="materialUnit">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+          </template>
+        </el-table-column>
         <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
         <el-table-column label="参考价" align="center" prop="referencePrice" />
         <el-table-column label="销售价" align="center" prop="sellingPrice" />
@@ -282,7 +294,7 @@ import { formatDate } from '@/utils'
 
 export default {
   name: "MaterialPicking",
-  dicts: ['sys_is_enable', 'picking_state', 'settlement_material_type', 'repair_form_settlement_state'],
+  dicts: ['sys_is_enable', 'picking_state', 'settlement_material_type', 'repair_form_settlement_state','material_unit'],
   data() {
     return {
       // 按钮loading
@@ -324,7 +336,7 @@ export default {
         receiveUserName: undefined,
         receiveTime: undefined,
         state: undefined,
-        stateList: [1, 2],
+        stateList: [2],
         settlementState: 1,
         type: 1,
         outTime: undefined,
diff --git a/maintain-ui/src/views/business/settlementMaterial/info/index2.vue b/maintain-ui/src/views/business/settlementMaterial/info/index2.vue
index 432b6b2..7e934b2 100644
--- a/maintain-ui/src/views/business/settlementMaterial/info/index2.vue
+++ b/maintain-ui/src/views/business/settlementMaterial/info/index2.vue
@@ -209,7 +209,11 @@
                 <el-table-column label="物资编码" align="center" prop="materialCode" />
                 <el-table-column label="物资名称" align="center" prop="materialName" />
                 <el-table-column label="物资规格" align="center" prop="materialSpecifications" />
-                <el-table-column label="物资单位" align="center" prop="materialUnit" />
+                <el-table-column label="物资单位" align="center" prop="materialUnit">
+                  <template slot-scope="scope">
+                    <dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit" />
+                  </template>
+                </el-table-column>
                 <el-table-column label="质保期" align="center" prop="materialWarrantyPeriod" />
                 <el-table-column label="数量" align="center" prop="settlementNumber" width="120px" />
                 <el-table-column label="单价" align="center" prop="settlementPrice" width="120px" />
diff --git a/maintain-ui/src/views/business/user/index.vue b/maintain-ui/src/views/business/user/index.vue
index 46e6472..d6a314a 100644
--- a/maintain-ui/src/views/business/user/index.vue
+++ b/maintain-ui/src/views/business/user/index.vue
@@ -254,6 +254,10 @@ export default {
     data: {
       type: Object,
       default: {}
+    },
+    userIds: {
+      type: Array,
+      default: () => []
     }
   },
   components: {
diff --git a/maintain-ui/src/views/system/dept/index.vue b/maintain-ui/src/views/system/dept/index.vue
index fbb7836..7e07e03 100644
--- a/maintain-ui/src/views/system/dept/index.vue
+++ b/maintain-ui/src/views/system/dept/index.vue
@@ -69,6 +69,11 @@
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <el-table-column prop="type" label="类型" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_dept_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -159,6 +164,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="form.type" placeHolder="请选择类型">
+                <el-option v-for="dict in dict.type.sys_dept_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -175,7 +189,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Dept",
-  dicts: ['sys_normal_disable'],
+  dicts: ['sys_normal_disable', 'sys_dept_type'],
   components: { Treeselect },
   data() {
     return {
@@ -269,7 +283,8 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
-        status: "0"
+        status: "0",
+        type: undefined
       };
       this.resetForm("form");
     },
diff --git a/maintain-ui/src/views/system/role/index.vue b/maintain-ui/src/views/system/role/index.vue
index f684b9f..d6a7a7f 100644
--- a/maintain-ui/src/views/system/role/index.vue
+++ b/maintain-ui/src/views/system/role/index.vue
@@ -100,7 +100,7 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+<!--      <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" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
-- 
2.22.0