diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
index b624a1bad50c329025852ee637f4433d25c6dc26..f123811ecfd769de74f392ddd22a489d8edc1c9b 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
@@ -73,21 +73,13 @@ public class ActSuppliesController extends BaseController
      * 导出物料总分类管理列表
      */
     @PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:export')")
-    @Log(title = "物料总分类管理", businessType = BusinessType.EXPORT)
+    @Log(title = "用友物料", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(ActSupplies actSupplies)
     {
 
         List<ActSupplies> list = actSuppliesService.selectActSuppliesList(actSupplies);
-        for (ActSupplies s : list) {
-            String ss = s.getStatus();
-            if("0".equals(ss)){
-                s.setStatus("启用");
-            }else {
-                s.setStatus("禁用");
-            }
 
-        }
         ExcelUtil<ActSupplies> util = new ExcelUtil<ActSupplies>(ActSupplies.class);
         return util.exportExcel(list, "用友物料");
     }
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
index f15015838aa5e994f808c6f6c3859d79c75a37ca..377108dbdb12ad5ea1d3fed4a4f5e635e565e191 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
@@ -90,8 +90,12 @@ public class ActSuppliesDetailsController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesDetails.setCreateBy(user.getUserName());
-
-        return toAjax(actSuppliesDetailsService.insertActSuppliesDetails(actSuppliesDetails));
+        /*return toAjax(actSuppliesService.insertActSupplies(actSupplies));*/
+        int i = actSuppliesDetailsService.insertActSuppliesDetails(actSuppliesDetails);
+        if(i == 0){
+            return AjaxResult.error("添加名称失败，名称已被占用");
+        }
+        return  AjaxResult.success("添加成功");
     }
 
     /**
@@ -104,8 +108,12 @@ public class ActSuppliesDetailsController extends BaseController
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesDetails.setUpdateBy(user.getUserName());
-
-        return toAjax(actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails));
+//        return toAjax(actSuppliesService.updateActSupplies(actSupplies));
+        int i = actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails);
+        if(i==0){
+            return AjaxResult.error("修改名称失败.名称已被占用");
+        }
+        return AjaxResult.success("修改成功");
     }
 
     /**
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java
index 8bcefabf9995ae6464759b6d3a90cd0d108d92c8..e3229074e8af15b42ad88d31c45d49f8aaf31dcd 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java
@@ -109,7 +109,7 @@ public class ActSuppliesRoleController extends BaseController
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRole.setUpdateBy(user.getUserName());
         /*return toAjax(actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole));*/
-        int i = actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole);
+        int i = actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole);
         if(i==0){
             return AjaxResult.error("修改名称失败，名称已被占用");
         }
@@ -158,7 +158,7 @@ public class ActSuppliesRoleController extends BaseController
 
         System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
         actSuppliesRoleService.setDisable(id);
-        return AjaxResult.success();
+        return AjaxResult.success("200","修改成功");
 
     }
 }
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java
index d7b686aa2b5db5a2da4f9d45fd079da5c9055c01..7ce8bd441482b4db1567994ae32fcc81e57a4586 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSupplies.java
@@ -21,19 +21,19 @@ public class ActSupplies extends BaseEntity
     /** 父ID */
     private Long pid;
 
-    @Excel(name = "大类名称")
+    @Excel(name = "一级分类名称")
     private String fname;
 
     /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "二级分类名称")
     private String suppliesName;
 
     /** 显示排序 */
     private Long orderNum;
 
     /** 状态 */
-    @Excel(name = "状态")
-    private String status;
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
+    private Integer status;
 
 
 
@@ -82,11 +82,11 @@ public class ActSupplies extends BaseEntity
         return orderNum;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public String  getStatus()
+    public Integer  getStatus()
     {
         return status;
     }
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java
index 2d07d4bf2f78f87c086e5e0a579b3ecafc0041e5..10322c233f275749734c93bd521a998c0717a4da 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesDetails.java
@@ -33,7 +33,7 @@ public class ActSuppliesDetails extends BaseEntity
     private String sysclassify;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态" ,readConverterExp="0=启用,1=禁用")
     private Integer status;
 
     public String getFname() {
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java
index 03156bc4281265d130537d852242471ef2b74a40..feeba356d082bda5370481acf20255791d68a11c 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRole.java
@@ -30,7 +30,7 @@ public class ActSuppliesRole extends BaseEntity
     private String roleName;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
     private Integer status;
 
 
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
index adfc007458db61c336f03e8fa9a18c71ce62ab15..29add65402adac6bb4520e937ef22cffb86b0085 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java
@@ -39,7 +39,7 @@ public class ActSuppliesTemplate extends BaseEntity
     private String templateContent;
 
     /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "状态",readConverterExp="0=启用,1=禁用")
     private Integer status;
 
     public void setId(Long id)
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java
index eadd90519e14cc75df81ad4bd92fcf4f6dd60dac..1d1f1258864e4be018695eda57fa785cbb85a1e1 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesDetailsMapper.java
@@ -62,5 +62,12 @@ public interface ActSuppliesDetailsMapper
      */
     public int deleteActSuppliesDetailsByIds(Long[] ids);
 
+    /**
+     *
+     * @param
+     * @return
+     */
+    public int countByDetailsName(String detailsName);
+
     List<ActSupplies> saveSid();
 }
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java
index ef83f081ceec18914b27e6b7b224c0f275729e51..c302bcc017ce3661c35c84b001323c84d4e55649 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesDetailsService.java
@@ -77,4 +77,5 @@ public interface IActSuppliesDetailsService
      * @param id  尝试禁用物料总分类管理的id
      */
     void setDisable(Long id);
+
 }
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java
index 8141ac38419ed920155c7dfcf0577f7da86b1d0f..4891a396f1749cd0bc165b2ca431d8b1fc9b4f4d 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesDetailsServiceImpl.java
@@ -6,6 +6,7 @@ import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.mapper.ActSuppliesDetailsMapper;
 import com.ruoyi.system.service.IActSuppliesDetailsService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -56,7 +57,20 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     @Override
     public int insertActSuppliesDetails(ActSuppliesDetails actSuppliesDetails)
     {
+        String detailsName= actSuppliesDetails.getDetailsName();
+        int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
+        if(countByDetailsName > 0){
+            String message = "添加六矿物料失败，名称已被占用！";
+            System.out.println(message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
+            return 0;
+        }
+
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSuppliesDetails,actSupplies1);
+
         actSuppliesDetails.setCreateTime(DateUtils.getNowDate());
+
         return actSuppliesDetailsMapper.insertActSuppliesDetails(actSuppliesDetails);
     }
 
@@ -69,7 +83,20 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     @Override
     public int updateActSuppliesDetails(ActSuppliesDetails actSuppliesDetails)
     {
-        actSuppliesDetails.setUpdateTime(DateUtils.getNowDate());
+        String detailsName= actSuppliesDetails.getDetailsName();
+        int countByDetailsName = actSuppliesDetailsMapper.countByDetailsName(detailsName);
+        if(countByDetailsName > 0){
+            String message = "修改六矿物料失败，名称已被占用！";
+            System.out.println(message);
+            /*throw new ServiceException(ServiceCode.ERR_CONFLICT,message);*/
+            return 0;
+        }
+
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSuppliesDetails,actSupplies1);
+
+        actSuppliesDetails.setCreateTime(DateUtils.getNowDate());
+
         return actSuppliesDetailsMapper.updateActSuppliesDetails(actSuppliesDetails);
     }
 
@@ -112,6 +139,7 @@ public class ActSuppliesDetailsServiceImpl implements IActSuppliesDetailsService
     }
 
 
+
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};
 
diff --git a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java
index c3a6d7302115d18feca5b9a1e78b3bf188e6b38a..7096f5f3392112d35f0c51970f554aeed99ee22c 100644
--- a/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java
+++ b/ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java
@@ -93,12 +93,13 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
             String message = "修改物料总分类管理失败，新的名称已被占用！";
             System.out.println(message);
           /*  throw new ServiceException(ServiceCode.ERR_CONFLICT, message);*/
+            return 0;
         }
         ActSupplies actSupplies1 = new ActSupplies();
         BeanUtils.copyProperties(actSupplies,actSupplies1);
         actSupplies.setUpdateTime(DateUtils.getNowDate());
-        return 0;
-        /*actSuppliesMapper.updateActSupplies(actSupplies);*/
+
+         return actSuppliesMapper.updateActSupplies(actSupplies);
     }
 
     /**
@@ -137,12 +138,12 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     @Override
     public void setEnable(Long id) {
-        updateStatusById(id,"0");
+        updateStatusById(id,0);
     }
 
     @Override
     public void setDisable(Long id) {
-        updateStatusById(id,"1");
+        updateStatusById(id,1);
     }
 
     @Override
@@ -166,22 +167,20 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         return actSuppliesMapper.selectActSuppliesListOne(actSupplies);
     }
 
-    private void updateStatusById(Long id, String status){
+    private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};
 
-
-
         //判断查询结果是否为空
         ActSupplies queryResult = actSuppliesMapper.selectActSuppliesById(id);
         if(queryResult ==null) {
-            String message =statusText[Integer.parseInt(status)] + "物料总分类管理失败，尝试访问的数据不存在";
+            String message =statusText[status] + "物料总分类管理失败，尝试访问的数据不存在";
             System.out.println(message);
             throw new RuntimeException(message);
         }
 
         //判断以上查询结果中的status是否与参数status相同
         if(queryResult.getStatus().equals(status)){
-            String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[Integer.parseInt(status)] + "状态！";
+            String message = statusText[status] + "物料总分类管理失败，当前物料总分类管理已经处理" +statusText[status] + "状态！";
             System.out.println(message);
             throw new RuntimeException(message);
         }
@@ -193,10 +192,11 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
         int rows = actSuppliesMapper.updateActSupplies(actSupplies);
         if (rows != 1) {
-            String message = statusText[Integer.parseInt(status)] + "物料总分类管理失败，服务器忙请再次重试";
+            String message = statusText[status] + "物料总分类管理失败，服务器忙请再次重试";
             System.out.println(message);
             throw new RuntimeException(message);
         }
     }
 
-        }
+}
+
diff --git a/ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml b/ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml
index 18623c47729d836c318037619cc2e21dbdeb5130..7eb06d120f7913227079504568c97b298b32ebeb 100644
--- a/ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml
+++ b/ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml
@@ -46,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, sid, details_name, sysclassify, status, create_by, create_time, update_by, update_time from act_supplies_details
     </sql>
 
+    <select id="countByDetailsName" resultType="int">
+        select count(*) from act_supplies_details where  details_name=#{detailsName}
+    </select>
+
     <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSupplies" resultMap="ActSuppliesResult">
 --         select id,pid,supplies_name from act_supplies where status = 0;
         select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a LEFT JOIN act_supplies b on  a.pid =b.id where a.status = 0
diff --git a/ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue b/ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
index dbcd36df8f37d458356a0419047a572198c8348d..2d39854ec657f17e4c18413f2f44226448a6e03c 100644
--- a/ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
+++ b/ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
@@ -150,7 +150,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="sid">
+        <el-form-item label="上级分类" prop="sid">
           <el-select v-model="form.sid" filterable placeholder="请选择所属分类" style="width:380px" >
             <el-option
               v-for="option in options2"
@@ -194,6 +194,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+        name:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -341,6 +342,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.name = selection.map(item => item.detailsName)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -384,7 +386,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除物料名称为"' + row.detailsName + '"的数据项?', "警告", {
+      const name = row.detailsName|| this.name ;
+      this.$confirm('是否确认删除物料名称为"' + name  + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -404,7 +407,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有物料细分类管理数据项?', "警告", {
+      this.$confirm('是否确认导出所有六矿物料数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
diff --git a/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue b/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
index e42d51f6b3d2cf5409a82ce6992de67a8dcb0625..eda63b464b7d49a754f0f6fa4c3e92a6b99c3db3 100644
--- a/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
+++ b/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
@@ -147,7 +147,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="物料名称" prop="suppliesName">
-                    <el-input v-model="form.suppliesName" placeholder="请输入二级分类名称"  maxlength="15"/>
+                    <el-input v-model="form.suppliesName" placeholder="请输入二级分类名称" maxlength="15"/>
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-select v-model="form.status" placeholder="请选择状态">
@@ -180,6 +180,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name:[],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -276,6 +277,8 @@ export default {
                 });
             }
         },
+
+
         /** 查询上级关联关系*/
         fetchOptions() {
             getPid().then(response => {
@@ -288,9 +291,6 @@ export default {
             this.indexMethod(0);
             this.loading = true;
             listSupplies(this.queryParams).then(response => {
-                for (let i = 0; i < response.rows.length; i++) {
-                    response.rows[i].status=parseInt( response.rows[i].status);
-                }
                 this.suppliesList = response.rows;
                 this.total = response.total;
                 this.loading = false;
@@ -377,7 +377,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除物料总分类管理编号为"' + row.suppliesName + '"的数据项?', "警告", {
+            const name = row.suppliesName|| this.name;
+            this.$confirm('是否确认删除物料总分类管理编号为"' + name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -397,7 +398,7 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             const queryParams = this.queryParams;
-            this.$confirm('是否确认导出所有物料总分类管理数据项?', "警告", {
+            this.$confirm('是否确认导出所有二级分类数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
diff --git a/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue b/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue
index fca0b66e73dc5b9d00d744d3dc97ca497c3dd563..d4ba3033e60640f497d505f4126acd22c00944c9 100644
--- a/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue
+++ b/ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue
@@ -19,6 +19,7 @@
                     clearable
                     size="small"
                     @keyup.enter.native="handleQuery"
+                    maxlength="15"
                 />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -83,7 +84,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <!--      <el-table-column label="ID" align="center" prop="id" />-->
             <el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
-            <el-table-column label="一级分类名称" align="center" prop="suppliesName" />
+            <el-table-column label="一级分类名称" align="center" prop="suppliesName"  maxlength="15"/>
             <el-table-column label="状态" align="center">
                 <template slot-scope="scope">
                     <div>
@@ -172,6 +173,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name: [],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -328,6 +330,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
+            this.name = selection.map(item => item.suppliesName)
             this.single = selection.length!==1
             this.multiple = !selection.length
         },
@@ -373,7 +376,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除物料总分类管理编号为"' + row.suppliesName + '"的数据项?', "警告", {
+            const name = row.suppliesName  || this.name;
+            this.$confirm('是否确认删除物料总分类管理编号为"' + row.name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
@@ -393,7 +397,7 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             const queryParams = this.queryParams;
-            this.$confirm('是否确认导出所有物料总分类管理数据项?', "警告", {
+            this.$confirm('是否确认导出所有一级分类数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
diff --git a/ruoyi-ui/src/views/system/supplies/index_template.vue b/ruoyi-ui/src/views/system/supplies/index_template.vue
index 8b0552d186fe4192be50f6bff8db9c3befe0833a..d60ae14ce40df63f0d9ead1e4f58b016a4668ef2 100644
--- a/ruoyi-ui/src/views/system/supplies/index_template.vue
+++ b/ruoyi-ui/src/views/system/supplies/index_template.vue
@@ -212,6 +212,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+        name:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -387,6 +388,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.name = selection.map(item => item.templateName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -482,7 +484,8 @@ export default {
     /** 删除按钮操作*/
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
+      const name = row.templateName|| this.name;
+      this.$confirm('是否确认删除Excel模板编号为"' + name + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
diff --git a/ruoyi-ui/src/views/system/suppliesrole/index.vue b/ruoyi-ui/src/views/system/suppliesrole/index.vue
index 659882d28181b8dc0b0aaa9a8a5afa0f2a5064b9..ae76514fc7e22b24d61bdd0e73f5141ca10a2f99 100644
--- a/ruoyi-ui/src/views/system/suppliesrole/index.vue
+++ b/ruoyi-ui/src/views/system/suppliesrole/index.vue
@@ -1,168 +1,167 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属模板" prop="tempId">
-<!--        <el-input-->
-<!--          v-model="queryParams.tempId"-->
-<!--          placeholder="请输入模板ID"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="所属模板" prop="tempId">
+                <!--        <el-input-->
+                <!--          v-model="queryParams.tempId"-->
+                <!--          placeholder="请输入模板ID"-->
+                <!--          clearable-->
+                <!--          size="small"-->
+                <!--          @keyup.enter.native="handleQuery"-->
+                <!--        />-->
 
-        <el-select v-model="queryParams.tempId" filterable clearable placeholder="请选择上级分类" >
-          <el-option
-            v-for="option in options"
-            :key="option.templateName"
-            :label="option.templateName"
-            :value="option.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="规则名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入规则名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-          maxlength="15"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态">
-          <el-option label="启用" :value="0"></el-option>
-          <el-option label="禁用" :value="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+                <el-select v-model="queryParams.tempId" filterable clearable placeholder="请选择上级分类" >
+                    <el-option
+                        v-for="option in options"
+                        :key="option.templateName"
+                        :label="option.templateName"
+                        :value="option.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="规则名称" prop="roleName">
+                <el-input
+                    v-model="queryParams.roleName"
+                    placeholder="请输入规则名称"
+                    clearable
+                    size="small"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择状态">
+                    <el-option label="启用" value="0"></el-option>
+                    <el-option label="禁用" value="1"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:suppliesrole:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:suppliesrole:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:suppliesrole:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:suppliesrole:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:suppliesrole:add']"
+                >新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    v-hasPermi="['system:suppliesrole:edit']"
+                >修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['system:suppliesrole:remove']"
+                >删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['system:suppliesrole:export']"
+                >导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="suppliesroleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
-      <el-table-column label="所属模板" align="center" prop="templateName" />
-      <el-table-column label="规则名称" align="center" prop="roleName" />
-      <el-table-column label="状态" align="center">
-        <template slot-scope="scope">
-          <div>
-            <el-switch
-              @change="toggleEnable(scope.row)"
-              v-model="scope.row.status"
-              :active-value="0"
-              :inactive-value="1"
-              active-color="#13ce66"
-              inactive-color="#cccccc">
-            </el-switch>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:suppliesrole:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:suppliesrole:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="suppliesroleList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
+            <el-table-column label="所属模板" align="center" prop="templateName" />
+            <el-table-column label="规则名称" align="center" prop="roleName" />
+            <el-table-column label="状态" align="center">
+                <template slot-scope="scope">
+                    <div>
+                        <el-switch
+                            @change="toggleEnable(scope.row)"
+                            v-model="scope.row.status"
+                            :active-value="0"
+                            :inactive-value="1"
+                            active-color="#13ce66"
+                            inactive-color="#cccccc">
+                        </el-switch>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:suppliesrole:edit']"
+                    >修改</el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:suppliesrole:remove']"
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <!-- 添加或修改导入规则对话框 -->
-    <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="tempId">
-          <el-select v-model="form.tempId" filterable placeholder="请选择关联项" style="width:380px" >
-            <el-option
-              v-for="option in options"
-              :key="option.templateName"
-              :label="option.templateName"
-              :value="option.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="规则名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入规则名称"  maxlength="15"/>
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-select v-model="form.status" style="width:380px">
-            <el-option label="启用" :value="0"></el-option>
-            <el-option label="禁用" :value="1"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <!-- 添加或修改导入规则对话框 -->
+        <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="tempId">
+                    <el-select v-model="form.tempId" filterable placeholder="请选择关联项" style="width:380px" >
+                        <el-option
+                            v-for="option in options"
+                            :key="option.templateName"
+                            :label="option.templateName"
+                            :value="option.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="规则名称" prop="roleName">
+                    <el-input v-model="form.roleName" placeholder="请输入规则名称" />
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-select v-model="form.status" style="width:380px">
+                        <el-option label="启用" :value="0"></el-option>
+                        <el-option label="禁用" :value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -170,218 +169,218 @@ import { listSuppliesrole,toggleEnable,toggleDisable, getSuppliesrole, delSuppli
 import {delActSuppliesDetails} from "@/api/ActSuppliesDetails/ActSuppliesDetails";
 
 export default {
-  name: "Suppliesrole",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 导入规则表格数据
-      suppliesroleList: [],
+    name: "Suppliesrole",
+    components: {
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 导入规则表格数据
+            suppliesroleList: [],
 
-      options:[],
+            options:[],
 
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tempId: null,
-        roleName: null,
-        status: 0,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        tempId: [
-          { required: true, message: "关联id不能为空", trigger: "change" }
-        ],
-        roleName: [
-          { required: true, message: "规则名称不能为空", trigger: "change" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getnameid();
-  },
-  methods: {
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                tempId: null,
+                roleName: null,
+                status: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                tempId: [
+                    { required: true, message: "关联id不能为空", trigger: "change" }
+                ],
+                roleName: [
+                    { required: true, message: "规则名称不能为空", trigger: "change" }
+                ]
+            }
+        };
+    },
+    created() {
+        this.getList();
+        this.getnameid();
+    },
+    methods: {
 
-    /**启用 */
-    toggleEnable(suppliesrole){
-      console.log('你点击了【' + suppliesrole.s+'】的开关控件，当前开关值:' + suppliesrole.status);
-      let enableText=['启用','禁用'];
-      if(suppliesrole.status === 0) {
-        toggleEnable(suppliesrole.id).then((response) =>{
-          if(response.code === 200){
-            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
-            this.$message({
-              message: message,
-              type:'success'
-            });
-          }else {
-            this.$message.error(response.message);
-          }
-        });
-      }else {
-        toggleDisable(suppliesrole.id).then((response) =>{
-          if(response.code === 200){
-            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
-            this.$message({
-              message: message,
-              type:'error'
-            });
-          }else {
-            this.$message.error(response.message);
-          }
+        /**启用 */
+        toggleEnable(suppliesRole){
+            console.log('你点击了【' + suppliesRole.s+'】的开关控件，当前开关值:' + suppliesRole.status);
+            let enableText=['启用','禁用'];
+            if(suppliesRole.status === 0) {
+                toggleEnable(suppliesRole.id).then((response) =>{
+                    if(response.code === 200){
+                        let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
+                        this.$message({
+                            message: message,
+                            type:'success'
+                        });
+                    }else {
+                        this.$message.error(response.message);
+                    }
+                });
+            }else {
+                toggleDisable(suppliesRole.id).then((response) =>{
+                    if(response.msg === "200"){
+                        let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
+                        this.$message({
+                            message: message,
+                            type:'error'
+                        });
+                    }else {
+                        this.getList();
+                        this.$message.error(response.msg);
+                    }
 
-        });
-      }
-    },
+                });
+            }
+        },
 
-    /**显示序号*/
-    indexMethod(index){
-      return index + 1;
-    },
+        /**显示序号*/
+        indexMethod(index){
+            return index + 1;
+        },
 
-    /** 查询上级id*/
-    getnameid(){
-      saveSid().then(response =>{
-        this.options = response.rows;
-      })
-    },
+        /** 查询上级id*/
+        getnameid(){
+            saveSid().then(response =>{
+                this.options = response.rows;
+            })
+        },
 
-    /** 查询导入规则列表 */
-    getList() {
-      this.indexMethod(0);
-      this.loading = true;
-      listSuppliesrole(this.queryParams).then(response => {
-        this.suppliesroleList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        tempId: null,
-        roleName: null,
-        status: 0,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.getnameid();
-      this.reset();
-      this.open = true;
-      this.title = "添加导入规则";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getSuppliesrole(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改导入规则";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateSuppliesrole(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+        /** 查询导入规则列表 */
+        getList() {
+            this.indexMethod(0);
+            this.loading = true;
+            listSuppliesrole(this.queryParams).then(response => {
+                this.suppliesroleList = response.rows;
+                this.total = response.total;
+                this.loading = false;
             });
-          } else {
-            addSuppliesrole(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                tempId: null,
+                roleName: null,
+                status: 0,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length!==1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加导入规则";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids
+            getSuppliesrole(id).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改导入规则";
             });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除规则名称为"' + row.roleName + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return delSuppliesrole(ids);
-      }).then((result) => {
-        if (result.data==="操作失败"){
-          this.getList();
-          this.msgError("删除失败,存在关联关系！！！");
-        }else {
-          this.getList();
-          this.msgSuccess("删除成功");
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateSuppliesrole(this.form).then(response => {
+                            this.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addSuppliesrole(this.form).then(response => {
+                            this.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$confirm('是否确认删除规则名称为"' + row.roleName + '"的数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function() {
+                return delSuppliesrole(ids);
+            }).then((result) => {
+                if (result.data==="操作失败"){
+                    this.getList();
+                    this.msgError("删除失败,存在关联关系！！！");
+                }else {
+                    this.getList();
+                    this.msgSuccess("删除成功");
+                }
+            }).catch(()=>{
+            })
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            const queryParams = this.queryParams;
+            this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(function() {
+                return exportSuppliesrole(queryParams);
+            }).then(response => {
+                this.download(response.msg);
+            })
         }
-      }).catch(()=>{
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportSuppliesrole(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
     }
-  }
 };
 </script>
diff --git a/ruoyi-ui/src/views/system/suppliesroledetail/index.vue b/ruoyi-ui/src/views/system/suppliesroledetail/index.vue
index 80b0c04d2b73d613a7505a4d473bd41b46bfe8f2..39360c05c74df202c1c7287b51b3506c28fae770 100644
--- a/ruoyi-ui/src/views/system/suppliesroledetail/index.vue
+++ b/ruoyi-ui/src/views/system/suppliesroledetail/index.vue
@@ -327,6 +327,7 @@ export default {
             loading: true,
             // 选中数组
             ids: [],
+            name:[],
             // 非单个禁用
             single: true,
             // 非多个禁用
@@ -438,7 +439,7 @@ export default {
                 toggleDisable(suppliesRoleDetail.id).then((response) =>{
                     if(response.code === 200){
                         let message = '操作成功，已经将【' + suppliesRoleDetail.roleName +'】的状态改为【'+ enableText[suppliesRoleDetail.status] +'】 !';
-                        this.$message({message: message, type:'success'});
+                        this.$message({message: message, type:'error'});
                     }else {
                         this.$message.error(response.message);
                     }
@@ -510,6 +511,7 @@ export default {
         // 多选框选中数据
         handleSelectionChange(selection) {
             this.ids = selection.map(item => item.id)
+            this.name= selection.map(item => item.detailName)
             this.single = selection.length!==1
             this.multiple = !selection.length
         },
@@ -570,7 +572,8 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
-            this.$confirm('是否确认删除规则详情编号为"' + row.detailName + '"的数据项?', "警告", {
+            const name = row.detailName || this.name;
+            this.$confirm('是否确认删除规则详情编号为"' + name + '"的数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"