Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/views/system/suppliesrole/index.vue

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

@@ -112,7 +112,7 @@ public class ActSuppliesController extends BaseController
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         List<Integer> find = actSuppliesService.findall();
-
+        System.out.println(find.toString());
         for (long num : ids){
             if (find.contains((int)num)){
                 return AjaxResult.success("删除失败","操作失败");

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

@@ -75,10 +75,10 @@ public class ActSuppliesConvertController extends BaseController{
      * 模板转换页面根据规则ID查询规则详情接口
      * */
     @PreAuthorize("@ss.hasPermi('ActSuppliesConvert:ActSuppliesConvert:saveSuppliesname')")
-    @GetMapping("/saveSuppliesname/{id}")
-    public AjaxResult  saveSuppliesname(@PathVariable("id") Integer id){
+    @GetMapping("/saveSuppliesname/{name}")
+    public AjaxResult  saveSuppliesname(@PathVariable("name") String name){
 
-        return AjaxResult.success(actSuppliesConvertService.selectSuppliesname(id));
+        return AjaxResult.success(actSuppliesConvertService.selectSuppliesname(name));
 
     }
 

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

@@ -74,14 +74,13 @@ public class ActSuppliesTemplateController extends BaseController {
     }
 
     /**
-     * 查询关联ID
+     *
      */
-    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listnameid')")
-    @Log(title = "Excel模板", businessType = BusinessType.INSERT)
-    @GetMapping("/listnameid")
-    public TableDataInfo listnameid() {
+    @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listId')")
+    @GetMapping("/listId/{id}")
+    public TableDataInfo listId(@PathVariable("id") Long id) {
 
-        List<ActSuppliesTemplate> sysSupplies = actSuppliesTemplateService.selectlistnameid();
+        List<ActSuppliesTemplate> sysSupplies = actSuppliesTemplateService.saveTemplate(id);
 
         return getDataTable(sysSupplies);
 
@@ -108,104 +107,3 @@ public class ActSuppliesTemplateController extends BaseController {
         return toAjax(actSuppliesTemplateService.deleteSuppliesTemplateByIds(ids));
     }
 }
\ No newline at end of file
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//package com.ruoyi.web.controller.system;
-//
-//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.page.TableDataInfo;
-//import com.ruoyi.common.enums.BusinessType;
-//import com.ruoyi.system.domain.SysSupplies;
-//import com.ruoyi.system.service.ISysSuppliesService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.security.access.prepost.PreAuthorize;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-///**
-// * 物资管理Controller
-// *
-// * @author
-// * @date
-// */
-//@RestController
-//@RequestMapping("/system/supplies")
-//public class SysSuppliesController extends BaseController
-//{
-//
-//    @Autowired
-//    private ISysSuppliesService iSysSuppliesService;
-//
-//    /**
-//     * 物资管理列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(SysSupplies sysSupplies)
-//    {
-//        startPage();
-//        List<SysSupplies> list = iSysSuppliesService.list();
-//        return getDataTable(list);
-//    }
-//    /**
-//     * 保存物资管理列表
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:save')")
-//    @Log(title = "模板详情", businessType = BusinessType.INSERT)
-//    @PostMapping("/save")
-//    public AjaxResult save(@RequestBody SysSupplies sysSupplies)
-//    {
-//        return toAjax(iSysSuppliesService.save(sysSupplies));
-//    }
-//
-//    /**
-//     * 获取模板详情详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:supplies:query')")
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") Long id)
-//    {
-//        System.out.println("从前端接收到的id是"+id);
-//        return AjaxResult.success(iSysSuppliesService.selectExcelById(id));
-//    }
-//
-//}

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

@@ -22,6 +22,8 @@ public class ActSupplies extends BaseEntity
     @Excel(name = "父ID")
     private Long pid;
 
+    private String fname;
+
     /** 物料名称 */
     @Excel(name = "物料名称")
     private String suppliesName;
@@ -34,6 +36,14 @@ public class ActSupplies extends BaseEntity
     @Excel(name = "状态")
     private Long status;
 
+    public String getFname() {
+        return fname;
+    }
+
+    public void setFname(String fname) {
+        this.fname = fname;
+    }
+
     public void setId(Long id)
     {
         this.id = id;

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

@@ -42,25 +42,6 @@ public class ActSuppliesTemplate extends BaseEntity
     @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;
@@ -113,105 +94,3 @@ public class ActSuppliesTemplate extends BaseEntity
                 .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

@@ -17,5 +17,5 @@ public interface ActSuppliesConverMapper {
 
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
-    ActSupplies selectSuppliesname(Integer id);
+    ActSupplies selectSuppliesname(String name);
 }

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

@@ -63,4 +63,6 @@ public interface ActSuppliesMapper
     List<ActSupplies> options();
 
     List<Integer> findall();
+
+    List<Integer> findAllId();
 }

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

@@ -19,15 +19,11 @@ public interface ActSuppliesTemplateMapper
 
     int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
-    List<ActSuppliesTemplate> selectlistnameid();
+//    List<ActSuppliesTemplate> selectlistnameid();
 
     int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
     int deleteSuppliesTemplateByIds(Long[] ids);
 
-//    Integer save(SysSupplies s);
-//
-//    List<SysSupplies> list();
-//
-//    SysSupplies selectExcelById(Long id);
+    List<ActSuppliesTemplate> saveTemplate(Long id);
 }

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

@@ -19,15 +19,9 @@ public interface ActSuppliesTemplateService
 
     int insertSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
-    List<ActSuppliesTemplate> selectlistnameid();
-
     int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies);
 
     int deleteSuppliesTemplateByIds(Long[] ids);
 
-//    List<SysSupplies> list();
-//
-//    Integer save(SysSupplies s);
-//
-//    SysSupplies selectExcelById(Long id);
+    List<ActSuppliesTemplate> saveTemplate(Long id);
 }

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

@@ -14,5 +14,5 @@ public interface IActSuppliesConvertService {
 
     List<ActSuppliesRoleDetail> roleListid(Integer id);
 
-    ActSupplies selectSuppliesname(Integer id);
+    ActSupplies selectSuppliesname(String name);
 }

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

@@ -36,7 +36,7 @@ public class ActSuppliesConvertServiceImpl implements IActSuppliesConvertService
     }
 
     @Override
-    public ActSupplies selectSuppliesname(Integer id) {
-        return actSuppliesConverMapper.selectSuppliesname(id);
+    public ActSupplies selectSuppliesname(String name) {
+        return actSuppliesConverMapper.selectSuppliesname(name);
     }
 }

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

@@ -61,7 +61,8 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
 
         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\"}]";
+        //
+        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\"4\",\"ct\":\"1\"}";
 
         actSuppliesRoleDetail.setDetailName(content);
         actSuppliesRoleDetail.setDetailContent(content1);

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

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 物料总分类管理Service业务层处理
@@ -102,6 +104,14 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
 
     @Override
     public List<Integer> findall() {
-        return actSuppliesMapper.findall();
+
+
+        List<Integer> findall = actSuppliesMapper.findall();
+        List<Integer> allId = actSuppliesMapper.findAllId();
+        List<Integer> mergedList = Stream.concat(findall.stream(), allId.stream()).collect(Collectors.toList());
+
+        return mergedList;
     }
+
+
 }

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

@@ -41,11 +41,11 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
         sysSupplies.setCreateTime(DateUtils.getNowDate());
         return actSuppliesTemplateMapper.insertSuppliesTemplate(sysSupplies);
     }
-
-    @Override
-    public List<ActSuppliesTemplate> selectlistnameid() {
-        return actSuppliesTemplateMapper.selectlistnameid();
-    }
+//
+//    @Override
+//    public List<ActSuppliesTemplate> selectlistnameid() {
+//        return actSuppliesTemplateMapper.selectlistnameid();
+//    }
 
     @Override
     public int updateSuppliesTemplate(ActSuppliesTemplate sysSupplies) {
@@ -60,21 +60,10 @@ public class ActSuppliesTemplateServiceImpl implements ActSuppliesTemplateServic
         return actSuppliesTemplateMapper.deleteSuppliesTemplateByIds(ids);
     }
 
-//    @Override
-//    public List<SysSupplies> list() {
-//        return iSysSuppliesMapper.list();
-//    }
-//
-//    @Override
-//    public SysSupplies selectExcelById(Long id) {
-//        return iSysSuppliesMapper.selectExcelById(id);
-//    }
-//
-//    @Override
-//    public Integer save(SysSupplies sysSupplies) {
-//        return iSysSuppliesMapper.save(sysSupplies);
-//    }
-
+    @Override
+    public List<ActSuppliesTemplate> saveTemplate(Long id) {
+        return actSuppliesTemplateMapper.saveTemplate(id);
+    }
 
 
 }

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

@@ -76,9 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where role_id = #{id} and status = 0
     </select>
 
-    <select id="selectSuppliesname" parameterType="Integer" resultMap="ActSuppliesResult">
-        select sid from act_supplies_details where id = #{id}
+    <select id="selectSuppliesname" parameterType="String" resultMap="ActSuppliesResult">
+        select id, supplies_name from act_supplies where id=(select sid from act_supplies_details where details_name = #{name})
     </select>
 
 
+
 </mapper>
\ No newline at end of file

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

@@ -54,13 +54,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectActSuppliesDetailsList" parameterType="ActSuppliesDetails" resultMap="OneActSuppliesDetailsResult">
-        select b.id, b.sid,a.supplies_name,b.details_name,b.sysclassify,b.status from act_supplies a,act_supplies_details b
+        select a.id, a.sid,b.supplies_name,a.details_name,a.sysclassify,a.status from act_supplies_details a left join act_supplies b on a.sid = b.id
         <where>
-            <if test="sid != null "> and b.sid = #{sid}</if>
-            <if test="detailsName != null  and detailsName != ''"> and b.details_name like concat('%', #{detailsName}, '%')</if>
-            <if test="sysclassify != null  and sysclassify != ''"> and b.sysclassify like concat('%', #{sysclassify},'%')</if>
-            <if test="status != null "> and b.status = #{status}</if>
-            and a.id = b.sid
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="detailsName != null  and detailsName != ''"> and a.details_name like concat('%', #{detailsName}, '%')</if>
+            <if test="sysclassify != null  and sysclassify != ''"> and a.sysclassify like concat('%', #{sysclassify},'%')</if>
+            <if test="status != null "> and a.status = #{status}</if>
+            <if test="fname != null "> and b.supplies_name like concat ('%',#{fname},'%')</if>
         </where>
     </select>
     

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ActSupplies" id="ActSuppliesResult">
         <result property="id"    column="id"    />
         <result property="pid"    column="pid"    />
+        <result property="fname"  column="fname"/>
         <result property="suppliesName"    column="supplies_name"    />
         <result property="orderNum"    column="order_num"    />
         <result property="status"    column="status"    />
@@ -21,12 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectActSuppliesList" parameterType="ActSupplies" resultMap="ActSuppliesResult">
-        <include refid="selectActSuppliesVo"/>
+        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>  
-            <if test="pid != null "> and pid = #{pid}</if>
-            <if test="suppliesName != null  and suppliesName != ''"> and supplies_name like concat('%', #{suppliesName}, '%')</if>
-            <if test="orderNum != null "> and order_num = #{orderNum}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="pid != null">and a.pid = #{pid}</if>
+            <if test="fname != null "> and b.supplies_name like concat('%', #{fname}, '%')</if>
+            <if test="suppliesName != null  and suppliesName != ''"> and a.supplies_name like concat('%', #{suppliesName}, '%')</if>
+            <if test="status != null "> and a.status = #{status}</if>
         </where>
     </select>
     
@@ -83,6 +85,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select sid from act_supplies_details GROUP BY sid
     </select>
 
+    <select id="findAllId" resultType="Integer">
+        select pid from act_supplies
+    </select>
+
+
 <!--    <delete id="deleteActSuppliesById" parameterType="Long">-->
 <!--        delete from act_supplies where id = #{id}-->
 <!--    </delete>-->

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

@@ -14,39 +14,19 @@
         <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="com.ruoyi.system.domain.ActSuppliesDetails" id="SuppliesDetailsResult">
-        <result property="id"    column="id"    />
-        <result property="sid"    column="sid"    />
-        <result property="detailsName"    column="details_name"    />
-        <result property="sysclassify"    column="sysclassify"    />
-        <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="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="selectlistnameid" parameterType="com.ruoyi.system.domain.ActSuppliesDetails" resultMap="SuppliesDetailsResult">
-        select id, sid, details_name, sysclassify from act_supplies_details where status = 0
-    </select>
-
-
-    <select id="selectSuppliesTemplateList" parameterType="SysSupplies" resultMap="SuppliesTemplateResult">
-        select a.id, a.det_id, a.template_name, a.template_content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
+    <select id="selectSuppliesTemplateList" parameterType="ActSuppliesTemplate" resultMap="SuppliesTemplateResult">
+        select id, det_id, template_name, status  from act_supplies_template
         <where>
-            <if test="detId != null "> and a.det_id = #{detId}</if>
-            <if test="templateName != null  and templateName != ''"> and a.template_name like concat('%', #{templateName}, '%')</if>
-            <if test="templateContent != null  and templateContent != ''"> and a.template_content = #{templateContent}</if>
-            <if test="status != null "> and a.status = #{status}</if>
-            and a.det_id = b.id
+            <if test="detId != null "> and det_id = #{detId}</if>
+            <if test="templateName != null  and templateName != ''"> and template_name like concat('%', #{templateName}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
 
@@ -60,7 +40,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertSuppliesTemplate" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSuppliesTemplate" parameterType="ActSuppliesTemplate" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies_template
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="detId != null">det_id,</if>
@@ -84,7 +64,7 @@
         </trim>
     </insert>
 
-    <update id="updateSuppliesTemplate" parameterType="SysSupplies">
+    <update id="updateSuppliesTemplate" parameterType="ActSuppliesTemplate">
         update act_supplies_template
         <trim prefix="SET" suffixOverrides=",">
             <if test="detId != null">det_id = #{detId},</if>

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

@@ -9,9 +9,9 @@ export function listSuppliesTemplate(query) {
   })
 }
 
-export function listSuppliesTemplatenameid() {
+export function listSuppliesTemplateId(id) {
   return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/listnameid',
+    url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
     method: 'get'
   })
 }
@@ -63,6 +63,13 @@ export function delSuppliesSave(id) {
 
 
 
+// 模板转换页面查询规则对应用友物料名称
+export function getSuppliesName(name) {
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/saveSuppliesname/' + name,
+    method: 'get'
+  })
+}
 // 模板转换页面查询Excel模板列表
 export function templateList(query) {
   return request({
@@ -96,21 +103,6 @@ export function roleListid(id) {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // 查询规则列表
 export function listRule(query) {
   return request({

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="父ID" prop="sid">
+      <el-form-item label="ID" prop="id" :rules="idRules">
         <el-input
-          v-model="queryParams.sid"
-          placeholder="请输入父ID"
+          v-model="queryParams.id"
+          placeholder="请输入ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上级分类" prop="fname">
+        <el-input
+          v-model="queryParams.fname"
+          placeholder="请输入上级分类"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -89,11 +98,36 @@
 
     <el-table v-loading="loading" :data="ActSuppliesDetailsList" @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="父ID" align="center" prop="fname" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="上级分类" align="center">
+        <template slot-scope="scope">
+          <div>
+            <template v-if="scope.row.fname === null">
+              其他
+            </template>
+            <template v-else>
+              {{ scope.row.fname }}
+            </template>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="物料名称" align="center" prop="detailsName" />
       <el-table-column label="所属系统" align="center" prop="sysclassify" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <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>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -125,8 +159,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="上级ID" prop="sid">
-          <el-select v-model="form.sid" filterable placeholder="请选择上级ID" >
+        <el-form-item label="上级分类" prop="sid">
+          <el-select v-model="form.sid" filterable placeholder="请选择上级分类" >
             <el-option
               v-for="option in options2"
               :key="option.suppliesName"
@@ -142,7 +176,7 @@
         <el-form-item label="所属系统" prop="sysclassify">
           <el-input v-model="form.sysclassify" placeholder="请输入所属系统" />
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态" prop="">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option label="启用" value="0"></el-option>
             <el-option label="禁用" value="1"></el-option>
@@ -192,12 +226,15 @@ export default {
         pageNum: 1,
         pageSize: 10,
         sid: null,
+        fname:null,
         detailsName: null,
         sysclassify: null,
-        status: 0,
+        status: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        status:'0'
+      },
       // 表单校验
       rules: {
         sid: [
@@ -206,7 +243,13 @@ export default {
         detailsName: [
           { required: true, message: "物料名称不能为空", trigger: "blur" }
         ],
-      }
+        sysclassify: [
+          { required: true, message: "物料名称不能为空", trigger: "blur" }
+        ]
+      },
+      idRules:[
+        { pattern: /^\d+$/, message: 'ID只能输入数字', trigger: 'blur' }
+      ]
     };
   },
   created() {
@@ -246,7 +289,7 @@ export default {
         sid: null,
         detailsName: null,
         sysclassify: null,
-        status: 0,
+        status: null,
         createBy: null,
         createTime: null,
         updateBy: null,

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="父ID" prop="pid">
+      <el-form-item label="ID" prop="id" :rules="idRules">
+        <el-input
+          v-model="queryParams.id"
+          placeholder="请输入ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上级分类" prop="fname">
         <el-input
-          v-model="queryParams.pid"
-          placeholder="请输入父ID"
+          v-model="queryParams.fname"
+          placeholder="请输入上级分类"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="materialName">
+      <el-form-item label="物料名称" prop="suppliesName">
         <el-input
-          v-model="queryParams.materialName"
+          v-model="queryParams.suppliesName"
           placeholder="请输入物料名称"
           clearable
           size="small"
@@ -80,11 +89,35 @@
 
     <el-table v-loading="loading" :data="suppliesList" @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="父ID" align="center" prop="pid" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="上级分类" align="center">
+        <template slot-scope="scope">
+          <div>
+            <template v-if="scope.row.fname === null">
+              最高级
+            </template>
+            <template v-else>
+              {{ scope.row.fname }}
+            </template>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="物料名称" align="center" prop="suppliesName" />
-      <el-table-column label="显示排序" align="center" prop="orderNum" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <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>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -117,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="父ID" prop="pid">
-          <el-select v-model="form.pid" placeholder="请输入父ID" >
-            <el-option label="无上级分类" value="0"></el-option>
+          <el-select v-model="form.pid" placeholder="请输入上级分类" >
+            <el-option label="最高级" value="0"></el-option>
             <el-option
               v-for="option in options"
               :key="option.suppliesName"
@@ -127,12 +160,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料名称" prop="materialName">
+        <el-form-item label="物料名称" prop="suppliesName">
           <el-input v-model="form.suppliesName" placeholder="请输入物料名称" />
         </el-form-item>
-        <el-form-item label="显示排序" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入显示排序" />
-        </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option label="启用" value="0"></el-option>
@@ -156,6 +186,8 @@ export default {
   components: {
   },
   data() {
+    let checkId =(rule,value,callback) => {
+    };
     return {
       // 遮罩层
       loading: true,
@@ -175,15 +207,23 @@ export default {
       options: [], // 初始化空数组
       selectedOption: '' ,// 选中的选项
 
+      mydict:{
+        0:'启用',
+        1:'禁用',
+        2:'删除'
+      },
+
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
+        id: null,
         pageNum: 1,
         pageSize: 10,
         pid: null,
+        fname:null,
         suppliesName: null,
         orderNum: null,
         status: 0,
@@ -192,7 +232,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        pid: [
+          { required: true, message: "关联id不能为空", trigger: "change" },
+        ],
+        suppliesName:[
+          { required: true, message: "物料名称不能为空", trigger: "blur" }
+        ],
+      },
+    idRules:[
+      { pattern: /^\d+$/, message: 'ID只能输入数字', trigger: 'blur' }
+    ]
     };
   },
   created() {
@@ -230,6 +279,7 @@ export default {
       this.form = {
         id: null,
         pid: null,
+        fname:null,
         suppliesName: null,
         orderNum: null,
         status: 0,
@@ -242,8 +292,13 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+
       this.queryParams.pageNum = 1;
+      if ('最高级'.indexOf(this.queryParams.fname) !== -1){
+        this.queryParams.pid = 0;
+      }
       this.getList();
+
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -310,7 +365,6 @@ export default {
           this.msgSuccess("删除成功");
         }
       }).catch(()=>{
-        this.msgSuccess("删除失败")
       })
     },
     /** 导出按钮操作 */

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="关联ID" prop="detId">
-        <el-input
-          v-model="queryParams.detId"
-          placeholder="请输入关联ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="Excel文件名" prop="templateName">
         <el-input
           v-model="queryParams.templateName"
@@ -73,10 +65,22 @@
     <el-table v-loading="loading" :data="SuppliesTemplateList" @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="关联ID" align="center" prop="sname" />
       <el-table-column label="Excel文件名" align="center" prop="templateName" />
-      <!--      <el-table-column label="内容" align="center" prop="content" />-->
-      <el-table-column label="所属系统" align="center" prop="sysclassify" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <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>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -115,17 +119,19 @@
     <!-- 添加或修改Excel模板对话框 -->
     <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="detId">
-          <el-select v-model="form.detId" filterable placeholder="请选择关联项" >
-            <el-option
-              v-for="option in options3"
-              :key="option.detailsName"
-              :label="option.detailsName"
-              :value="option.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <input id="importExcel_input" type="file" name="file" placeholder="导入" @change="handleFileChange" />
+
+        <el-upload
+          class="upload-demo"
+          drag
+          action="https://jsonplaceholder.typicode.com/posts/"
+          multiple
+          :before-upload="beforeUpload"
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+        </el-upload>
+
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option label="启用" value="0"></el-option>
@@ -153,7 +159,7 @@ import {
   delSuppliesTemplate,
   addSuppliesTemplate,
   updateSuppliesTemplate,
-  delSuppliesSave, listSuppliesTemplatenameid
+  listSuppliesTemplateId
 } from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import $ from 'jquery';
 import XLSX from 'xlsx';
@@ -181,9 +187,8 @@ export default {
       total: 0,
       // Excel模板表格数据
       SuppliesTemplateList: [],
-
-      options3: [],
-
+      //模板详情
+      TemplateId:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -201,42 +206,47 @@ export default {
       form: {
       },
       rules: {
-        detId: [
-          { required: true, message: "关联id不能为空", trigger: "change" }
-        ]
       },
-      date:[],
-      filename:""
     }
   },
   created() {
     this.getList();
     this.positionValue = "static";
-    this.getnameid();
+  },
+  mounted() {
+    window.handleReturnButtonClick = this.handleReturnButtonClick;
   },
   methods: {
+    /**上传事件 */
+    beforeUpload(file){
+      const isJpgOrPng = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+      const isLt500Kb = file.size / 1024 < 500;
 
-    //查询上级ID
-    getnameid(){
-
-      listSuppliesTemplatenameid().then(response =>{
-
-        this.options3 = response.rows;
-
-      })
-
-    },
+      if (!isJpgOrPng) {
+        this.$message.error('只能上传xlsx文件');
+      }
+      if (!isLt500Kb) {
+        this.$message.error('文件大小不能超过500kb');
+      }
 
-    handleFileChange(event){
-      var file = event.target.files[0];
-      var fileName = file.name;
-      fileName = fileName + "";
       LuckyExcel.transformExcelToLucky(file ,(exportJson,lucksheetfile)=>{
-        this.form.templateName = fileName;
+        this.form.templateName = file.name;
         this.form.templateContent = JSON.stringify(exportJson.sheets);
       });
+
+      return isJpgOrPng && isLt500Kb;
     },
 
+    // handleFileChange(event){
+    //   var file = event.target.files[0];
+    //   var fileName = file.name;
+    //   fileName = fileName + "";
+    //   LuckyExcel.transformExcelToLucky(file ,(exportJson,lucksheetfile)=>{
+    //     this.form.templateName = fileName;
+    //     this.form.templateContent = JSON.stringify(exportJson.sheets);
+    //   });
+    // },
+
     /** 查询Excel模板列表 */
     getList() {
       this.loading = true;
@@ -322,28 +332,43 @@ export default {
 
     /** 详情按钮操作 */
     handleSave(row) {
-      const ids = row.id || this.ids;
-      let ida;
-      for (let i =0;i<this.SuppliesTemplateList.length;i++){
-        if (this.SuppliesTemplateList[i].id == row.id){
-          ida= i;
-        }
-      }
+
+      listSuppliesTemplateId(row.id).then(response =>{
+
+        this.TemplateId = response.rows;
+
+        this.luckyLook();
+
+      })
+
+    },
+    /**展示详情luckysheet */
+    luckyLook(){
+
       this.positionValue = 'absolute';
       luckysheet.destroy();
       luckysheet.create({
         container: "luckysheet", // Luckysheet 的容器元素 ID
-        title: this.SuppliesTemplateList[ida].name, // Excel 文件名
-        data: JSON.parse(this.SuppliesTemplateList[ida].templateContent), // Excel 数据
-        myFolderUrl: "http://localhost:5000/supplies/suppliesTemplate",//作用：左上角<返回按钮的链接
+        title: this.TemplateId[0].templateName, // Excel 文件名
+        data: JSON.parse(this.TemplateId[0].templateContent), // Excel 数据
+        //myFolderUrl: "http://localhost:5000/supplies/suppliesTemplate",//作用：左上角<返回按钮的链接
         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(){
+
+      this.positionValue ='static';
+      luckysheet.destroy();
+
     },
 
     /** 删除按钮操作*/

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

@@ -90,8 +90,33 @@
       <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="convertStatus" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="是否物料转换" align="center">
+        <template slot-scope="scope">
+          <div>
+            <template v-if="scope.row.convertStatus === 0">
+              是
+            </template>
+            <template v-else-if="scope.row.convertStatus === 1">
+              否
+            </template>
+          </div>
+        </template>
+      </el-table-column>
+      <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>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -216,9 +241,11 @@ export default {
         roleId: null,
         detailName: null,
         detailContent: null,
-        status: 0,
+        status: null,
         converStatus: null,
       },
+      namenn: '杨木',
+      form1:{},
       // 表单参数
       form: {
       },