Skip to content

K
klck
Commit fe8277ec authored by lenovo's avatar lenovo
Browse files
Options

通用规则

parent a9907806
Hide whitespace changes
Inline Side-by-side
Showing with 304 additions and 147 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesConvertrole.java
View file @ fe8277ec
...@@ -39,25 +39,25 @@ public class ActSuppliesConvertrole extends BaseEntity ...@@ -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 = "规则名称") @Excel(name = "规则名称")
...@@ -125,76 +125,76 @@ public class ActSuppliesConvertrole extends BaseEntity ...@@ -125,76 +125,76 @@ public class ActSuppliesConvertrole extends BaseEntity
return status; return status;
} }
public Long[] getZe() { public String[] getDetailZE() {
return ze; return detailZE;
} }
public void setZe(Long[] ze) { public void setDetailZE(String[] detailZE) {
this.ze = ze; this.detailZE = detailZE;
} }
public Long[] getCe() { public String[] getDetailCE() {
return ce; return detailCE;
} }
public void setCe(Long[] ce) { public void setDetailCE(String[] detailCE) {
this.ce = ce; this.detailCE = detailCE;
} }
public Long[] getRe() { public String[] getDetailRE() {
return re; return detailRE;
} }
public void setRe(Long[] re) { public void setDetailRE(String[] detailRE) {
this.re = re; this.detailRE = detailRE;
} }
public Long[] getLe() { public String[] getDetailLE() {
return le; return detailLE;
} }
public void setLe(Long[] le) { public void setDetailLE(String[] detailLE) {
this.le = le; this.detailLE = detailLE;
} }
public Long[] getZt() { public String[] getDetailZT() {
return zt; return detailZT;
} }
public void setZt(Long[] zt) { public void setDetailZT(String[] detailZT) {
this.zt = zt; this.detailZT = detailZT;
} }
public Long[] getCt() { public String[] getDetailCT() {
return ct; return detailCT;
} }
public void setCt(Long[] ct) { public void setDetailCT(String[] detailCT) {
this.ct = ct; this.detailCT = detailCT;
} }
public Long[] getRt() { public String[] getDetailRT() {
return rt; return detailRT;
} }
public void setRt(Long[] rt) { public void setDetailRT(String[] detailRT) {
this.rt = rt; this.detailRT = detailRT;
} }
public Long[] getLt() { public String[] getDetailLT() {
return lt; return detailLT;
} }
public void setLt(Long[] lt) { public void setDetailLT(String[] detailLT) {
this.lt = lt; this.detailLT = detailLT;
} }
public Long[] getYs() { public String[] getDetailYS() {
return ys; return detailYS;
} }
public void setYs(Long[] ys) { public void setDetailYS(String[] detailYS) {
this.ys = ys; this.detailYS = detailYS;
} }
@Override @Override
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/MyListItem.java
View file @ fe8277ec
...@@ -2,14 +2,14 @@ package com.ruoyi.system.domain; ...@@ -2,14 +2,14 @@ package com.ruoyi.system.domain;
public class MyListItem { public class MyListItem {
private Long ys; private Long ys;
private Long ze; // private Long ze;
private Long re; // private Long re;
private Long ce; // private Long ce;
private Long le; // private Long le;
private Long zt; // private Long zt;
private Long rt; // private Long rt;
private Long ct; // private Long ct;
private Long lt; // private Long lt;
// 构造函数 // 构造函数
public MyListItem() { public MyListItem() {
...@@ -23,69 +23,69 @@ public class MyListItem { ...@@ -23,69 +23,69 @@ public class MyListItem {
this.ys = ys; this.ys = ys;
} }
public Long getZe() { // public Long getZe() {
return ze; // return ze;
} // }
//
public void setZe(Long ze) { // public void setZe(Long ze) {
this.ze = ze; // this.ze = ze;
} // }
//
public Long getRe() { // public Long getRe() {
return re; // return re;
} // }
//
public void setRe(Long re) { // public void setRe(Long re) {
this.re = re; // this.re = re;
} // }
//
public Long getCe() { // public Long getCe() {
return ce; // return ce;
} // }
//
public void setCe(Long ce) { // public void setCe(Long ce) {
this.ce = ce; // this.ce = ce;
} // }
//
public Long getLe() { // public Long getLe() {
return le; // return le;
} // }
//
public void setLe(Long le) { // public void setLe(Long le) {
this.le = le; // this.le = le;
} // }
//
public Long getZt() { // public Long getZt() {
return zt; // return zt;
} // }
//
public void setZt(Long zt) { // public void setZt(Long zt) {
this.zt = zt; // this.zt = zt;
} // }
//
public Long getRt() { // public Long getRt() {
return rt; // return rt;
} // }
//
public void setRt(Long rt) { // public void setRt(Long rt) {
this.rt = rt; // this.rt = rt;
} // }
//
public Long getCt() { // public Long getCt() {
return ct; // return ct;
} // }
//
public void setCt(Long ct) { // public void setCt(Long ct) {
this.ct = ct; // this.ct = ct;
} // }
//
public Long getLt() { // public Long getLt() {
return lt; // return lt;
} // }
//
public void setLt(Long lt) { // public void setLt(Long lt) {
this.lt = lt; // this.lt = lt;
} // }
// // Getters 和 Setters // // Getters 和 Setters
// public String getYs() { // public String getYs() {
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesConvertroleServiceImpl.java
View file @ fe8277ec
...@@ -84,9 +84,9 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol ...@@ -84,9 +84,9 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
List<String> filteredList = new ArrayList<>(); 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 ...@@ -117,9 +117,9 @@ public class ActSuppliesConvertroleServiceImpl implements IActSuppliesConvertrol
List<String> filteredList = new ArrayList<>(); 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
View file @ fe8277ec
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -111,34 +111,115 @@ ...@@ -111,34 +111,115 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改通用规则对话框 --> <!-- &lt;!&ndash; 添加或修改通用规则对话框 &ndash;&gt;-->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <!-- <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 ref="form" :model="form" :rules="rules" label-width="80px">-->
<el-form-item label="模板id" prop="tempId"> <!-- <el-form-item label="模板id" prop="tempId">-->
<el-input v-model="form.tempId" placeholder="请输入模板id" /> <!-- <el-input v-model="form.tempId" placeholder="请输入模板id" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="规则名称" prop="name"> <!-- <el-form-item label="规则名称" prop="name">-->
<el-input v-model="form.name" placeholder="请输入规则名称" /> <!-- <el-input v-model="form.name" placeholder="请输入规则名称" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="规则内容"> <!-- <el-form-item label="规则内容">-->
<editor v-model="form.content" :min-height="192"/> <!-- <editor v-model="form.content" :min-height="192"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="状态"> <!-- <el-form-item label="状态">-->
<el-radio-group v-model="form.status"> <!-- <el-radio-group v-model="form.status">-->
<el-radio label="1">请选择字典生成</el-radio> <!-- <el-radio label="1">请选择字典生成</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<div slot="footer" class="dialog-footer"> <!-- <div slot="footer" class="dialog-footer">-->
<el-button type="primary" @click="submitForm">确 定</el-button> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<el-button @click="cancel">取 消</el-button> <!-- <el-button @click="cancel">取 消</el-button>-->
</div> <!-- </div>-->
</el-dialog> <!-- </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="所属模板" 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="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-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="导入表行坐标" 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>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<style>
.form-item-inline {
display: inline-block;
margin-right: 20px;
}
</style>
<script> <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'; import Editor from '@/components/Editor';
export default { export default {
...@@ -177,15 +258,75 @@ export default { ...@@ -177,15 +258,75 @@ export default {
}, },
// 表单参数 // 表单参数
form: {}, 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: { rules: {
} }
}; };
}, },
created() { created() {
this.getList(); this.getList();
listTemp().then(response=>{
this.options3=response.rows;
})
}, },
methods: { 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() { getList() {
this.loading = true; this.loading = true;
...@@ -249,7 +390,23 @@ export default { ...@@ -249,7 +390,23 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => {
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 (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateConvert(this.form).then(response => { updateConvert(this.form).then(response => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment