Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 模板转换页面接口
@@ -83,4 +87,33 @@ public class ActSuppliesConvertController extends BaseController{
     }
 
 
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:converSupplies')")
+    @PostMapping("/converSupplies")
+    public TableDataInfo  convertSupplies(@RequestBody String[] names){
+
+        List<String> name = Arrays.asList(names);
+
+        List<ActOperation> list = actSuppliesConvertService.converSupplies(name);
+
+        name = name.stream()
+                .map(str -> {
+                    if (str == null) {
+                        return null; // 保留原始的null值
+                    }
+                    for (int i = 0; i < list.size(); i++) {
+                        if (str.equals(list.get(i).getDetaliesName())) {
+                            return list.get(i).getSuppliesName();
+                        }
+                    }
+                    return str;
+                })
+                .collect(Collectors.toList());
+
+        System.out.println(name.toString());
+
+        return getDataTable(name);
+
+    }
+
+
 }

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

@@ -103,6 +103,7 @@ public class ActSuppliesRoleDetailController extends BaseController
     public AjaxResult add(@RequestBody ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
         return toAjax(actSuppliesRoleDetailService.insertActSuppliesRoleDetail(actSuppliesRoleDetail));
+
     }
 
     /**

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

 package com.ruoyi.system.domain;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class ActOperation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
     private Integer id;
-    private String OperationName;
-    private Integer status;
+    private String suppliesName;
+    private String detaliesName;
 
     public Integer getId() {
         return id;
@@ -18,19 +20,28 @@ public class ActOperation extends BaseEntity {
         this.id = id;
     }
 
-    public String getOperationName() {
-        return OperationName;
+    public String getSuppliesName() {
+        return suppliesName;
     }
 
-    public void setOperationName(String operationName) {
-        OperationName = operationName;
+    public void setSuppliesName(String operationName) {
+        suppliesName = operationName;
     }
 
-    public Integer getStatus() {
-        return status;
+    public String getDetaliesName() {
+        return detaliesName;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDetaliesName(String detaliesName) {
+        this.detaliesName = detaliesName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("suppliesName", getSuppliesName())
+                .append("detaliesName", getDetaliesName())
+                .toString();
     }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/ex/ServiceException.java

+package com.ruoyi.system.ex;
+
+import com.ruoyi.system.web.ServiceCode;
+
+public class ServiceException extends RuntimeException{
+
+    private ServiceCode serviceCode;
+
+    public ServiceException(ServiceCode serviceCode,String message) {
+        super(message);
+        this.serviceCode = serviceCode;
+    }
+    public ServiceCode getServiceCode(){
+        return  serviceCode;
+    }
+}

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

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.ActSupplies;
-import com.ruoyi.system.domain.ActSuppliesRole;
-import com.ruoyi.system.domain.ActSuppliesRoleDetail;
-import com.ruoyi.system.domain.ActSuppliesTemplate;
+import com.ruoyi.system.domain.*;
 
 import java.util.List;
 
@@ -18,4 +15,6 @@ public interface ActSuppliesConverMapper {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

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

@@ -65,4 +65,13 @@ public interface ActSuppliesMapper
     List<Integer> findall();
 
     List<Integer> findAllId();
+
+
+    /**
+     * 根据物料总分类名称统计数量
+     * @param suppliesName
+     * @return
+     */
+    public int countBySuppliesName(String suppliesName);
+
 }

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

@@ -3,6 +3,8 @@ package com.ruoyi.system.mapper;
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 导入规则Mapper接口
@@ -63,4 +65,8 @@ public interface ActSuppliesRoleMapper
     List<ActSuppliesTemplate> saveSid();
 
     List<Integer> findall();
+
+    public int countByRoleName(String roleName);
+
+
 }

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

@@ -15,4 +15,6 @@ public interface IActSuppliesConvertService {
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
     ActSupplies selectSuppliesname(String name);
+
+    List<ActOperation> converSupplies(List<String> name);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import org.springframework.stereotype.Repository;
 
 /**
  * 导入规则Service接口
@@ -10,6 +11,7 @@ import com.ruoyi.system.domain.ActSuppliesTemplate;
  * @author dongjg
  * @date 2023-07-12
  */
+@Repository
 public interface IActSuppliesRoleService 
 {
     /**

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

 package com.ruoyi.system.service;
 
 import com.ruoyi.system.domain.ActSupplies;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-07-11
  */
+@Repository
 public interface IActSuppliesService 
 {
     /**
@@ -80,4 +82,6 @@ public interface IActSuppliesService
     void setDisable(Long id);
 
     List<Integer> findAllId();
+
+
 }

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

@@ -39,4 +39,9 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     public ActSupplies selectSuppliesname(String name) {
         return actSuppliesConverMapper.selectSuppliesname(name);
     }
+
+    @Override
+    public List<ActOperation> converSupplies(List<String> name) {
+        return actSuppliesConverMapper.converSupplies(name);
+    }
 }

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

@@ -5,6 +5,9 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesDetails;
 import com.ruoyi.system.domain.ActSuppliesTemplate;
+import com.ruoyi.system.ex.ServiceException;
+import com.ruoyi.system.web.ServiceCode;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;
@@ -56,6 +59,16 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     @Override
     public int insertActSuppliesRole(ActSuppliesRole actSuppliesRole)
     {
+        String roleName = actSuppliesRole.getRoleName();
+        int countByRoleName = actSuppliesRoleMapper.countByRoleName(roleName);
+        if(countByRoleName > 0){
+            String message = "添加规则失败，规则名称已被占用";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSuppliesRole actSuppliesRole1 = new ActSuppliesRole();
+        BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole1);
+
         actSuppliesRole.setCreateTime(DateUtils.getNowDate());
         return actSuppliesRoleMapper.insertActSuppliesRole(actSuppliesRole);
     }
@@ -69,6 +82,15 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     @Override
     public int updateActSuppliesRole(ActSuppliesRole actSuppliesRole)
     {
+        String roleName = actSuppliesRole.getRoleName();
+        int countByRoleName = actSuppliesRoleMapper.countByRoleName(roleName);
+        if(countByRoleName > 0){
+            String message = "修改规则失败，新的规则名称已被占用";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSuppliesRole actSuppliesRole2 = new ActSuppliesRole();
+        BeanUtils.copyProperties(actSuppliesRole,actSuppliesRole2);
         actSuppliesRole.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesRoleMapper.updateActSuppliesRole(actSuppliesRole);
     }

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

@@ -2,13 +2,19 @@ package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.ex.ServiceException;
 import com.ruoyi.system.mapper.ActSuppliesMapper;
 import com.ruoyi.system.service.IActSuppliesService;
+import com.ruoyi.system.web.ServiceCode;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.sql.rowset.serial.SerialException;
 import java.util.List;
 
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
 /**
  * 物料总分类管理Service业务层处理
  * 
@@ -16,6 +22,7 @@ import java.util.List;
  * @date 2023-07-11
  */
 @Service
+
 public class ActSuppliesServiceImpl implements IActSuppliesService 
 {
     @Autowired
@@ -54,6 +61,16 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     @Override
     public int insertActSupplies(ActSupplies actSupplies)
     {
+        String suppliesName= actSupplies.getSuppliesName();
+        int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
+        if(countBySuppliesName > 0){
+            String message = "添加物料总分类管理失败，名称已被占用！";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT,message);
+        }
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSupplies,actSupplies1);
+
         actSupplies.setCreateTime(DateUtils.getNowDate());
         return actSuppliesMapper.insertActSupplies(actSupplies);
     }
@@ -67,6 +84,15 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
     @Override
     public int updateActSupplies(ActSupplies actSupplies)
     {
+        String suppliesName= actSupplies.getSuppliesName();
+        int countBySuppliesName = actSuppliesMapper.countBySuppliesName(suppliesName);
+        if(countBySuppliesName > 0) {
+            String message = "修改物料总分类管理失败，新的名称已被占用！";
+            System.out.println(message);
+            throw new ServiceException(ServiceCode.ERR_CONFLICT, message);
+        }
+        ActSupplies actSupplies1 = new ActSupplies();
+        BeanUtils.copyProperties(actSupplies,actSupplies1);
         actSupplies.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesMapper.updateActSupplies(actSupplies);
     }

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

@@ -60,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.system.domain.ActOperation" id="ActOperationResult">
+        <result property="id"    column="id"    />
+        <result property="suppliesName"    column="supplies_name"    />
+        <result property="detaliesName"    column="details_name"    />
+    </resultMap>
+
     <select id="templiteList" parameterType="com.ruoyi.system.domain.ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
         select id, det_id, template_name from act_supplies_template where status = 0
     </select>
@@ -80,6 +86,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, supplies_name from act_supplies where id=(select sid from act_supplies_details where details_name = #{name})
     </select>
 
+    <select id="converSupplies" parameterType="java.util.List" resultMap="ActOperationResult">
+
+        select id ,supplies_name, b.details_name from act_supplies a ,(
+        SELECT sid ,details_name
+        FROM act_supplies_details
+        WHERE details_name IN
+        <foreach item="name" collection="list" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        ) b where a.id = b.sid
 
+    </select>
 
 </mapper>
\ No newline at end of file

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

@@ -17,10 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+
     <sql id="selectActSuppliesVo">
         select id, pid, supplies_name, order_num, status, create_by, create_time, update_by, update_time from act_supplies
     </sql>
 
+    <select id="countBySuppliesName" resultType="int">
+        select count(*) from act_supplies where supplies_name=#{suppliesName}
+    </select>
     <select id="selectActSuppliesList" parameterType="ActSupplies" resultMap="ActSuppliesResult">
         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>  

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

@@ -33,6 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findall" resultType="Integer">
         select role_id from act_supplies_role_detail GROUP BY role_id
     </select>
+    <select id="countByRoleName" resultType="int">
+        select count(*) from act_supplies_role where role_name=#{roleName}
+    </select>
+
+
 
     <sql id="selectActSuppliesRoleVo">
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role

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

@@ -95,10 +95,6 @@ export function findName(name) {
 }
 
 
-
-
-
-
 // 模板转换页面查询规则对应用友物料名称
 export function getSuppliesName(name) {
   return request({

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

@@ -284,7 +284,7 @@ export default {
             let message = '操作成功，已经将【' + actSuppliesDetails.detailsName +'】的状态改为【'+ enableText[actSuppliesDetails.status] +'】 !';
             this.$message({
               message: message,
-              type:'success'
+              type:'error'
             });
           }else {
             this.$message.error(response.message);

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

@@ -108,7 +108,6 @@
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <div>
-
               <el-switch
                 @change="toggleEnable(scope.row)"
                 v-model="scope.row.status"
@@ -117,7 +116,6 @@
                 active-color="#13ce66"
                 inactive-color="#cccccc">
               </el-switch>
-
           </div>
         </template>
       </el-table-column>
@@ -140,7 +138,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -148,7 +145,6 @@
       :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">
@@ -264,27 +260,22 @@ export default {
       let enableText=['启用','禁用'];
       if(actSupplies.status == 0) {
         toggleEnable(actSupplies.id).then((response) =>{
-          if(response.code == 200){
+          response.code == 200;
             let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
             this.$message({
               message: message,
               type:'success'
             });
-          }else {
-            this.$message.error(response.message);
-          }
         });
       }else {
         toggleDisable(actSupplies.id).then((response) =>{
-          if(response.code == 200){
+          response.code == 200;
             let message = '操作成功，已经将【' + actSupplies.suppliesName +'】的状态改为【'+ enableText[actSupplies.status] +'】 !';
             this.$message({
               message: message,
-              type:'success'
+              type:'error'
             });
-          }else {
-            this.$message.error(response.message);
-          }
+
         });
       }
     },

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

@@ -160,6 +160,7 @@
     <div id="luckysheet" :style="{ position: positionValue, top: '0', left: '0', right: '0', bottom: '0' }"></div>
 
   </div>
+
 </template>
 
 <style>
@@ -178,6 +179,7 @@
 }
 </style>
 
+
 <script>
 import {
   listSuppliesTemplate,
@@ -194,12 +196,19 @@ import LuckyExcel from 'luckyexcel';
 /*import luckysheet from 'luckysheet';*/
 import {exportSuppliesrole} from "@/api/system/suppliesrole";
 
+
 export default {
   name: "SuppliesTemplate",
   data() {
     return {
       positionValue: 'static',
-      fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}],
+      fileList: [{
+        name: 'food.jpeg',
+        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+      }, {
+        name: 'food2.jpeg',
+        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+      }],
 
       // 遮罩层
       loading: true,
@@ -216,8 +225,8 @@ export default {
       // Excel模板表格数据
       SuppliesTemplateList: [],
       //模板详情
-      TemplateId:[],
-      fileListName:[],
+      TemplateId: [],
+      fileListName: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -232,10 +241,8 @@ export default {
         templateContent: null,
         status: null,
       },
-      form: {
-      },
-      rules: {
-      },
+      form: {},
+      rules: {},
     }
   },
   created() {
@@ -245,34 +252,35 @@ export default {
   mounted() {
     window.handleReturnButtonClick = this.handleReturnButtonClick;
   },
+
   methods: {
 
 
     /**启用 */
-    toggleEnable(SuppliesTemplate){
-      console.log('你点击了【' + SuppliesTemplate.s+'】的开关控件，当前开关值:' + SuppliesTemplate.status);
-      let enableText=['启用','禁用'];
-      if(SuppliesTemplate.status === 0) {
-        toggleEnable(SuppliesTemplate.id).then((response) =>{
-          if(response.code === 200){
-            let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
+    toggleEnable(SuppliesTemplate) {
+      console.log('你点击了【' + SuppliesTemplate.s + '】的开关控件，当前开关值:' + SuppliesTemplate.status);
+      let enableText = ['启用', '禁用'];
+      if (SuppliesTemplate.status === 0) {
+        toggleEnable(SuppliesTemplate.id).then((response) => {
+          if (response.code === 200) {
+            let message = '操作成功，已经将【' + SuppliesTemplate.templateName + '】的状态改为【' + enableText[SuppliesTemplate.status] + '】 !';
             this.$message({
               message: message,
-              type:'success'
+              type: 'success'
             });
-          }else {
+          } else {
             this.$message.error(response.message);
           }
         });
-      }else {
-        toggleDisable(SuppliesTemplate.id).then((response) =>{
-          if(response.code === 200){
-            let message = '操作成功，已经将【' + SuppliesTemplate.templateName +'】的状态改为【'+ enableText[SuppliesTemplate.status] +'】 !';
+      } else {
+        toggleDisable(SuppliesTemplate.id).then((response) => {
+          if (response.code === 200) {
+            let message = '操作成功，已经将【' + SuppliesTemplate.templateName + '】的状态改为【' + enableText[SuppliesTemplate.status] + '】 !';
             this.$message({
               message: message,
-              type:'success'
+              type: 'error'
             });
-          }else {
+          } else {
             this.$message.error(response.message);
           }
 
@@ -281,12 +289,12 @@ export default {
     },
 
     /**显示序号*/
-    indexMethod(index){
+    indexMethod(index) {
       return index + 1;
     },
 
     /**清空上传文件列表*/
-    handleChange(file, fileList){
+    handleChange(file, fileList) {
       // 清空 fileList 中的旧文件
       this.fileListName = [];
       // 添加文件到 fileList 中
@@ -294,13 +302,13 @@ export default {
     },
 
     /**上传事件 */
-    beforeUpload(file){
+    beforeUpload(file) {
 
       //存在重复
 
-      findName(file.name).then(result =>{
+      findName(file.name).then(result => {
         console.log(result.data)
-        if (result.data === "存在重复"){
+        if (result.data === "存在重复") {
 
           this.fileListName = [];
           this.$message.error('上传文件名重复，请修改后上传！')
@@ -314,7 +322,7 @@ export default {
         this.$message.error('只能上传xlsx文件');
       }
 
-      LuckyExcel.transformExcelToLucky(file ,(exportJson,lucksheetfile)=>{
+      LuckyExcel.transformExcelToLucky(file, (exportJson, lucksheetfile) => {
         this.form.templateName = file.name;
         this.form.templateContent = JSON.stringify(exportJson.sheets);
       });
@@ -375,7 +383,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -399,6 +407,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+     if (!this.form.templateName){
+      this.msgError("上传的文件不能为空！")
+     }else {
       this.fileListName = [];
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -417,84 +428,86 @@ export default {
           }
         }
       });
-    },
+     }
 
-    /** 详情按钮操作 */
-    handleSave(row) {
+  },
 
-      listSuppliesTemplateId(row.id).then(response =>{
+  /** 详情按钮操作 */
+  handleSave(row) {
 
-        this.TemplateId = response.rows;
+    listSuppliesTemplateId(row.id).then(response => {
 
-        this.luckyLook();
+      this.TemplateId = response.rows;
 
-      })
+      this.luckyLook();
 
-    },
-    /**展示详情luckysheet */
-    luckyLook(){
-
-      this.positionValue = 'absolute';
-      luckysheet.destroy();
-      luckysheet.create({
-        container: "luckysheet", // Luckysheet 的容器元素 ID
-        title: this.TemplateId[0].templateName, // Excel 文件名
-        data: JSON.parse(this.TemplateId[0].templateContent), // Excel 数据
-        showtoolbar: false, //是否第二列显示工具栏
-        showinfobar: true, //是否显示顶部名称栏
-        showsheetbar: false, //是否显示底部表格名称区域
-        pointEdit: false, //是否是编辑器插入表格模式
-        pointEditUpdate: null, //编辑器表格更新函数
-        allowEdit: false,//作用：是否允许前台编辑
-        functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
+    })
 
-      });
+  },
+  /**展示详情luckysheet */
+  luckyLook() {
+
+    this.positionValue = 'absolute';
+    luckysheet.destroy();
+    luckysheet.create({
+      container: "luckysheet", // Luckysheet 的容器元素 ID
+      title: this.TemplateId[0].templateName, // Excel 文件名
+      data: JSON.parse(this.TemplateId[0].templateContent), // Excel 数据
+      showtoolbar: false, //是否第二列显示工具栏
+      showinfobar: true, //是否显示顶部名称栏
+      showsheetbar: false, //是否显示底部表格名称区域
+      pointEdit: false, //是否是编辑器插入表格模式
+      pointEditUpdate: null, //编辑器表格更新函数
+      allowEdit: false,//作用：是否允许前台编辑
+      functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
+
+    });
 
-    },
-    /**详情返回按钮 */
-    handleReturnButtonClick(){
+  },
+  /**详情返回按钮 */
+  handleReturnButtonClick() {
 
-      this.positionValue ='static';
-      luckysheet.destroy();
+    this.positionValue = 'static';
+    luckysheet.destroy();
 
-    },
+  },
 
-    /** 删除按钮操作*/
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return delSuppliesTemplate(ids);
-      }).then((result) => {
-        if (result.data ==="操作失败"){
-          this.getList();
-          this.msgError("该模板下存在关联规则，请先删除关联规则！！！");
-        }else {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }
-      }).catch(()=>{
-      })
+  /** 删除按钮操作*/
+  handleDelete(row) {
+    const ids = row.id || this.ids;
+    this.$confirm('是否确认删除Excel模板编号为"' + row.templateName + '"的数据项?', "警告", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(function () {
+      return delSuppliesTemplate(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 exportMyluckyexcel(queryParams);
-    //   }).then(response => {
-    //     this.download(response.msg);
-    //   })
-    // }
-  }
+  // /** 导出按钮操作 */
+  // handleExport() {
+  //   const queryParams = this.queryParams;
+  //   this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
+  //     confirmButtonText: "确定",
+  //     cancelButtonText: "取消",
+  //     type: "warning"
+  //   }).then(function() {
+  //     return exportMyluckyexcel(queryParams);
+  //   }).then(response => {
+  //     this.download(response.msg);
+  //   })
+  // }
+}
 };
 </script>
 

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

@@ -32,7 +32,6 @@
         <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-select>
       </el-form-item>
       <el-form-item>
@@ -245,7 +244,7 @@ export default {
             let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
             this.$message({
               message: message,
-              type:'success'
+              type:'error'
             });
           }else {
             this.$message.error(response.message);

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

@@ -2,6 +2,14 @@
   <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"
@@ -22,12 +30,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="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"
@@ -94,7 +102,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">
@@ -173,36 +181,19 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <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-form-item label="规则名称" prop="detailName">-->
+<!--          <el-input v-model="form.detailName" placeholder="请输入规则名称" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="模板表行坐标" prop="detailMH">
           <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="showImport">
+        <el-form-item label="模板表列坐标" prop="detailML">
           <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="showImport">
+        <el-form-item label="导入表行坐标" prop="detailYH">
           <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="showImport">
+        <el-form-item label="导入列行坐标" prop="detailYL">
           <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
         </el-form-item>
         <el-form-item label="状态">
@@ -212,6 +203,10 @@
           </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"
@@ -238,9 +233,9 @@ import {
   addSuppliesroledetail,
   updateSuppliesroledetail,
   exportSuppliesroledetail,
-  saveSid,
   toggleEnable,
   toggleDisable,
+  saveSid,
   saveOperation,
 } from "@/api/system/suppliesroledetail";
 import Editor from '@/components/Editor';
@@ -287,9 +282,6 @@ export default {
       // 表单参数
       form: {
       },
-      showTemplate: false, // 控制单元格的显示与隐藏
-      showImport: false, // 控制行转换的显示与隐藏
-      showLie: false, // 控制列转换的显示与隐藏
       // 表单校验
       rules: {
         roleId:[
@@ -323,6 +315,7 @@ export default {
   },
   methods: {
 
+    /**启用 */
     toggleEnable(suppliesroledetail){
       console.log('你点击了【' + suppliesroledetail.s+'】的开关控件，当前开关值:' + suppliesroledetail.status);
       let enableText=['启用','禁用'];
@@ -331,16 +324,23 @@ export default {
         toggleEnable(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:'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'});
+            this.$message({
+              message: message,
+              type:'error'
+            });
           }else {
             this.$message.error(response.message);
           }
@@ -453,7 +453,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除规则详情编号为"' + row.detailName + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除规则详情编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"