物料模块/规则模块添加序号列，完善功能

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

@@ -99,7 +99,7 @@ public class ActSuppliesController extends BaseController
     public AjaxResult edit(@RequestBody ActSupplies actSupplies)
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        actSupplies.setCreateBy(user.getUserName());
+        actSupplies.setUpdateBy(user.getUserName());
         return toAjax(actSuppliesService.updateActSupplies(actSupplies));
     }
 

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

@@ -103,7 +103,7 @@ public class ActSuppliesDetailsController extends BaseController
     public AjaxResult edit(@RequestBody ActSuppliesDetails actSuppliesDetails)
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        actSuppliesDetails.setCreateBy(user.getUserName());
+        actSuppliesDetails.setUpdateBy(user.getUserName());
 
         return toAjax(actSuppliesDetailsService.updateActSuppliesDetails(actSuppliesDetails));
     }

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 
-import com.ruoyi.system.domain.ActOperation;
+
 import com.ruoyi.system.domain.ActSupplies;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -74,7 +74,7 @@ public class ActSuppliesTemplateController extends BaseController {
     }
 
     /**
-     *
+     *获取excel模板内容
      */
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listId')")
     @GetMapping("/listId/{id}")

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

+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+public class ActOperation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    private String OperationName;
+    private Integer status;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOperationName() {
+        return OperationName;
+    }
+
+    public void setOperationName(String operationName) {
+        OperationName = operationName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

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

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 物料总分类管理对象 act_supplies
+ * 用友物料管理对象 act_supplies
  * 
  * @author ruoyi
  * @date 2023-07-11
@@ -19,9 +19,9 @@ public class ActSupplies extends BaseEntity
     private Long id;
 
     /** 父ID */
-    @Excel(name = "父ID")
     private Long pid;
 
+    @Excel(name = "上级分类")
     private String fname;
 
     /** 物料名称 */
@@ -29,7 +29,6 @@ public class ActSupplies extends BaseEntity
     private String suppliesName;
 
     /** 显示排序 */
-    @Excel(name = "显示排序")
     private Long orderNum;
 
     /** 状态 */

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

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 物料细分类管理对象 act_supplies_details
+ * 六矿物料管理对象 act_supplies_details
  * 
  * @author ruoyi
  * @date 2023-07-11
@@ -19,14 +19,22 @@ public class ActSuppliesDetails extends BaseEntity
     private Long id;
 
     /** 父ID */
-    @Excel(name = "父ID")
     private Long sid;
 
+    @Excel(name = "上级分类")
+    private String fname;
+
     /** 物料名称 */
     @Excel(name = "物料名称")
     private String detailsName;
 
-    private String fname;
+    /** 所属系统 */
+    @Excel(name = "所属系统")
+    private String sysclassify;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
 
     public String getFname() {
         return fname;
@@ -36,14 +44,6 @@ public class ActSuppliesDetails extends BaseEntity
         this.fname = fname;
     }
 
-    /** 所属系统 */
-    @Excel(name = "所属系统")
-    private String sysclassify;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private Long status;
-
     public void setId(Long id) 
     {
         this.id = id;

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

@@ -19,9 +19,12 @@ public class ActSuppliesRole extends BaseEntity
     private Integer id;
 
     /** 模板ID */
-    @Excel(name = "模板ID")
     private Integer tempId;
 
+    /**所属模板*/
+    @Excel(name = "所属模板")
+    private String templateName;
+
     /** 规则名称 */
     @Excel(name = "规则名称")
     private String roleName;
@@ -30,7 +33,7 @@ public class ActSuppliesRole extends BaseEntity
     @Excel(name = "状态")
     private Integer status;
 
-    private String templateName;
+
 
     public String getTemplateName() {
         return templateName;

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

@@ -19,7 +19,6 @@ public class ActSuppliesRoleDetail extends BaseEntity
     private Integer id;
 
     /** 导入规则ID */
-    @Excel(name = "导入规则ID")
     private Integer roleId;
 
     /** 规则名称 */
@@ -32,15 +31,18 @@ public class ActSuppliesRoleDetail extends BaseEntity
     private String detailYH;
     private String detailYL;
     private String detailYS;
-
+    /**所属规则*/
+    @Excel(name = "所属规则")
     private String roleName;
+
     private Integer detaId;
 
     /** 规则内容 */
     @Excel(name = "规则内容")
     private String detailContent;
 
-    /**是否物料转换*/
+    /**运算规则*/
+    @Excel(name = "运算规则")
     private Integer convertStatus;
 
     /** 状态 */

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

@@ -19,7 +19,6 @@ public class ActSuppliesTemplate extends BaseEntity
     private Long id;
 
     /** 关联ID */
-    @Excel(name = "关联ID")
     private Long detId;
 
     public String getTemplateName() {
@@ -31,15 +30,12 @@ public class ActSuppliesTemplate extends BaseEntity
     }
 
     /** Excel文件名 */
-    @Excel(name = "Excel文件名")
     private String templateName;
 
     /** 内容 */
-    @Excel(name = "内容")
     private String templateContent;
 
     /** 状态 */
-    @Excel(name = "状态")
     private Long status;
 
     public void setId(Long id)

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

@@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 
-import com.ruoyi.system.domain.ActOperation;
+
 import com.ruoyi.system.domain.ActSuppliesRole;
 import com.ruoyi.system.domain.ActSuppliesRoleDetail;
 

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

@@ -6,7 +6,6 @@ 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.ActOperation;
 import com.ruoyi.system.domain.ActSuppliesRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -92,7 +91,7 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
         actSuppliesRoleDetail.setDetailName(content12);
         actSuppliesRoleDetail.setDetailContent(content1);
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        actSuppliesRoleDetail.setCreateBy(user.getUserName());
+        actSuppliesRoleDetail.setUpdateBy(user.getUserName());
         actSuppliesRoleDetail.setUpdateTime(DateUtils.getNowDate());
         return actSuppliesRoleDetailMapper.updateActSuppliesRoleDetail(actSuppliesRoleDetail);
 

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

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="sid != null "> and a.sid = #{sid}</if>
         </where>
     </select>
     

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

@@ -51,6 +51,14 @@ export function delSupplies(id) {
   })
 }
 
+export function exportSupplies(query) {
+  return request({
+    url: '/Actsupplies/Actsupplies/export',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 

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

@@ -189,13 +189,15 @@ export function delMyluckyexcel(id) {
     url: '/system/supplies/' + id,
     method: 'delete'
   })
+
+
 }
 
 // 导出模板详情
-/*export function exportMyluckyexcel(query) {
+export function exportMyluckyexcel(query) {
   return request({
-    url: '/system/supplies/export',
+    url: '/SuppliesTemplate/SuppliesTemplate/export',
     method: 'get',
     params: query
   })
-}*/
+}

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

@@ -17,6 +17,14 @@ export function saveSid() {
   })
 }
 
+
+export function saveOperation(){
+  return request({
+    url: '/system/suppliesroledetail/saveOperation',
+    method: 'get'
+  })
+}
+
 // 查询规则详情详细
 export function getSuppliesroledetail(id) {
   return request({

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

@@ -2,13 +2,15 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上级分类" prop="fname">
-        <el-input
-          v-model="queryParams.fname"
-          placeholder="请输入上级分类"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.sid" filterable clearable placeholder="请选择上级分类" >
+          <el-option
+            v-for="option in options2"
+            :key="option.suppliesName"
+            :label="option.suppliesName"
+            :value="option.id"
+          ></el-option>
+          <el-option label="其他" value="0"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="物料名称" prop="detailsName">
         <el-input
@@ -30,9 +32,8 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
-          <el-option label="在用" value="0"></el-option>
+          <el-option label="启用" value="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>

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="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="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.fname"
-          placeholder="请输入上级分类"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.pid" filterable clearable placeholder="请输入上级分类" >
+          <el-option
+            v-for="option in options"
+            :key="option.suppliesName"
+            :label="option.suppliesName"
+            :value="option.id"
+          ></el-option>
+          <el-option label="无" value="0"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="物料名称" prop="suppliesName">
         <el-input
@@ -30,9 +32,8 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
-          <el-option label="在用" value="0"></el-option>
+          <el-option label="启用" value="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>
@@ -95,7 +96,7 @@
         <template slot-scope="scope">
           <div>
             <template v-if="scope.row.fname === null">
-              最高级
+              无
             </template>
             <template v-else>
               {{ scope.row.fname }}
@@ -151,14 +152,14 @@
     <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="请输入上级分类" >
-            <el-option label="最高级" value="0"></el-option>
+          <el-select v-model="form.pid" filterable placeholder="请输入上级分类" >
             <el-option
               v-for="option in options"
               :key="option.suppliesName"
               :label="option.suppliesName"
               :value="option.id"
             ></el-option>
+            <el-option label="无" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="物料名称" prop="suppliesName">

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="Excel文件名" prop="templateName">
+      <el-form-item label="Excel文件名" prop="templateName" label-width="100px">
         <el-input
           v-model="queryParams.templateName"
           placeholder="请输入Excel文件名"
@@ -48,16 +48,6 @@
           v-hasPermi="['SuppliesTemplate:SuppliesTemplate:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['SuppliesTemplate:SuppliesTemplate:export']"
-        >导出</el-button>
-      </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -152,7 +142,7 @@
         >
           <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>
+          <div class="el-upload__tip" slot="tip">只能上传xlsx文件</div>
         </el-upload>
       </el-form>
 
@@ -167,6 +157,22 @@
   </div>
 </template>
 
+<style>
+#luckysheet_info_detail_title {
+  display: none;
+}
+#luckysheet_info_detail_update{
+  display: none;
+}
+#luckysheet_info_detail_save{
+  display: none;
+}
+
+.luckysheet-share-logo {
+  display: none;
+}
+</style>
+
 <script>
 import {
   listSuppliesTemplate,
@@ -174,13 +180,13 @@ import {
   delSuppliesTemplate,
   addSuppliesTemplate,
   updateSuppliesTemplate,
-  listSuppliesTemplateId
+  listSuppliesTemplateId, exportMyluckyexcel
 } from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import $ from 'jquery';
 import XLSX from 'xlsx';
 import LuckyExcel from 'luckyexcel';
 import luckysheet from 'luckysheet';
-import {delActSuppliesDetails} from "@/api/ActSuppliesDetails/ActSuppliesDetails";
+import {exportSuppliesrole} from "@/api/system/suppliesrole";
 
 export default {
   name: "SuppliesTemplate",
@@ -288,6 +294,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.fileListName = [];
       this.reset();
     },
     // 表单重置
@@ -323,12 +330,14 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.fileListName = [];
       this.reset();
       this.open = true;
       this.title = "添加Excel模板";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.fileListName = [];
       this.reset();
       const id = row.id || this.ids
       getSuppliesTemplate(id).then(response => {
@@ -340,6 +349,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.fileListName = [];
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -380,7 +390,6 @@ export default {
         container: "luckysheet", // Luckysheet 的容器元素 ID
         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, //是否显示底部表格名称区域
@@ -403,13 +412,6 @@ export default {
     /** 删除按钮操作*/
     handleDelete(row) {
       const ids = row.id || this.ids;
-      // this.$confirm('是否确认删除Excel模板编号为"' + ids + '"的数据项？').then(function() {
-      //   return delSuppliesTemplate(ids);
-      // }).then(() => {
-      //   this.getList();
-      //   this.msgSuccess("删除成功");
-      // }).catch(() => {});
-
       this.$confirm('是否确认删除Excel模板编号为"' + ids + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -429,12 +431,19 @@ export default {
 
     },
 
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('SuppliesTemplate/SuppliesTemplate/export', {
-        ...this.queryParams
-      }, `SuppliesTemplate_${new Date().getTime()}.xlsx`)
-    }
+    // /** 导出按钮操作 */
+    // handleExport() {
+    //   const queryParams = this.queryParams;
+    //   this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning"
+    //   }).then(function() {
+    //     return exportMyluckyexcel(queryParams);
+    //   }).then(response => {
+    //     this.download(response.msg);
+    //   })
+    // }
   }
 };
 </script>
@@ -476,7 +485,6 @@ export default {
 
 
 
-
 
 
 <!--<template>-->

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>
@@ -96,7 +95,7 @@
         <template slot-scope="scope">
           <div>
             <template v-if="scope.row.status === 0">
-              启动
+              启用
             </template>
             <template v-else-if="scope.row.status === 1">
               禁用
@@ -210,6 +209,9 @@ export default {
       rules: {
         tempId: [
           { required: true, message: "关联id不能为空", trigger: "change" }
+        ],
+        roleName:[
+          { required: true, message: "规则名称不能为空", trigger: "change" }
         ]
       }
     };

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

@@ -2,14 +2,6 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上级规则" prop="roleId">
-<!--        <el-input-->
-<!--          v-model="queryParams.roleId"-->
-<!--          placeholder="请输入导入规则ID"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-
         <el-select v-model="queryParams.roleId" filterable placeholder="请选择关联项" >
           <el-option
             v-for="option in options1"
@@ -32,11 +24,10 @@
         <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 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"
@@ -136,9 +127,6 @@
             <template v-else-if="scope.row.status === 1">
               禁用
             </template>
-            <template v-else-if="scope.row.status === 2">
-              删除
-            </template>
           </div>
         </template>
       </el-table-column>
@@ -183,21 +171,39 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="规则名称" prop="detailName">-->
-<!--          <el-input v-model="form.detailName" placeholder="请输入规则名称" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="模板表行坐标" prop="detailMH">
+        <el-form-item label="转换数据" prop="detailYS">
+          <el-radio-group v-model="form.detailYS">
+            <el-radio :label="1" @change="showTemplate = true; showImport = false; showLie= false">单元格转换</el-radio>
+            <el-radio :label="2" @change="showTemplate = false; showImport = true; showLie= false">行转换</el-radio>
+            <el-radio :label="3" @change="showTemplate = false; showImport = false; showLie= true">列转换</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showTemplate">
           <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
         </el-form-item>
-        <el-form-item label="模板表列坐标" prop="detailML">
+        <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">
+        <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">
+        <el-form-item label="导入表列坐标" prop="detailYL" v-if="showTemplate">
           <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
         </el-form-item>
+
+        <el-form-item label="模板表行坐标" prop="detailMH" v-if="showImport">
+          <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="模板表列长度" prop="detailML" v-if="showImport">
+          <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="导入表行坐标" prop="detailYH" v-if="showImport">
+          <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+        <el-form-item label="导入表列长度" prop="detailYL" v-if="showImport">
+          <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
+        </el-form-item>
+
         <el-form-item label="状态">
           <el-select v-model="form.status">
             <el-option label="启用" :value="0"></el-option>
@@ -205,10 +211,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="运算方法" prop="convertStatus">
-<!--          <el-select v-model="form.convertStatus">-->
-<!--            <el-option label="启用物料转换" :value="0"></el-option>-->
-<!--            <el-option label="禁用物料转换" :value="1"></el-option>-->
-<!--          </el-select>-->
           <el-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >
             <el-option
               v-for="option in options2"
@@ -282,6 +284,9 @@ export default {
       // 表单参数
       form: {
       },
+      showTemplate: false, // 控制单元格的显示与隐藏
+      showImport: false, // 控制行转换的显示与隐藏
+      showLie: false, // 控制列转换的显示与隐藏
       // 表单校验
       rules: {
         roleId:[