通用规则

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

@@ -39,25 +39,25 @@ public class ActSuppliesConvertrole extends BaseEntity
     }
 
     /** 导入表行/列/单元格选择 */
-    private Long[] ze;
+    private String[] detailZE;
     /** 导入表列坐标 */
-    private Long[] ce;
+    private String[] detailCE;
     /** 导入表行坐标 */
-    private Long[] re;
+    private String[] detailRE;
     /** 导入表单元格长度 */
-    private Long[] le;
+    private String[] detailLE;
 
     /** 模板表行/列/单元格选择*/
-    private Long[] zt;
+    private String[] detailZT;
     /** 模板表列坐标 */
-    private Long[] ct;
+    private String[] detailCT;
     /** 模板表行坐标 */
-    private Long[] rt;
+    private String[] detailRT;
     /** 模板表单元格长度 */
-    private Long[] lt;
+    private String[] detailLT;
 
     /** 运算方法 */
-    private Long[] ys;
+    private String[] detailYS;
 
     /** 规则名称 */
     @Excel(name = "规则名称")
@@ -125,76 +125,76 @@ public class ActSuppliesConvertrole extends BaseEntity
         return status;
     }
 
-    public Long[] getZe() {
-        return ze;
+    public String[] getDetailZE() {
+        return detailZE;
     }
 
-    public void setZe(Long[] ze) {
-        this.ze = ze;
+    public void setDetailZE(String[] detailZE) {
+        this.detailZE = detailZE;
     }
 
-    public Long[] getCe() {
-        return ce;
+    public String[] getDetailCE() {
+        return detailCE;
     }
 
-    public void setCe(Long[] ce) {
-        this.ce = ce;
+    public void setDetailCE(String[] detailCE) {
+        this.detailCE = detailCE;
     }
 
-    public Long[] getRe() {
-        return re;
+    public String[] getDetailRE() {
+        return detailRE;
     }
 
-    public void setRe(Long[] re) {
-        this.re = re;
+    public void setDetailRE(String[] detailRE) {
+        this.detailRE = detailRE;
     }
 
-    public Long[] getLe() {
-        return le;
+    public String[] getDetailLE() {
+        return detailLE;
     }
 
-    public void setLe(Long[] le) {
-        this.le = le;
+    public void setDetailLE(String[] detailLE) {
+        this.detailLE = detailLE;
     }
 
-    public Long[] getZt() {
-        return zt;
+    public String[] getDetailZT() {
+        return detailZT;
     }
 
-    public void setZt(Long[] zt) {
-        this.zt = zt;
+    public void setDetailZT(String[] detailZT) {
+        this.detailZT = detailZT;
     }
 
-    public Long[] getCt() {
-        return ct;
+    public String[] getDetailCT() {
+        return detailCT;
     }
 
-    public void setCt(Long[] ct) {
-        this.ct = ct;
+    public void setDetailCT(String[] detailCT) {
+        this.detailCT = detailCT;
     }
 
-    public Long[] getRt() {
-        return rt;
+    public String[] getDetailRT() {
+        return detailRT;
     }
 
-    public void setRt(Long[] rt) {
-        this.rt = rt;
+    public void setDetailRT(String[] detailRT) {
+        this.detailRT = detailRT;
     }
 
-    public Long[] getLt() {
-        return lt;
+    public String[] getDetailLT() {
+        return detailLT;
     }
 
-    public void setLt(Long[] lt) {
-        this.lt = lt;
+    public void setDetailLT(String[] detailLT) {
+        this.detailLT = detailLT;
     }
 
-    public Long[] getYs() {
-        return ys;
+    public String[] getDetailYS() {
+        return detailYS;
     }
 
-    public void setYs(Long[] ys) {
-        this.ys = ys;
+    public void setDetailYS(String[] detailYS) {
+        this.detailYS = detailYS;
     }
 
     @Override

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

@@ -2,14 +2,14 @@ package com.ruoyi.system.domain;
 
 public class MyListItem {
     private Long ys;
-    private Long ze;
-    private Long re;
-    private Long ce;
-    private Long le;
-    private Long zt;
-    private Long rt;
-    private Long ct;
-    private Long lt;
+//    private Long ze;
+//    private Long re;
+//    private Long ce;
+//    private Long le;
+//    private Long zt;
+//    private Long rt;
+//    private Long ct;
+//    private Long lt;
 
     // 构造函数
     public MyListItem() {
@@ -23,69 +23,69 @@ public class MyListItem {
         this.ys = ys;
     }
 
-    public Long getZe() {
-        return ze;
-    }
-
-    public void setZe(Long ze) {
-        this.ze = ze;
-    }
-
-    public Long getRe() {
-        return re;
-    }
-
-    public void setRe(Long re) {
-        this.re = re;
-    }
-
-    public Long getCe() {
-        return ce;
-    }
-
-    public void setCe(Long ce) {
-        this.ce = ce;
-    }
-
-    public Long getLe() {
-        return le;
-    }
-
-    public void setLe(Long le) {
-        this.le = le;
-    }
-
-    public Long getZt() {
-        return zt;
-    }
-
-    public void setZt(Long zt) {
-        this.zt = zt;
-    }
-
-    public Long getRt() {
-        return rt;
-    }
-
-    public void setRt(Long rt) {
-        this.rt = rt;
-    }
-
-    public Long getCt() {
-        return ct;
-    }
-
-    public void setCt(Long ct) {
-        this.ct = ct;
-    }
-
-    public Long getLt() {
-        return lt;
-    }
-
-    public void setLt(Long lt) {
-        this.lt = lt;
-    }
+//    public Long getZe() {
+//        return ze;
+//    }
+//
+//    public void setZe(Long ze) {
+//        this.ze = ze;
+//    }
+//
+//    public Long getRe() {
+//        return re;
+//    }
+//
+//    public void setRe(Long re) {
+//        this.re = re;
+//    }
+//
+//    public Long getCe() {
+//        return ce;
+//    }
+//
+//    public void setCe(Long ce) {
+//        this.ce = ce;
+//    }
+//
+//    public Long getLe() {
+//        return le;
+//    }
+//
+//    public void setLe(Long le) {
+//        this.le = le;
+//    }
+//
+//    public Long getZt() {
+//        return zt;
+//    }
+//
+//    public void setZt(Long zt) {
+//        this.zt = zt;
+//    }
+//
+//    public Long getRt() {
+//        return rt;
+//    }
+//
+//    public void setRt(Long rt) {
+//        this.rt = rt;
+//    }
+//
+//    public Long getCt() {
+//        return ct;
+//    }
+//
+//    public void setCt(Long ct) {
+//        this.ct = ct;
+//    }
+//
+//    public Long getLt() {
+//        return lt;
+//    }
+//
+//    public void setLt(Long lt) {
+//        this.lt = lt;
+//    }
 
     //    // Getters 和 Setters
 //    public String getYs() {

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

@@ -84,9 +84,9 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
         List<String> filteredList = new ArrayList<>();
 
 
-        for (int i =0 ;i<actSuppliesConvertrole.getList().size(); i++){
+        for (int i =0 ;i<actSuppliesConvertrole.getDetailYS().length; i++){
 
-            filteredList.add("{\"ce\":\""+(actSuppliesConvertrole.getList().get(i).getCe()-1)+"\",\"re\":\""+(actSuppliesConvertrole.getList().get(i).getRe()-1)+"\",\"le\":\""+(actSuppliesConvertrole.getList().get(i).getLe())+"\",\"ze\":\""+(actSuppliesConvertrole.getList().get(i).getZe())+"\",\"ct\":\""+(actSuppliesConvertrole.getList().get(i).getCt()-1)+"\",\"rt\":\""+(actSuppliesConvertrole.getList().get(i).getRt()-1)+"\",\"lt\":\""+(actSuppliesConvertrole.getList().get(i).getLt())+"\",\"zt\":\""+(actSuppliesConvertrole.getList().get(i).getZt())+"\",\"ys\":\""+(actSuppliesConvertrole.getList().get(i).getYs())+"\"}") ;
+            filteredList.add("{\"ce\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailCE()[i])-1)+"\",\"re\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailRE()[i])-1)+"\",\"le\":\""+(actSuppliesConvertrole.getDetailLE()[i])+"\",\"ze\":\""+(actSuppliesConvertrole.getDetailZE()[i])+"\",\"ct\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailCT()[i])-1)+"\",\"rt\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailRT()[i])-1)+"\",\"lt\":\""+(actSuppliesConvertrole.getDetailLT()[i])+"\",\"zt\":\""+(actSuppliesConvertrole.getDetailZT()[i])+"\",\"ys\":\""+(actSuppliesConvertrole.getDetailYS()[i])+"\"}") ;
 
         }
 
@@ -117,9 +117,9 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
         List<String> filteredList = new ArrayList<>();
 
 
-        for (int i =0 ;i<actSuppliesConvertrole.getList().size(); i++){
+        for (int i =0 ;i<actSuppliesConvertrole.getDetailYS().length; i++){
 
-            filteredList.add("{\"ce\":\""+(actSuppliesConvertrole.getList().get(i).getCe()-1)+"\",\"re\":\""+(actSuppliesConvertrole.getList().get(i).getRe()-1)+"\",\"le\":\""+(actSuppliesConvertrole.getList().get(i).getLe())+"\",\"ze\":\""+(actSuppliesConvertrole.getList().get(i).getZe())+"\",\"ct\":\""+(actSuppliesConvertrole.getList().get(i).getCt()-1)+"\",\"rt\":\""+(actSuppliesConvertrole.getList().get(i).getRt()-1)+"\",\"lt\":\""+(actSuppliesConvertrole.getList().get(i).getLt())+"\",\"zt\":\""+(actSuppliesConvertrole.getList().get(i).getZt())+"\",\"ys\":\""+(actSuppliesConvertrole.getList().get(i).getYs())+"\"}") ;
+            filteredList.add("{\"ce\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailCE()[i])-1)+"\",\"re\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailRE()[i])-1)+"\",\"le\":\""+(actSuppliesConvertrole.getDetailLE()[i])+"\",\"ze\":\""+(actSuppliesConvertrole.getDetailZE()[i])+"\",\"ct\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailCT()[i])-1)+"\",\"rt\":\""+(Integer.parseInt(actSuppliesConvertrole.getDetailRT()[i])-1)+"\",\"lt\":\""+(actSuppliesConvertrole.getDetailLT()[i])+"\",\"zt\":\""+(actSuppliesConvertrole.getDetailZT()[i])+"\",\"ys\":\""+(actSuppliesConvertrole.getDetailYS()[i])+"\"}") ;
 
         }
 

ruoyi-ui/src/views/ActSuppliesConvert/convert/index.vue

@@ -111,23 +111,97 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改通用规则对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+<!--    &lt;!&ndash; 添加或修改通用规则对话框 &ndash;&gt;-->
+<!--    <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-form-item>-->
+<!--        <el-form-item label="规则名称" prop="name">-->
+<!--          <el-input v-model="form.name" placeholder="请输入规则名称" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="规则内容">-->
+<!--          <editor v-model="form.content" :min-height="192"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="状态">-->
+<!--          <el-radio-group v-model="form.status">-->
+<!--            <el-radio label="1">请选择字典生成</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
+
+      <el-dialog :title="title" :visible.sync="open" width="1300px" 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-form-item label="所属模板" prop="roleId">
+                  <el-select v-model="form.tempId" filterable placeholder="请选择关联项" >
+                      <el-option
+                          v-for="option in options3"
+                          :key="option.templateName"
+                          :label="option.templateName"
+                          :value="option.id"
+                      ></el-option>
+                  </el-select>
               </el-form-item>
-        <el-form-item label="规则名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入规则名称" />
+              <el-form-item label="规则名称" prop="detailName">
+                  <el-input v-model="form.name" placeholder="请输入规则名称" maxlength="36" show-word-limit/>
+              </el-form-item>
+
+              <el-row>
+                  <el-col :span="16">
+                      <el-form-item>
+                          <el-button type="primary" @click="addInputs">添加规则</el-button>
                       </el-form-item>
-        <el-form-item label="规则内容">
-          <editor v-model="form.content" :min-height="192"/>
+                  </el-col>
+              </el-row>
+              <!-- 生成输入框 -->
+              <div v-for="index in instea" :key="index" v-if="">
+
+                  <el-form-item label="导入表行/列/单元格选择" prop="detailMH" class="form-item-inline">
+                      <el-input-number size="medium" v-model="ZE[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+                  <el-form-item label="导入表列坐标" prop="detailML" class="form-item-inline">
+                      <el-input-number size="medium" v-model="CE[index-1]" :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-form-item label="导入表行坐标" prop="detailYH" class="form-item-inline">
+                      <el-input-number size="medium" v-model="RE[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+                  <el-form-item label="导入表单元格长度" prop="detailYL" class="form-item-inline">
+                      <el-input-number size="medium" v-model="LE[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+
+                  <el-form-item label="模板表行坐标" prop="detailMH" class="form-item-inline">
+                      <el-input-number size="medium" v-model="ZT[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
+                  <el-form-item label="模板表列坐标" prop="detailML" class="form-item-inline">
+                      <el-input-number size="medium" v-model="CT[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+                  <el-form-item label="导入表行坐标" prop="detailYH" class="form-item-inline">
+                      <el-input-number size="medium" v-model="RT[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+                  <el-form-item label="导入表列坐标" prop="detailYL" class="form-item-inline">
+                      <el-input-number size="medium" v-model="LT[index-1]" :min="1" :step="1">1</el-input-number>
+                  </el-form-item>
+
+                  <el-form-item label="运算方法" prop="convertStatus">
+                      <el-select v-model="YS[index-1]" filterable placeholder="请选择运算方法" >
+                          <el-option
+                              v-for="option in options2"
+                              :key="option.operationName"
+                              :label="option.operationName"
+                              :value="option.id"
+                          ></el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item style="display: inline-block;">
+                      <el-button type="danger" icon="el-icon-delete" size="small" @click="removeInputs(index)">删除</el-button>
+                  </el-form-item>
+
+              </div>
           </el-form>
           <div slot="footer" class="dialog-footer">
               <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -137,8 +211,15 @@
   </div>
 </template>
 
+<style>
+.form-item-inline {
+    display: inline-block;
+    margin-right: 20px;
+}
+</style>
+
 <script>
-import { listConvert, getConvert, delConvert, addConvert, updateConvert, exportConvert } from "@/api/ActSuppliesConvert/convert";
+import { listConvert, getConvert, delConvert, addConvert, updateConvert, exportConvert,listTemp } from "@/api/ActSuppliesConvert/convert";
 import Editor from '@/components/Editor';
 
 export default {
@@ -177,6 +258,25 @@ export default {
       },
       // 表单参数
       form: {},
+
+        ZE:[],
+        CE:[],
+        RE:[],
+        LE:[],
+
+        ZT:[],
+        CT:[],
+        RT:[],
+        LT:[],
+
+        YS:[],
+
+        instea:0,
+
+        //运算方法/0无运算方法/1加法/2减法/3乘法/4除法/5平均值/6最大值/7最小值
+        options2:[{id:0,operationName:"无运算方法"},{id:1,operationName:"加法运算"},{id:2,operationName:"减法运算"},{id:3,operationName:"乘法运算"},{id:4,operationName:"除法运算"},{id:5,operationName:"平均值"},{id:6,operationName:"最大值"},{id:7,operationName:"最小值"}],
+        options3:{},
+
         // 表单校验
       rules: {
       }
@@ -184,8 +284,49 @@ export default {
   },
   created() {
     this.getList();
+      listTemp().then(response=>{
+
+          this.options3=response.rows;
+
+      })
   },
   methods: {
+
+      removeInputs(index){
+
+          this.ZE.splice(index - 1, 1);
+          this.CE.splice(index - 1, 1);
+          this.RE.splice(index - 1, 1);
+          this.LE.splice(index - 1, 1);
+
+          this.ZT.splice(index - 1, 1);
+          this.CT.splice(index - 1, 1);
+          this.RT.splice(index - 1, 1);
+          this.LT.splice(index - 1, 1);
+
+          this.YS.splice(index - 1, 1);
+
+          this.instea = this.instea-1;
+
+      },
+
+      addInputs() {
+
+          this.instea +=1;
+          this.ZE[this.instea-1]=1;
+          this.CE[this.instea-1]=1;
+          this.RE[this.instea-1]=1;
+          this.LE[this.instea-1]=1;
+
+          this.ZT[this.instea-1]=1;
+          this.CT[this.instea-1]=1;
+          this.RT[this.instea-1]=1;
+          this.LT[this.instea-1]=1;
+
+          this.YS[this.instea-1]=1;
+
+      },
+
     /** 查询通用规则列表 */
     getList() {
       this.loading = true;
@@ -249,6 +390,22 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+
+
+        this.form.detailZE = this.ZE;
+        this.form.detailCE = this.CE;
+        this.form.detailRE = this.RE;
+        this.form.detailLE = this.LE;
+
+        this.form.detailZT = this.ZT;
+        this.form.detailCT = this.CT;
+        this.form.detailRT = this.RT;
+        this.form.detailLT = this.LT;
+
+        this.form.detailYS = this.YS;
+
+        this.form.status = 0;
+
         this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {