功能模块完善，添加校验，名称修改。

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java

@@ -15,6 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 物料总分类管理Controller
@@ -111,7 +113,8 @@ public class ActSuppliesController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        List<Integer> find = actSuppliesService.findall();
+
+        List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
         System.out.println(find.toString());
         for (long num : ids){
             if (find.contains((int)num)){

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleController.java

@@ -114,6 +114,14 @@ public class ActSuppliesRoleController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
+        List<Integer> find = actSuppliesRoleService.findall();
+
+        for (long num : ids){
+            if (find.contains((int)num)){
+                return AjaxResult.success("删除失败","操作失败");
+            }
+        }
+
         return toAjax(actSuppliesRoleService.deleteActSuppliesRoleByIds(ids));
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesTemplateController.java

@@ -116,6 +116,22 @@ public class ActSuppliesTemplateController extends BaseController {
         return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
     }
 
+    /**
+     * 判断模板名称是否重复
+     */
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:ifName')")
+    @GetMapping("/ifName/{name}")
+    public AjaxResult setEnable(@PathVariable("name") String name)
+    {
+        List<String> find = actSuppliesTemplateService.findName();
+
+        if (find.contains(name)){
+            return AjaxResult.success("验证失败","存在重复");
+        }
+
+        return AjaxResult.success("验证通过","验证通过");
+    }
+
     /**
      * 启用物料总分类管理
      */
@@ -124,7 +140,7 @@ public class ActSuppliesTemplateController extends BaseController {
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
         System.out.println("开始处理【启用物料总分类管理】的请求，参数：{}"+ id);
-       actSuppliesTemplateService.setEnable(id);
+        actSuppliesTemplateService.setEnable(id);
         return AjaxResult.success();
     }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesTemplate.java

@@ -40,7 +40,7 @@ public class ActSuppliesTemplate extends BaseEntity
 
     /** 状态 */
     @Excel(name = "状态")
-    private Long status;
+    private Integer status;
 
     public void setId(Long id)
     {
@@ -69,12 +69,12 @@ public class ActSuppliesTemplate extends BaseEntity
         this.templateContent = templateContent;
     }
 
-    public void setStatus(Long status)
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
 
-    public Long getStatus()
+    public Integer getStatus()
     {
         return status;
     }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleMapper.java

@@ -62,4 +62,5 @@ public interface ActSuppliesRoleMapper
 
     List<ActSuppliesTemplate> saveSid();
 
+    List<Integer> findall();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesTemplateMapper.java

@@ -29,4 +29,6 @@ public interface ActSuppliesTemplateMapper
 
     List<Integer> findall();
 
+    List<String> findName();
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/ActSuppliesTemplateService.java

@@ -41,4 +41,6 @@ public interface ActSuppliesTemplateService
      */
     void setDisable(Long id);
 
+    List<String> findName();
+
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleService.java

@@ -76,4 +76,5 @@ public interface IActSuppliesRoleService
      */
     void setDisable(Long id);
 
+    List<Integer> findall();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesService.java

@@ -79,4 +79,5 @@ public interface IActSuppliesService
      */
     void setDisable(Long id);
 
+    List<Integer> findAllId();
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleServiceImpl.java

@@ -112,6 +112,11 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
         updateStatusById(id,1);
     }
 
+    @Override
+    public List<Integer> findall() {
+        return actSuppliesRoleMapper.findall();
+    }
+
 
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java

@@ -115,6 +115,11 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
         updateStatusById(id,1);
     }
 
+    @Override
+    public List<Integer> findAllId() {
+        return actSuppliesMapper.findAllId();
+    }
+
 
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesTemplateServiceImpl.java

@@ -80,6 +80,11 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
         updateStatusById(id,1);
     }
 
+    @Override
+    public List<String> findName() {
+        return actSuppliesTemplateMapper.findName();
+    }
+
 
     private void updateStatusById(Long id, Integer status){
         String[] statusText={"禁用","启用"};

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleMapper.xml

@@ -30,6 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
+    <select id="findall" resultType="Integer">
+        select role_id from act_supplies_role_detail GROUP BY role_id
+    </select>
+
     <sql id="selectActSuppliesRoleVo">
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role
     </sql>

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesTemplateMapper.xml

@@ -25,6 +25,10 @@
         select temp_id from act_supplies_role GROUP BY temp_id
     </select>
 
+    <select id="findName" resultType="String">
+        select template_name from act_supplies_template
+    </select>
+
     <select id="selectSuppliesTemplateList" parameterType="ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name, status  from act_supplies_template
         <where>

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -78,6 +78,17 @@ export function toggleDisable(id) {
 }
 
 
+export function findName(name) {
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
+    method: 'get'
+  })
+}
+
+
+
+
+
 
 // 模板转换页面查询规则对应用友物料名称
 export function getSuppliesName(name) {
@@ -164,7 +175,6 @@ export function delRuleManagement(id) {
 
 
 
-
 // 查询模板列表
 export function listMyluckyexcel(query) {
   return request({

ruoyi-ui/src/main.js

@@ -23,7 +23,10 @@ import RightToolbar from "@/components/RightToolbar"
 import axios from "axios";
 import qs from  'qs';
 import * as echarts from "echarts";
-
+// import $ from "jquery";
+//
+// window.jQuery = $;
+// window.$ = $;
 
 // 全局方法挂载
 Vue.prototype.echarts=echarts;

ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue

@@ -91,7 +91,7 @@
     <el-table v-loading="loading" :data="ActSuppliesDetailsList" @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">
+      <el-table-column label="所属分类" align="center">
         <template slot-scope="scope">
           <div>
             <template v-if="scope.row.fname === null">
@@ -150,8 +150,8 @@
     <!-- 添加或修改物料细分类管理对话框 -->
     <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-select v-model="form.sid" filterable placeholder="请选择上级分类" >
+        <el-form-item label="所属分类" prop="sid">
+          <el-select v-model="form.sid" filterable placeholder="请选择所属分类" >
             <el-option
               v-for="option in options2"
               :key="option.suppliesName"
@@ -161,7 +161,7 @@
             <el-option label="其他" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料名称" prop="detailsName">
+        <el-form-item label="小类物料名称" prop="detailsName">
           <el-input v-model="form.detailsName" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="所属系统" prop="sysclassify">
@@ -229,13 +229,13 @@ export default {
       // 表单校验
       rules: {
         sid: [
-          { required: true, message: "关联id不能为空", trigger: "change" }
+          { required: true, message: "关联中类不能为空", trigger: "change" }
         ],
         detailsName: [
           { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
         sysclassify: [
-          { required: true, message: "物料名称不能为空", trigger: "blur" }
+          { required: true, message: "所属系统不能为空", trigger: "blur" }
         ]
       },
       idRules:[
@@ -352,7 +352,7 @@ export default {
       this.fetchOptions();
       this.reset();
       this.open = true;
-      this.title = "添加物料细分类管理";
+      this.title = "添加物料";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -361,7 +361,7 @@ export default {
       getActSuppliesDetails(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改物料细分类管理";
+        this.title = "修改物料";
       });
     },
     /** 提交按钮 */
@@ -387,7 +387,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除物料细分类管理编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除物料名称为"' + row.detailsName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue

@@ -10,7 +10,7 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="上级分类" prop="fname">
+      <el-form-item label="大类名称" prop="fname">
         <el-select v-model="queryParams.pid" filterable clearable placeholder="请输入上级分类" >
           <el-option
             v-for="option in options"
@@ -92,7 +92,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">
+      <el-table-column label="大类名称" align="center">
         <template slot-scope="scope">
           <div>
             <template v-if="scope.row.fname === null">
@@ -152,22 +152,25 @@
     <!-- 添加或修改物料总分类管理对话框 -->
     <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="父ID" prop="pid">
-          <el-select v-model="form.pid" filterable placeholder="请输入上级分类" >
+        <el-form-item label="所属大类" prop="pid">
+          <el-select v-model="form.pid" filterable placeholder="请输入所属大类" >
             <el-option
               v-for="option in options"
               :key="option.suppliesName"
               :label="option.suppliesName"
               :value="option.id"
             ></el-option>
-            <el-option label="无" value="0"></el-option>
+            <el-option label="无" :value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称" prop="suppliesName">
           <el-input v-model="form.suppliesName" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <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">
@@ -222,7 +225,7 @@ export default {
         fname:null,
         suppliesName: null,
         orderNum: null,
-        status: 0,
+        status: null,
       },
       // 表单参数
       form: {},
@@ -386,7 +389,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除物料总分类管理编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除物料总分类管理编号为"' + row.suppliesName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ruoyi-ui/src/views/system/supplies/index.vue

@@ -59,16 +59,18 @@
 
 
 <script>
-import $ from 'jquery'
+import $ from 'jquery';
 /*安装插件 npm install xlsx，安装完成后引入 import XLSX from ‘xlsx’*/
-import XLSX from 'xlsx'
+import XLSX from 'xlsx';
 import { getSuppliesTemplate, listSuppliesTemplate,roleList,roleListid} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 
 import luckysheet from 'luckysheet'
 import LuckyExcel from 'luckyexcel'
 //导入库export.js 这个文件是es6的，不能在普通的HTML文件直接引入js文件（虽然都是js文件，但是有区别，具体请百度es6与es5）！需要把es6转es5才可以直接引入使用！
-import { exportExcel } from '../../../../public/luckysheet/exportExcel'
-var fileName="新建XLSX工作表"; //定义表名
+import { exportExcel } from '../../../../public/luckysheet/exportExcel';
+
+let fileName="新建XLSX工作表"; //定义表名
+
 export default {
   name: "Mymodule",
   data() {
@@ -103,6 +105,7 @@ export default {
   mounted() {
 
     this.init();
+
   },
   methods:{
     /** 页面刷新时展示的数据*/
@@ -199,7 +202,6 @@ export default {
 
               }, //边框
               "authority":{}, //工作表保护
-
             },
           },
           /*{
@@ -223,7 +225,7 @@ export default {
         ]
 
       }
-      luckysheet.create(options)
+      luckysheet.create(options);
 
     },
 
@@ -237,7 +239,7 @@ export default {
       let name = evt.name
       let suffixArr = name.split('.'),
         suffix = suffixArr[suffixArr.length - 1]
-      if (suffix != 'xlsx') {
+      if (suffix !== 'xlsx') {
         this.$message({
           message: "上传格式不正确，请上传xls或者xlsx格式",
           type: "warning"});
@@ -249,7 +251,7 @@ export default {
         function(exportJson) {
           console.log("---------------------------------------"+exportJson);
 
-          if (exportJson.sheets == null || exportJson.sheets.length == 0) {
+          if (exportJson.sheets === null || exportJson.sheets.length === 0) {
             this.$message({
               message: "导入失败，请检查上传的文件是否正确",
               type: "warning"
@@ -266,7 +268,7 @@ export default {
                 var c =exportJson.sheets[sysRules[i].se].celldata[j].c;
                 var r =exportJson.sheets[sysRules[i].se].celldata[j].r;
 
-                if(r == sysRules[i].re && c ==sysRules[i].ce ){
+                if(r === sysRules[i].re && c ===sysRules[i].ce ){
                   value=exportJson.sheets[sysRules[i].se].celldata[j].v.v;
                   console.log("value是"+value);
                   //切换到想要的sheet

ruoyi-ui/src/views/system/supplies/index_template.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="Excel文件名" prop="templateName" label-width="100px">
+      <el-form-item label="模板名称" prop="templateName" label-width="100px">
         <el-input
           v-model="queryParams.templateName"
-          placeholder="请输入Excel文件名"
+          placeholder="请输入模板名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
+          <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>
@@ -55,7 +61,7 @@
     <el-table v-loading="loading" :data="SuppliesTemplateList" @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="Excel文件名" align="center" prop="templateName" />
+      <el-table-column label="模板名称" align="center" prop="templateName" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <div>
@@ -180,7 +186,7 @@ import {
   addSuppliesTemplate,
   updateSuppliesTemplate,
   toggleEnable,toggleDisable,
-  listSuppliesTemplateId, exportMyluckyexcel
+  listSuppliesTemplateId,findName, exportMyluckyexcel
 } from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import $ from 'jquery';
 import XLSX from 'xlsx';
@@ -246,9 +252,9 @@ export default {
     toggleEnable(SuppliesTemplate){
       console.log('你点击了【' + SuppliesTemplate.s+'】的开关控件，当前开关值:' + SuppliesTemplate.status);
       let enableText=['启用','禁用'];
-      if(SuppliesTemplate.status == 0) {
+      if(SuppliesTemplate.status === 0) {
         toggleEnable(SuppliesTemplate.id).then((response) =>{
-          if(response.code == 200){
+          if(response.code === 200){
             let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
             this.$message({
               message: message,
@@ -260,7 +266,7 @@ export default {
         });
       }else {
         toggleDisable(SuppliesTemplate.id).then((response) =>{
-          if(response.code == 200){
+          if(response.code === 200){
             let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
             this.$message({
               message: message,
@@ -290,6 +296,18 @@ export default {
     /**上传事件 */
     beforeUpload(file){
 
+      //存在重复
+
+      findName(file.name).then(result =>{
+        console.log(result.data)
+        if (result.data === "存在重复"){
+
+          this.fileListName = [];
+          this.$message.error('上传文件名重复，请修改后上传！')
+
+        }
+      })
+
       const isJpgOrPng = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
       if (!isJpgOrPng) {
@@ -444,14 +462,14 @@ export default {
     /** 删除按钮操作*/
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除Excel模板编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
         return delSuppliesTemplate(ids);
       }).then((result) => {
-        if (result.data==="操作失败"){
+        if (result.data ==="操作失败"){
           this.getList();
           this.msgError("该模板下存在关联规则，请先删除关联规则！！！");
         }else {

ruoyi-ui/src/views/system/suppliesrole/index.vue

@@ -167,6 +167,7 @@
 
 <script>
 import { listSuppliesrole,toggleEnable,toggleDisable, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
+import {delActSuppliesDetails} from "@/api/ActSuppliesDetails/ActSuppliesDetails";
 
 export default {
   name: "Suppliesrole",
@@ -209,6 +210,9 @@ export default {
       rules: {
         tempId: [
           { required: true, message: "关联id不能为空", trigger: "change" }
+        ],
+        roleName: [
+          { required: true, message: "规则名称不能为空", trigger: "change" }
         ]
       }
     };
@@ -347,16 +351,22 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除导入规则编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delSuppliesrole(ids);
-        }).then(() => {
+      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() {

ruoyi-ui/src/views/system/suppliesroledetail/index.vue

@@ -2,14 +2,6 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上级规则" prop="roleId">
-<!--        <el-input-->
-<!--          v-model="queryParams.roleId"-->
-<!--          placeholder="请输入导入规则ID"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-
         <el-select v-model="queryParams.roleId" filterable placeholder="请选择关联项" >
           <el-option
             v-for="option in options1"
@@ -30,13 +22,12 @@
       </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-option label="删除" value="2"></el-option>
+            <el-option label="启用" :value="0"></el-option>
+            <el-option label="禁用" :value="1"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否物料转换" prop="convertStatus">
-        <el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请选择状态">
+      <el-form-item label="运算规则" prop="convertStatus">
+        <el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请运算规则">
           <el-option
             v-for="option in options2"
             :key="option.operationName"
@@ -103,7 +94,7 @@
       <el-table-column label="上级规则" align="center" prop="roleName" />
       <el-table-column label="规则名称" align="center" prop="detailName" />
       <el-table-column label="规则内容" align="center" prop="detailContent" />
-      <el-table-column label="运算方法" align="center">
+      <el-table-column label="运算规则" align="center">
         <template slot-scope="scope">
           <div>
             <template v-if="scope.row.convertStatus === 0">
@@ -130,15 +121,14 @@
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div>
-            <template v-if="scope.row.status === 0">
-              启动
-            </template>
-            <template v-else-if="scope.row.status === 1">
-              禁用
-            </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
+            <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>
@@ -183,19 +173,36 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="规则名称" prop="detailName">-->
-<!--          <el-input v-model="form.detailName" placeholder="请输入规则名称" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="模板表行坐标" prop="detailMH">
+        <el-form-item label="转换数据" prop="detailYS">
+          <el-radio-group v-model="form.detailYS">
+            <el-radio :label="1" @change="showTemplate = true; showImport = false; showLie= false">单元格转换</el-radio>
+            <el-radio :label="2" @change="showTemplate = false; showImport = true; showLie= false">行转换</el-radio>
+            <el-radio :label="3" @change="showTemplate = false; showImport = false; showLie= true">列转换</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showTemplate">
+          <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="模板表列坐标" prop="detailML" v-if="showTemplate">
+          <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="导入表行坐标" prop="detailYH" v-if="showTemplate">
+          <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="导入表列坐标" prop="detailYL" v-if="showTemplate">
+          <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+
+        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showImport">
           <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="模板表列坐标" prop="detailML">
+        <el-form-item label="模板表列长度" prop="detailML" v-if="showImport">
           <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="导入表行坐标" prop="detailYH">
+        <el-form-item label="导入表行坐标" prop="detailYH" v-if="showImport">
           <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="导入列行坐标" prop="detailYL">
+        <el-form-item label="导入表列长度" prop="detailYL" v-if="showImport">
           <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
         </el-form-item>
         <el-form-item label="状态">
@@ -205,10 +212,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="运算方法" prop="convertStatus">
-<!--          <el-select v-model="form.convertStatus">-->
-<!--            <el-option label="启用物料转换" :value="0"></el-option>-->
-<!--            <el-option label="禁用物料转换" :value="1"></el-option>-->
-<!--          </el-select>-->
           <el-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >
             <el-option
               v-for="option in options2"
@@ -236,6 +239,8 @@ import {
   updateSuppliesroledetail,
   exportSuppliesroledetail,
   saveSid,
+  toggleEnable,
+  toggleDisable,
   saveOperation,
 } from "@/api/system/suppliesroledetail";
 import Editor from '@/components/Editor';
@@ -282,6 +287,9 @@ export default {
       // 表单参数
       form: {
       },
+      showTemplate: false, // 控制单元格的显示与隐藏
+      showImport: false, // 控制行转换的显示与隐藏
+      showLie: false, // 控制列转换的显示与隐藏
       // 表单校验
       rules: {
         roleId:[
@@ -315,6 +323,31 @@ export default {
   },
   methods: {
 
+    toggleEnable(suppliesroledetail){
+      console.log('你点击了【' + suppliesroledetail.s+'】的开关控件，当前开关值:' + suppliesroledetail.status);
+      let enableText=['启用','禁用'];
+
+      if(suppliesroledetail.status == 0) {
+        toggleEnable(suppliesroledetail.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
+            this.$message({message: message,type:'success'});
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }else {
+        toggleDisable(suppliesroledetail.id).then((response) =>{
+          if(response.code == 200){
+            let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
+            this.$message({message: message, type:'success'});
+          }else {
+            this.$message.error(response.message);
+          }
+        });
+      }
+    },
+
     /**显示序号*/
     indexMethod(index){
       return index + 1;
@@ -420,7 +453,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除规则详情编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除规则详情编号为"' + row.detailName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

ruoyi-ui/vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: false,//process.env.NODE_ENV === 'development'
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置