Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
#	ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue

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

+package com.ruoyi.system.controller;
+
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.service.IActSuppliesConvertService;
+import com.ruoyi.system.service.IActSuppliesDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 模板转换页面接口
+ * */
+
+@RestController
+@RequestMapping("/ActSuppliesConvert/ActSuppliesConvert")
+public class ActSuppliesConvertController extends BaseController{
+
+    @Autowired
+    private IActSuppliesConvertService actSuppliesConvertService;
+
+    /**
+     * 模板转换页面查询模板接口
+     * */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:list')")
+    @GetMapping("/list")
+    public TableDataInfo  templitelist(SysSupplies sysSupplies){
+
+        List<SysSupplies> list = actSuppliesConvertService.templiteList(sysSupplies);
+        return getDataTable(list);
+
+    }
+
+    /**
+     * 模板转换页面查询模板详细内容接口
+     * */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:listid')")
+    @GetMapping("/listid/{id}")
+    public TableDataInfo  templitelistid(@PathVariable("id") Integer id){
+
+        List<SysSupplies> list = actSuppliesConvertService.templiteListid(id);
+        return getDataTable(list);
+
+    }
+
+    /**
+     * 模板转换页面根据模板ID查询规则接口
+     * */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:rolelist')")
+    @GetMapping("/rolelist/{id}")
+    public TableDataInfo  rolelist(@PathVariable("id") Integer id){
+
+        List<ActSuppliesRole> list = actSuppliesConvertService.roleList(id);
+        return getDataTable(list);
+
+    }
+
+    /**
+     * 模板转换页面根据规则ID查询规则详情接口
+     * */
+    @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:rolelistid')")
+    @GetMapping("/rolelistid/{id}")
+    public TableDataInfo  rolelistid(@PathVariable("id") Integer id){
+
+        List<ActSuppliesRoleDetail> list = actSuppliesConvertService.roleListid(id);
+        return getDataTable(list);
+
+    }
+
+
+}

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

 package com.ruoyi.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysSupplies;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -33,6 +30,20 @@ public class ActSuppliesRoleController extends BaseController
     @Autowired
     private IActSuppliesRoleService actSuppliesRoleService;
 
+    /**
+     * 查询上级分类
+     * */
+    @PreAuthorize("@ss.hasPermi('system:suppliesrole:savesid')")
+    @GetMapping("/savesid")
+    @ResponseBody
+    public TableDataInfo saveSid(){
+
+        List<SysSupplies> options = actSuppliesRoleService.saveSid();
+
+        return getDataTable(options);
+
+    }
+
     /**
      * 查询导入规则列表
      */
@@ -76,6 +87,8 @@ public class ActSuppliesRoleController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ActSuppliesRole actSuppliesRole)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        actSuppliesRole.setCreateBy(user.getUserName());
         return toAjax(actSuppliesRoleService.insertActSuppliesRole(actSuppliesRole));
     }
 
@@ -87,6 +100,9 @@ public class ActSuppliesRoleController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ActSuppliesRole actSuppliesRole)
     {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        actSuppliesRole.setUpdateBy(user.getUserName());
         return toAjax(actSuppliesRoleService.updateActSuppliesRole(actSuppliesRole));
     }
 

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

 package com.ruoyi.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.domain.ActSuppliesRole;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -33,6 +29,21 @@ public class ActSuppliesRoleDetailController extends BaseController
     @Autowired
     private IActSuppliesRoleDetailService actSuppliesRoleDetailService;
 
+
+    /**
+     * 查询上级分类
+     * */
+    @PreAuthorize("@ss.hasPermi('system:suppliesroledetail:savesid')")
+    @GetMapping("/savesid")
+    @ResponseBody
+    public TableDataInfo saveSid(){
+
+        List<ActSuppliesRole> options = actSuppliesRoleDetailService.saveSid();
+
+        return getDataTable(options);
+
+    }
+
     /**
      * 查询规则详情列表
      */

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 规则详情对象 act_supplies_role_detail
  * 
  * @author dongjg
- * @date 2023-07-13
+ * @date 2023-07-12
  */
 public class ActSuppliesRoleDetail extends BaseEntity
 {
@@ -26,31 +26,53 @@ public class ActSuppliesRoleDetail extends BaseEntity
     @Excel(name = "规则名称")
     private String detailName;
 
-    /** 目标行 */
-    @Excel(name = "目标行")
+    /** 导入数据行列*/
     private String detailMH;
+    private String detailML;
+    private String detailYH;
+    private String detailYL;
 
     /** 规则内容 */
     @Excel(name = "规则内容")
     private String detailContent;
 
-    /** 目标列 */
-    @Excel(name = "目标列")
-    private String detailML;
-
     /** 状态 */
     @Excel(name = "状态")
     private Integer status;
 
-    /** 原行 */
-    @Excel(name = "原行")
-    private String detailYH;
+    public String getDetailMH() {
+        return detailMH;
+    }
+
+    public void setDetailMH(String detailMH) {
+        this.detailMH = detailMH;
+    }
+
+    public String getDetailML() {
+        return detailML;
+    }
 
-    /** 原列 */
-    @Excel(name = "原列")
-    private String datailYL;
+    public void setDetailML(String detailML) {
+        this.detailML = detailML;
+    }
 
-    public void setId(Integer id) 
+    public String getDetailYH() {
+        return detailYH;
+    }
+
+    public void setDetailYH(String detailYH) {
+        this.detailYH = detailYH;
+    }
+
+    public String getDetailYL() {
+        return detailYL;
+    }
+
+    public void setDetailYL(String detailYL) {
+        this.detailYL = detailYL;
+    }
+
+    public void setId(Integer id)
     {
         this.id = id;
     }
@@ -77,15 +99,6 @@ public class ActSuppliesRoleDetail extends BaseEntity
     {
         return detailName;
     }
-    public void setDetailMH(String detailMH) 
-    {
-        this.detailMH = detailMH;
-    }
-
-    public String getDetailMH() 
-    {
-        return detailMH;
-    }
     public void setDetailContent(String detailContent) 
     {
         this.detailContent = detailContent;
@@ -95,15 +108,6 @@ public class ActSuppliesRoleDetail extends BaseEntity
     {
         return detailContent;
     }
-    public void setDetailML(String detailML) 
-    {
-        this.detailML = detailML;
-    }
-
-    public String getDetailML() 
-    {
-        return detailML;
-    }
     public void setStatus(Integer status) 
     {
         this.status = status;
@@ -113,24 +117,6 @@ public class ActSuppliesRoleDetail extends BaseEntity
     {
         return status;
     }
-    public void setDetailYH(String detailYH) 
-    {
-        this.detailYH = detailYH;
-    }
-
-    public String getDetailYH() 
-    {
-        return detailYH;
-    }
-    public void setDatailYL(String datailYL) 
-    {
-        this.datailYL = datailYL;
-    }
-
-    public String getDatailYL() 
-    {
-        return datailYL;
-    }
 
     @Override
     public String toString() {
@@ -138,14 +124,10 @@ public class ActSuppliesRoleDetail extends BaseEntity
             .append("id", getId())
             .append("roleId", getRoleId())
             .append("detailName", getDetailName())
-            .append("detailMH", getDetailMH())
             .append("detailContent", getDetailContent())
-            .append("detailML", getDetailML())
             .append("status", getStatus())
-            .append("detailYH", getDetailYH())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
-            .append("datailYL", getDatailYL())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .toString();

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

+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * Excel模板对象 act_supplies_template
+ *
+ * @author ruoyi
+ * @date 2023-07-05
+ */
+public class SysSupplies extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 关联ID */
+    @Excel(name = "关联ID")
+    private Long detId;
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    /** Excel文件名 */
+    @Excel(name = "Excel文件名")
+    private String templateName;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String templateContent;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    private String sname;
+    private String sysclassify;
+
+    public String getSname() {
+        return sname;
+    }
+
+    public void setSname(String sname) {
+        this.sname = sname;
+    }
+
+    public String getSysclassify() {
+        return sysclassify;
+    }
+
+    public void setSysclassify(String sysclassify) {
+        this.sysclassify = sysclassify;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDetId(Long detId)
+    {
+        this.detId = detId;
+    }
+
+    public Long getDetId()
+    {
+        return detId;
+    }
+
+    public String getTemplateContent() {
+        return templateContent;
+    }
+
+    public void setTemplateContent(String templateContent) {
+        this.templateContent = templateContent;
+    }
+
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("detId", getDetId())
+                .append("name", getTemplateName())
+                .append("content", getTemplateContent())
+                .append("status", getStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//package com.ruoyi.system.domain;
+//
+//import com.ruoyi.common.core.domain.BaseEntity;
+//
+///**
+// * 物资管理 sys_supplies
+// *
+// * @author
+// * @date
+// */
+//public class SysSupplies extends BaseEntity
+//{
+//    private static final long serialVersionUID = 1L;
+//
+//    /** 主键 */
+//    private Long id;
+//
+//    /** 模板名称 */
+//    private String name;
+//
+//    /** JSON */
+//    private String jsons;
+//
+//    public static long getSerialVersionUID() {
+//        return serialVersionUID;
+//    }
+//
+//    public Long getId() {
+//        return id;
+//    }
+//
+//    public void setId(Long id) {
+//        this.id = id;
+//    }
+//
+//    public String getName() {
+//        return name;
+//    }
+//
+//    public void setName(String name) {
+//        this.name = name;
+//    }
+//
+//    public String getJsons() {
+//        return jsons;
+//    }
+//
+//    public void setJsons(String jsons) {
+//        this.jsons = jsons;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        return "SysSupplies{" +
+//                "id=" + id +
+//                ", name='" + name + '\'' +
+//                ", jsons='" + jsons + '\'' +
+//                '}';
+//    }
+//}

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

+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
+import com.ruoyi.system.domain.SysSupplies;
+
+import java.util.List;
+
+public interface ActSuppliesConverMapper {
+
+    List<SysSupplies> templiteList(SysSupplies sysSupplies);
+
+    List<SysSupplies> templiteListid(Integer id);
+
+    List<ActSuppliesRole> roleList(Integer id);
+
+    List<ActSuppliesRoleDetail> roleListid(Integer id);
+
+}

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

 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 
 /**
@@ -58,4 +60,7 @@ public interface ActSuppliesRoleDetailMapper
      * @return 结果
      */
     public int deleteActSuppliesRoleDetailByIds(Integer[] ids);
+
+    List<ActSuppliesRole> saveSid();
+
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.SysSupplies;
 
 /**
  * 导入规则Mapper接口
@@ -58,4 +59,7 @@ public interface ActSuppliesRoleMapper
      * @return 结果
      */
     public int deleteActSuppliesRoleByIds(Integer[] ids);
+
+    List<SysSupplies> saveSid();
+
 }

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

+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.ActSuppliesDetails;
+import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
+import com.ruoyi.system.domain.SysSupplies;
+
+import java.util.List;
+
+public interface IActSuppliesConvertService {
+
+    List<SysSupplies> templiteList(SysSupplies sysSupplies);
+
+    List<SysSupplies> templiteListid(Integer id);
+
+    List<ActSuppliesRole> roleList(Integer id);
+
+    List<ActSuppliesRoleDetail> roleListid(Integer id);
+
+}

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

 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.ActSupplies;
+import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 
 /**
@@ -58,4 +61,7 @@ public interface IActSuppliesRoleDetailService
      * @return 结果
      */
     public int deleteActSuppliesRoleDetailById(Integer id);
+
+    List<ActSuppliesRole> saveSid();
+
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.SysSupplies;
 
 /**
  * 导入规则Service接口
@@ -58,4 +59,7 @@ public interface IActSuppliesRoleService
      * @return 结果
      */
     public int deleteActSuppliesRoleById(Integer id);
+
+    List<SysSupplies> saveSid();
+
 }

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

+package com.ruoyi.system.service.impl;
+
+
+import com.ruoyi.system.domain.ActSuppliesDetails;
+import com.ruoyi.system.domain.ActSuppliesRole;
+import com.ruoyi.system.domain.ActSuppliesRoleDetail;
+import com.ruoyi.system.domain.SysSupplies;
+import com.ruoyi.system.mapper.ActSuppliesConverMapper;
+import com.ruoyi.system.service.IActSuppliesConvertService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService {
+
+    @Autowired
+    private ActSuppliesConverMapper actSuppliesConverMapper;
+
+    @Override
+    public List<SysSupplies> templiteList(SysSupplies sysSupplies) {
+        return actSuppliesConverMapper.templiteList(sysSupplies);
+    }
+
+    @Override
+    public List<SysSupplies> templiteListid(Integer id) {
+        return actSuppliesConverMapper.templiteListid(id);
+    }
+
+    @Override
+    public List<ActSuppliesRole> roleList(Integer id) {
+        return actSuppliesConverMapper.roleList(id);
+    }
+
+    @Override
+    public List<ActSuppliesRoleDetail> roleListid(Integer id) {
+        return actSuppliesConverMapper.roleListid(id);
+    }
+}

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

 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.ActSuppliesRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleDetailMapper;
@@ -53,6 +58,15 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     @Override
     public int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
+
+        String content = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ;
+
+        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\"4\",\"ct\":\"1\"},{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"st\":\"0\",\"rt\":\"4\",\"ct\":\"1\"}]";
+
+        actSuppliesRoleDetail.setDetailName(content);
+        actSuppliesRoleDetail.setDetailContent(content1);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        actSuppliesRoleDetail.setCreateBy(user.getUserName());
         actSuppliesRoleDetail.setCreateTime(DateUtils.getNowDate());
         return actSuppliesRoleDetailMapper.insertActSuppliesRoleDetail(actSuppliesRoleDetail);
     }
@@ -66,6 +80,14 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     @Override
     public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
     {
+
+        String content12 = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ;
+        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\"4\",\"ct\":\"1\"},{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"st\":\"0\",\"rt\":\"4\",\"ct\":\"1\"}]";
+
+        actSuppliesRoleDetail.setDetailName(content12);
+        actSuppliesRoleDetail.setDetailContent(content1);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        actSuppliesRoleDetail.setCreateBy(user.getUserName());
         actSuppliesRoleDetail.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesRoleDetailMapper.updateActSuppliesRoleDetail(actSuppliesRoleDetail);
     }
@@ -93,4 +115,9 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     {
         return actSuppliesRoleDetailMapper.deleteActSuppliesRoleDetailById(id);
     }
+
+    @Override
+    public List<ActSuppliesRole> saveSid() {
+        return actSuppliesRoleDetailMapper.saveSid();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.SysSupplies;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesRoleMapper;
@@ -93,4 +94,9 @@ public class ActSuppliesRoleServiceImpl implements IActSuppliesRoleService
     {
         return actSuppliesRoleMapper.deleteActSuppliesRoleById(id);
     }
+
+    @Override
+    public List<SysSupplies> saveSid() {
+        return actSuppliesRoleMapper.saveSid();
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ActSuppliesConverMapper">
+
+    <resultMap type="SysSupplies" id="SuppliesTemplateResult">
+        <result property="id"    column="id"    />
+        <result property="detId"    column="det_id"    />
+        <result property="templateName"    column="template_name"    />
+        <result property="templateContent"    column="template_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="sysclassify"  column="sysclassify"/>
+        <result property="sname" column="sname" />
+    </resultMap>
+
+    <resultMap type="ActSuppliesRole" id="ActSuppliesRoleResult">
+        <result property="id"    column="id"    />
+        <result property="tempId"    column="temp_id"    />
+        <result property="roleName"    column="role_name"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap type="ActSuppliesRoleDetail" id="ActSuppliesRoleDetailResult">
+        <result property="id"    column="id"    />
+        <result property="roleId"    column="role_id"    />
+        <result property="detailName"    column="detail_name"    />
+
+        <result property="detailMH"    column="detail_m_h"    />
+        <result property="detailML"    column="detail_m_l"    />
+        <result property="detailYH"    column="detail_y_h"    />
+        <result property="detailYL"    column="detail_y_l"    />
+
+        <result property="detailContent"    column="detail_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectActSuppliesRoleVo">
+        select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role
+    </sql>
+
+    <sql id="selectActSuppliesRoleDetailVo">
+        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l, detail_content, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
+    </sql>
+
+    <sql id="selectSuppliesTemplateVo">
+        select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
+    </sql>
+
+    <select id="templiteList" parameterType="com.ruoyi.system.domain.SysSupplies" resultMap="SuppliesTemplateResult">
+        select id, det_id, template_name from act_supplies_template where status = 0
+    </select>
+
+    <select id="templiteListid" parameterType="Integer" resultMap="SuppliesTemplateResult">
+        select id, det_id, template_name, template_content from act_supplies_template where id = #{id}
+    </select>
+
+    <select id="roleList" parameterType="Integer" resultMap="ActSuppliesRoleResult">
+        select id, temp_id, role_name from act_supplies_role where temp_id = #{id} and status = 0
+    </select>
+
+    <select id="roleListid" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
+        select id, role_id, detail_name, detail_content from act_supplies_role_detail where role_id = #{id} and status = 0
+    </select>
+
+</mapper>
\ No newline at end of file

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

@@ -8,33 +8,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="roleId"    column="role_id"    />
         <result property="detailName"    column="detail_name"    />
+
         <result property="detailMH"    column="detail_m_h"    />
-        <result property="detailContent"    column="detail_content"    />
         <result property="detailML"    column="detail_m_l"    />
-        <result property="status"    column="status"    />
         <result property="detailYH"    column="detail_y_h"    />
+        <result property="detailYL"    column="detail_y_l"    />
+
+        <result property="detailContent"    column="detail_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <resultMap type="ActSuppliesRole" id="ActSuppliesRoleResult">
+        <result property="id"    column="id"    />
+        <result property="tempId"    column="temp_id"    />
+        <result property="roleName"    column="role_name"    />
+        <result property="status"    column="status"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
-        <result property="datailYL"    column="datail_y_l"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectActSuppliesRoleDetailVo">
-        select id, role_id, detail_name, detail_m_h, detail_content, detail_m_l, status, detail_y_h, create_by, create_time, datail_y_l, update_by, update_time from act_supplies_role_detail
+        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l, detail_content, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
     </sql>
 
+    <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSuppliesRole" resultMap="ActSuppliesRoleResult">
+        select id, temp_id, role_name from act_supplies_role where status = 0
+    </select>
+
     <select id="selectActSuppliesRoleDetailList" parameterType="ActSuppliesRoleDetail" resultMap="ActSuppliesRoleDetailResult">
         <include refid="selectActSuppliesRoleDetailVo"/>
         <where>  
             <if test="roleId != null "> and role_id = #{roleId}</if>
             <if test="detailName != null  and detailName != ''"> and detail_name like concat('%', #{detailName}, '%')</if>
-            <if test="detailMH != null  and detailMH != ''"> and detail_m_h = #{detailMH}</if>
             <if test="detailContent != null  and detailContent != ''"> and detail_content = #{detailContent}</if>
-            <if test="detailML != null  and detailML != ''"> and detail_m_l = #{detailML}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="detailYH != null  and detailYH != ''"> and detail_y_h = #{detailYH}</if>
-            <if test="datailYL != null  and datailYL != ''"> and datail_y_l = #{datailYL}</if>
         </where>
     </select>
     
@@ -48,28 +61,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="roleId != null">role_id,</if>
             <if test="detailName != null">detail_name,</if>
+
             <if test="detailMH != null">detail_m_h,</if>
-            <if test="detailContent != null">detail_content,</if>
             <if test="detailML != null">detail_m_l,</if>
-            <if test="status != null">status,</if>
             <if test="detailYH != null">detail_y_h,</if>
+            <if test="detailYL != null">detail_y_l,</if>
+
+            <if test="detailContent != null">detail_content,</if>
+            <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="datailYL != null">datail_y_l,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="roleId != null">#{roleId},</if>
             <if test="detailName != null">#{detailName},</if>
+
             <if test="detailMH != null">#{detailMH},</if>
-            <if test="detailContent != null">#{detailContent},</if>
             <if test="detailML != null">#{detailML},</if>
-            <if test="status != null">#{status},</if>
             <if test="detailYH != null">#{detailYH},</if>
+            <if test="detailYL != null">#{detailYL},</if>
+
+            <if test="detailContent != null">#{detailContent},</if>
+            <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="datailYL != null">#{datailYL},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -80,14 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="roleId != null">role_id = #{roleId},</if>
             <if test="detailName != null">detail_name = #{detailName},</if>
-            <if test="detailMH != null">detail_m_h = #{detailMH},</if>
             <if test="detailContent != null">detail_content = #{detailContent},</if>
-            <if test="detailML != null">detail_m_l = #{detailML},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="detailYH != null">detail_y_h = #{detailYH},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="datailYL != null">datail_y_l = #{datailYL},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>

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

@@ -15,10 +15,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="com.ruoyi.system.domain.SysSupplies" id="SuppliesTemplateResult">
+        <result property="id"    column="id"    />
+        <result property="detId"    column="det_id"    />
+        <result property="templateName"    column="template_name"    />
+        <result property="templateContent"    column="template_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="sysclassify"  column="sysclassify"/>
+        <result property="sname" column="sname" />
+
+    </resultMap>
+
     <sql id="selectActSuppliesRoleVo">
         select id, temp_id, role_name, status, create_by, create_time, update_by, update_time from act_supplies_role
     </sql>
 
+    <select id="saveSid" parameterType="com.ruoyi.system.domain.SysSupplies" resultMap="SuppliesTemplateResult">
+        select id, det_id, template_name from act_supplies_template where status = 0
+    </select>
+
     <select id="selectActSuppliesRoleList" parameterType="ActSuppliesRole" resultMap="ActSuppliesRoleResult">
         <include refid="selectActSuppliesRoleVo"/>
         <where>  

ruoyi-ui/src/api/ActSuppliesDetails/ActSuppliesDetails.js

@@ -17,6 +17,7 @@ export function getActSuppliesDetails(id) {
   })
 }
 
+//查询上级ID
 export function saveSid() {
   return request({
     url: '/ActSuppliesDetails/ActSuppliesDetails/savesid',

ruoyi-ui/src/api/Actsupplies/Actsupplies.js

@@ -17,6 +17,7 @@ export function getSupplies(id) {
   })
 }
 
+//查询上级ID
 export function getPid() {
   return request({
     url: '/Actsupplies/Actsupplies/options',

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

@@ -63,12 +63,35 @@ export function delSuppliesSave(id) {
 
 
 
-
-
-
-
-
-
+// 模板转换页面查询Excel模板列表
+export function templateList(query) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/list',
+    method: 'get',
+    params: query
+  })
+}
+// 模板转换页面查询Excel模板内容列表
+export function templateListid(id) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/listid/' + id,
+    method: 'get'
+  })
+}
+// 模板转换页面查询规则列表
+export function roleList(id) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelist/' + id,
+    method: 'get'
+  })
+}
+// 模板转换页面查询规则详情列表
+export function roleListid(id) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelistid/' + id,
+    method: 'get'
+  })
+}
 
 
 
@@ -103,14 +126,6 @@ export function getRule(id) {
     method: 'get'
   })
 }
-// 查询模板列表
-export function listMyluckyexcel(query) {
-  return request({
-    url: '/system/supplies/list',
-    method: 'get',
-    params: query
-  })
-}
 
 // 查询模板详情详细
 export function getMyluckyexcel(id) {

ruoyi-ui/src/api/system/suppliesrole.js

@@ -9,6 +9,14 @@ export function listSuppliesrole(query) {
   })
 }
 
+//查询上级ID
+export function saveSid() {
+  return request({
+    url: '/system/suppliesrole/savesid',
+    method: 'get'
+  })
+}
+
 // 查询导入规则详细
 export function getSuppliesrole(id) {
   return request({
@@ -50,4 +58,4 @@ export function exportSuppliesrole(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}

ruoyi-ui/src/api/system/suppliesroledetail.js

@@ -9,6 +9,14 @@ export function listSuppliesroledetail(query) {
   })
 }
 
+//查询上级ID
+export function saveSid() {
+  return request({
+    url: '/system/suppliesroledetail/savesid',
+    method: 'get'
+  })
+}
+
 // 查询规则详情详细
 export function getSuppliesroledetail(id) {
   return request({
@@ -50,4 +58,4 @@ export function exportSuppliesroledetail(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}

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

@@ -150,7 +150,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="handleExport123">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -339,7 +339,41 @@ export default {
         }).then(response => {
           this.download(response.msg);
         })
-    }
+    },
+
+    /** 导出设置 */
+    handleExport123: debounce(function() {
+      // 处理点击事件
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateActSuppliesDetails(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addActSuppliesDetails(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    }, 1000),
   }
 };
+
+function debounce(func, delay) {
+  let timer;
+  return function () {
+    const context = this;
+    const args = arguments;
+    clearTimeout(timer);
+    timer = setTimeout(function () {
+      func.apply(context, args);
+    }, delay);
+  };
+}
 </script>

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

@@ -90,7 +90,7 @@
 import $ from 'jquery'
 /*安装插件 npm install xlsx，安装完成后引入 import XLSX from ‘xlsx’*/
 import XLSX from 'xlsx'
-import {addMyluckyexcel, getMyluckyexcel, listMyluckyexcel,listRule,getRule} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
+import {addMyluckyexcel, getMyluckyexcel, listMyluckyexcel,listRule,getRule,templateList,templateListid,roleListid,roleList} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 
 import luckysheet from 'luckysheet'
 import LuckyExcel from 'luckyexcel'

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

@@ -213,6 +213,7 @@ export default {
   },
   methods: {
 
+    //查询上级ID
     getnameid(){
 
       listSuppliesTemplatenameid().then(response =>{

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

@@ -20,8 +20,10 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+        <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>
@@ -101,7 +103,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -114,15 +116,23 @@
     <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="tempId">
-          <el-input v-model="form.tempId" placeholder="请输入模板ID" />
+          <el-select v-model="form.tempId" filterable 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="form.roleName" placeholder="请输入规则名称" />
         </el-form-item>
         <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+          <el-select v-model="form.status">
+            <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">
@@ -134,7 +144,7 @@
 </template>
 
 <script>
-import { listSuppliesrole, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole } from "@/api/system/suppliesrole";
+import { listSuppliesrole, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
 
 export default {
   name: "Suppliesrole",
@@ -156,6 +166,9 @@ export default {
       total: 0,
       // 导入规则表格数据
       suppliesroleList: [],
+
+      options:[],
+
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -172,13 +185,26 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        tempId: [
+          { required: true, message: "关联id不能为空", trigger: "change" }
+        ]
       }
     };
   },
   created() {
     this.getList();
+    this.getnameid();
   },
   methods: {
+
+
+    /** 查询上级id*/
+    getnameid(){
+      saveSid().then(response =>{
+        this.options = response.rows;
+      })
+    },
+
     /** 查询导入规则列表 */
     getList() {
       this.loading = true;

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

@@ -20,8 +20,9 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+        <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>
@@ -78,18 +79,9 @@
 
     <el-table v-loading="loading" :data="suppliesroledetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="导入规则" align="center" prop="roleId" />
-      <el-table-column label="替换规则" align="center" prop="detailML,detailMH,detailYH,datailYL" >
-      <template slot-scope="scope">
-        {{scope.row.detailML}}{{scope.row.detailMH}}
-        <span v-show="scope.row.detailML!=null&&scope.row.detailML!=null&&scope.row.detailML!=null&&scope.row.detailML!=null"> 单元替换 </span>
-        {{scope.row.datailYL}}{{scope.row.detailYH}}</template>
-      </el-table-column>
-      <el-table-column label="目标列" align="center" prop="detailML" />
-      <el-table-column label="目标行" align="center" prop="detailMH" />
-      <el-table-column label="模板列" align="center" prop="datailYL" />
-      <el-table-column label="模板行" align="center" prop="detailYH" />
+      <el-table-column label="规则详情ID" align="center" prop="id" />
+      <el-table-column label="导入规则ID" align="center" prop="roleId" />
+      <el-table-column label="规则名称" align="center" prop="detailName" />
       <el-table-column label="规则内容" align="center" prop="detailContent" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -111,7 +103,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -123,31 +115,36 @@
     <!-- 添加或修改规则详情对话框 -->
     <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="roleId">
-          <el-input v-model="form.roleId" placeholder="请输入导入规则ID" />
-        </el-form-item>
-        <el-form-item label="规则名称" prop="detailName">
-          <el-input v-model="form.detailName" placeholder="请输入规则名称" />
-        </el-form-item>
-        <el-form-item label="原行" prop="detailYH">
-          <el-input v-model="form.detailYH" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="导入规则ID" prop="roleId">
+          <el-select v-model="form.roleId" filterable placeholder="请选择关联项" >
+            <el-option
+              v-for="option in options"
+              :key="option.roleName"
+              :label="option.roleName"
+              :value="option.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="原列" prop="datailYL">
-          <el-input v-model="form.datailYL" type="textarea" placeholder="请输入内容" />
+<!--        <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="detailMH">
-          <el-input v-model="form.detailMH" type="textarea" placeholder="请输入内容" />
+        <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="detailML">
-          <el-input v-model="form.detailML" type="textarea" placeholder="请输入内容" />
+        <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="规则内容">
-          <editor v-model="form.detailContent" :min-height="192"/>
+        <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="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
+          <el-select v-model="form.status">
+            <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">
@@ -159,7 +156,15 @@
 </template>
 
 <script>
-import { listSuppliesroledetail, getSuppliesroledetail, delSuppliesroledetail, addSuppliesroledetail, updateSuppliesroledetail, exportSuppliesroledetail } from "@/api/system/suppliesroledetail";
+import {
+  listSuppliesroledetail,
+  getSuppliesroledetail,
+  delSuppliesroledetail,
+  addSuppliesroledetail,
+  updateSuppliesroledetail,
+  exportSuppliesroledetail,
+  saveSid
+} from "@/api/system/suppliesroledetail";
 import Editor from '@/components/Editor';
 
 export default {
@@ -183,6 +188,9 @@ export default {
       total: 0,
       // 规则详情表格数据
       suppliesroledetailList: [],
+
+      options:[],//上级ID
+
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -193,24 +201,50 @@ export default {
         pageSize: 10,
         roleId: null,
         detailName: null,
-        detailMH: null,
         detailContent: null,
-        detailML: null,
-        status: null,
-        detailYH: null,
-        datailYL: null,
+        status: 0,
       },
       // 表单参数
-      form: {},
+      form: {
+      },
       // 表单校验
       rules: {
+        roleId:[
+          {required: true, message: '关联id不能为空', trigger: 'change'},
+        ],
+        detailMH:[
+          {required: true, message: '模板表行坐标不能为空', trigger: 'change'},
+        ],
+        detailML:[
+          {required: true, message: '模板表列坐标不能为空', trigger: 'change'},
+        ],
+        detailYH:[
+          {required: true, message: '导入表行坐标不能为空', trigger: 'change'},
+        ],
+        detailYL:[
+          {required: true, message: '导入表列坐标不能为空', trigger: 'change'},
+        ]
       }
     };
   },
   created() {
     this.getList();
+    this.getnameid();
+    this.form.detailMH=1;
+    this.form.detailML=1;
+    this.form.detailYH=1;
+    this.form.detailYL=1;
   },
   methods: {
+
+    getnameid(){
+
+      saveSid().then(response =>{
+        this.options = response.rows;
+      })
+
+    },
+
     /** 查询规则详情列表 */
     getList() {
       this.loading = true;
@@ -231,14 +265,10 @@ export default {
         id: null,
         roleId: null,
         detailName: null,
-        detailMH: null,
         detailContent: null,
-        detailML: null,
         status: 0,
-        detailYH: null,
         createBy: null,
         createTime: null,
-        datailYL: null,
         updateBy: null,
         updateTime: null
       };