Skip to content

K
klck
Commit 6bffe066 authored by xiangjiaojunxp's avatar xiangjiaojunxp
Browse files
Options

不可传

parents 576bb61d 6b1f26c8
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 127 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
View file @ 6bffe066
...@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -115,7 +116,7 @@ public class ActSuppliesController extends BaseController ...@@ -115,7 +116,7 @@ public class ActSuppliesController extends BaseController
{ {
List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList()); List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
System.out.println(find.toString());
for (long num : ids){ for (long num : ids){
if (find.contains((int)num)){ if (find.contains((int)num)){
return AjaxResult.success("删除失败","操作失败"); return AjaxResult.success("删除失败","操作失败");
...@@ -143,9 +144,21 @@ public class ActSuppliesController extends BaseController ...@@ -143,9 +144,21 @@ public class ActSuppliesController extends BaseController
@GetMapping("/disable/{id}") @GetMapping("/disable/{id}")
public AjaxResult setDisable(@PathVariable("id") Long id) public AjaxResult setDisable(@PathVariable("id") Long id)
{ {
BigDecimal numBigDecimal = new BigDecimal(id);
Integer numberInt = numBigDecimal.intValue();
List<Integer> find = Stream.concat(actSuppliesService.findall().stream(),actSuppliesService.findAllId().stream()).collect(Collectors.toList());
if (find.contains(numberInt)){
return AjaxResult.success("删除失败","操作失败");
}
System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id); System.out.println("开始处理【禁用物料总分类管理】的请求，参数：{}"+ id);
actSuppliesService.setDisable(id); actSuppliesService.setDisable(id);
return AjaxResult.success();
return AjaxResult.success("200","修改成功");
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
View file @ 6bffe066
...@@ -26,10 +26,10 @@ public class ActSuppliesRoleDetail extends BaseEntity ...@@ -26,10 +26,10 @@ public class ActSuppliesRoleDetail extends BaseEntity
private String detailName; private String detailName;
/** 导入数据行列*/ /** 导入数据行列*/
private String detailMH; private String[] detailMH;
private String detailML; private String[] detailML;
private String detailYH; private String[] detailYH;
private String detailYL; private String[] detailYL;
private String detailYS; private String detailYS;
/**所属规则*/ /**所属规则*/
@Excel(name = "所属规则") @Excel(name = "所属规则")
...@@ -81,35 +81,35 @@ public class ActSuppliesRoleDetail extends BaseEntity ...@@ -81,35 +81,35 @@ public class ActSuppliesRoleDetail extends BaseEntity
this.convertStatus = convertStatus; this.convertStatus = convertStatus;
} }
public String getDetailMH() { public String[] getDetailMH() {
return detailMH; return detailMH;
} }
public void setDetailMH(String detailMH) { public void setDetailMH(String[] detailMH) {
this.detailMH = detailMH; this.detailMH = detailMH;
} }
public String getDetailML() { public String[] getDetailML() {
return detailML; return detailML;
} }
public void setDetailML(String detailML) { public void setDetailML(String[] detailML) {
this.detailML = detailML; this.detailML = detailML;
} }
public String getDetailYH() { public String[] getDetailYH() {
return detailYH; return detailYH;
} }
public void setDetailYH(String detailYH) { public void setDetailYH(String[] detailYH) {
this.detailYH = detailYH; this.detailYH = detailYH;
} }
public String getDetailYL() { public String[] getDetailYL() {
return detailYL; return detailYL;
} }
public void setDetailYL(String detailYL) { public void setDetailYL(String[] detailYL) {
this.detailYL = detailYL; this.detailYL = detailYL;
} }
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java
View file @ 6bffe066
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -59,13 +60,27 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS ...@@ -59,13 +60,27 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
public int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail) public int insertActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
{ {
String content = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ; //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
// List<String> filteredList = new ArrayList<>();
String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
actSuppliesRoleDetail.setDetailName(content);
actSuppliesRoleDetail.setDetailContent(content1); for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
}
String content = String.join(",",filteredList);
String content2 = "["+content+"]";
// String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
actSuppliesRoleDetail.setDetailContent(content2);
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesRoleDetail.setCreateBy(user.getUserName()); actSuppliesRoleDetail.setCreateBy(user.getUserName());
actSuppliesRoleDetail.setCreateTime(DateUtils.getNowDate()); actSuppliesRoleDetail.setCreateTime(DateUtils.getNowDate());
...@@ -83,12 +98,10 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS ...@@ -83,12 +98,10 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail) public int updateActSuppliesRoleDetail(ActSuppliesRoleDetail actSuppliesRoleDetail)
{ {
String content12 = "导入表中第"+actSuppliesRoleDetail.getDetailYH()+"行:第"+actSuppliesRoleDetail.getDetailYL()+"列的数据=>"+"模板表中第"+actSuppliesRoleDetail.getDetailMH()+"行:第"+actSuppliesRoleDetail.getDetailML()+"列" ;
//re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符 //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ; String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
actSuppliesRoleDetail.setDetailName(content12);
actSuppliesRoleDetail.setDetailContent(content1); actSuppliesRoleDetail.setDetailContent(content1);
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
actSuppliesRoleDetail.setUpdateBy(user.getUserName()); actSuppliesRoleDetail.setUpdateBy(user.getUserName());
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
View file @ 6bffe066
...@@ -8,11 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,11 +8,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id" />
<result property="detailName" column="detail_name" /> <result property="detailName" column="detail_name" />
<result property="detailMH" column="detail_m_h" /> <!-- <result property="detailMH" column="detail_m_h" />-->
<result property="detailML" column="detail_m_l" /> <!-- <result property="detailML" column="detail_m_l" />-->
<result property="detailYH" column="detail_y_h" /> <!-- <result property="detailYH" column="detail_y_h" />-->
<result property="detailYL" column="detail_y_l" /> <!-- <result property="detailYL" column="detail_y_l" />-->
<result property="detailContent" column="detail_content" /> <result property="detailContent" column="detail_content" />
<result property="detailYS" column="detail_y_s"/>
<result property="convertStatus" column="convert_status" /> <result property="convertStatus" column="convert_status" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
...@@ -76,10 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -76,10 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleId != null">role_id,</if> <if test="roleId != null">role_id,</if>
<if test="detailName != null">detail_name,</if> <if test="detailName != null">detail_name,</if>
<if test="detailMH != null">detail_m_h,</if> <!-- <if test="detailMH != null">detail_m_h,</if>-->
<if test="detailML != null">detail_m_l,</if> <!-- <if test="detailML != null">detail_m_l,</if>-->
<if test="detailYH != null">detail_y_h,</if> <!-- <if test="detailYH != null">detail_y_h,</if>-->
<if test="detailYL != null">detail_y_l,</if> <!-- <if test="detailYL != null">detail_y_l,</if>-->
<if test="detailYS != null">detail_y_s,</if> <if test="detailYS != null">detail_y_s,</if>
...@@ -96,10 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -96,10 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleId != null">#{roleId},</if> <if test="roleId != null">#{roleId},</if>
<if test="detailName != null">#{detailName},</if> <if test="detailName != null">#{detailName},</if>
<if test="detailMH != null">#{detailMH},</if> <!-- <if test="detailMH != null">#{detailMH},</if>-->
<if test="detailML != null">#{detailML},</if> <!-- <if test="detailML != null">#{detailML},</if>-->
<if test="detailYH != null">#{detailYH},</if> <!-- <if test="detailYH != null">#{detailYH},</if>-->
<if test="detailYL != null">#{detailYL},</if> <!-- <if test="detailYL != null">#{detailYL},</if>-->
<if test="detailYS != null">#{detailYS},</if> <if test="detailYS != null">#{detailYS},</if>
...@@ -122,10 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -122,10 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="detailContent != null">detail_content = #{detailContent},</if> <if test="detailContent != null">detail_content = #{detailContent},</if>
<if test="convertStatus != null">convert_status = #{convertStatus},</if> <if test="convertStatus != null">convert_status = #{convertStatus},</if>
<if test="detailMH != null">detail_m_h = #{detailMH},</if> <!-- <if test="detailMH != null">detail_m_h = #{detailMH},</if>-->
<if test="detailML != null">detail_m_l = #{detailML},</if> <!-- <if test="detailML != null">detail_m_l = #{detailML},</if>-->
<if test="detailYH != null">detail_y_h = #{detailYH},</if> <!-- <if test="detailYH != null">detail_y_h = #{detailYH},</if>-->
<if test="detailYL != null">detail_y_l = #{detailYL},</if> <!-- <if test="detailYL != null">detail_y_l = #{detailYL},</if>-->
<if test="detailYS != null">detail_y_s = #{detailYS},</if> <if test="detailYS != null">detail_y_s = #{detailYS},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
......
ruoyi-ui/src/views/system/supplies/index_template.vue
View file @ 6bffe066
...@@ -404,32 +404,36 @@ export default { ...@@ -404,32 +404,36 @@ export default {
this.open = true; this.open = true;
this.title = "修改Excel模板"; this.title = "修改Excel模板";
}); });
}
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
if (!this.form.templateName){ if (!this.form.templateName){
this.msgError("上传的文件不能为空！") this.msgError("上传的文件不能为空！")
}else { }else {
this.fileListName = []; this.fileListName = [];
this.$refs["form"].validate(valid => { if (!this.form.templateName) {
if (valid) { this.msgError("上传文件为空！！！")
if (this.form.id != null) { } else {
updateSuppliesTemplate(this.form).then(response => { this.$refs["form"].validate(valid => {
this.msgSuccess("修改成功"); if (valid) {
this.open = false; if (this.form.id != null) {
this.getList(); updateSuppliesTemplate(this.form).then(response => {
}); this.msgSuccess("修改成功");
} else { this.open = false;
addSuppliesTemplate(this.form).then(response => { this.getList();
this.msgSuccess("新增成功"); });
this.open = false; } else {
this.getList(); addSuppliesTemplate(this.form).then(response => {
}); this.msgSuccess("新增成功");
} this.open = false;
} this.getList();
}); });
}
}
});
}
} }
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
...@@ -507,7 +511,6 @@ export default { ...@@ -507,7 +511,6 @@ export default {
// this.download(response.msg); // this.download(response.msg);
// }) // })
// } // }
}
}; };
</script> </script>
......
ruoyi-ui/src/views/system/suppliesroledetail/index.vue
View file @ 6bffe066
...@@ -2,14 +2,6 @@ ...@@ -2,14 +2,6 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="上级规则" prop="roleId"> <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-select v-model="queryParams.roleId" filterable placeholder="请选择关联项" >
<el-option <el-option
v-for="option in options1" v-for="option in options1"
...@@ -30,12 +22,12 @@ ...@@ -30,12 +22,12 @@
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态"> <el-select v-model="queryParams.status" placeholder="请选择状态">
<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="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否物料转换" prop="convertStatus"> <el-form-item label="运算规则" prop="convertStatus">
<el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请选择状态"> <el-select v-model="queryParams.convertStatus" clearable filterable placeholder="请运算规则">
<el-option <el-option
v-for="option in options2" v-for="option in options2"
:key="option.operationName" :key="option.operationName"
...@@ -102,7 +94,7 @@ ...@@ -102,7 +94,7 @@
<el-table-column label="上级规则" align="center" prop="roleName" /> <el-table-column label="上级规则" align="center" prop="roleName" />
<el-table-column label="规则名称" align="center" prop="detailName" /> <el-table-column label="规则名称" align="center" prop="detailName" />
<el-table-column label="规则内容" align="center" prop="detailContent" /> <el-table-column label="规则内容" align="center" prop="detailContent" />
<el-table-column label="运算方法" align="center"> <el-table-column label="运算规则" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<template v-if="scope.row.convertStatus === 0"> <template v-if="scope.row.convertStatus === 0">
...@@ -169,7 +161,7 @@ ...@@ -169,7 +161,7 @@
/> />
<!-- 添加或修改规则详情对话框 --> <!-- 添加或修改规则详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="上级规则" prop="roleId"> <el-form-item label="上级规则" prop="roleId">
<el-select v-model="form.roleId" filterable placeholder="请选择关联项" > <el-select v-model="form.roleId" filterable placeholder="请选择关联项" >
...@@ -181,32 +173,10 @@ ...@@ -181,32 +173,10 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="规则名称" prop="detailName">--> <el-form-item label="规则名称" prop="detailName">
<!-- <el-input v-model="form.detailName" placeholder="请输入规则名称" />--> <el-input v-model="form.detailName" placeholder="请输入规则名称" />
<!-- </el-form-item>-->
<el-form-item label="模板表行坐标" prop="detailMH">
<el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>
</el-form-item>
<el-form-item label="模板表列坐标" prop="detailML">
<el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>
</el-form-item>
<el-form-item label="导入表行坐标" prop="detailYH">
<el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>
</el-form-item>
<el-form-item label="导入列行坐标" prop="detailYL">
<el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="form.status">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="运算方法" prop="convertStatus"> <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-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >
<el-option <el-option
v-for="option in options2" v-for="option in options2"
...@@ -216,6 +186,104 @@ ...@@ -216,6 +186,104 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="转换类型" prop="detailYS" v-if="form.convertStatus!==null">-->
<!-- <el-radio-group v-model="form.detailYS">-->
<!-- <el-radio :label="1" >单元格转换</el-radio>-->
<!-- <el-radio :label="2" >行转换</el-radio>-->
<!-- <el-radio :label="3" >列转换</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.detailYS!==null">-->
<!-- <el-button type="primary" @click="addInputs">添加规则</el-button>-->
<!-- </el-form-item>-->
<el-row>
<el-col :span="8">
<el-form-item label="转换类型" prop="detailYS">
<el-radio-group v-model="form.detailYS">
<el-radio :label="1">单元格转换</el-radio>
<el-radio :label="2">行转换</el-radio>
<el-radio :label="3">列转换</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item v-if="form.detailYS!==null">
<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="detailMH[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="detailML[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="detailYH[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="detailYL[index-1]" :min="1" :step="1">1</el-input-number>
</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-item label="模板表行坐标" prop="detailMH" v-if="showTemplate" class="form-item-inline">-->
<!-- <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="showTemplate" class="form-item-inline">-->
<!-- <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="showTemplate" class="form-item-inline">-->
<!-- <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="showTemplate" class="form-item-inline">-->
<!-- <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" class="form-item-inline">-->
<!-- <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" class="form-item-inline">-->
<!-- <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" class="form-item-inline">-->
<!-- <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" class="form-item-inline">-->
<!-- <el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="showLie" label="模板表行坐标" prop="detailMH" class="form-item-inline">-->
<!-- <el-input-number size="medium" v-model="form.detailMH" :min="1" :step="1">1</el-input-number>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="showLie" label="模板表列坐标" prop="detailML" class="form-item-inline">-->
<!-- <el-input-number size="medium" v-model="form.detailML" :min="1" :step="1">1</el-input-number>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="showLie" label="导入表行坐标" prop="detailYH" class="form-item-inline">-->
<!-- <el-input-number size="medium" v-model="form.detailYH" :min="1" :step="1">1</el-input-number>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="showLie" label="导入表列坐标" prop="detailYL" class="form-item-inline">-->
<!-- <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>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</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>
...@@ -225,6 +293,13 @@ ...@@ -225,6 +293,13 @@
</div> </div>
</template> </template>
<style>
.form-item-inline {
display: inline-block;
margin-right: 20px;
}
</style>
<script> <script>
import { import {
listSuppliesroledetail, listSuppliesroledetail,
...@@ -233,9 +308,9 @@ import { ...@@ -233,9 +308,9 @@ import {
addSuppliesroledetail, addSuppliesroledetail,
updateSuppliesroledetail, updateSuppliesroledetail,
exportSuppliesroledetail, exportSuppliesroledetail,
saveSid,
toggleEnable, toggleEnable,
toggleDisable, toggleDisable,
saveSid,
saveOperation, saveOperation,
} from "@/api/system/suppliesroledetail"; } from "@/api/system/suppliesroledetail";
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
...@@ -269,6 +344,8 @@ export default { ...@@ -269,6 +344,8 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
inputCount:0,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -282,25 +359,36 @@ export default { ...@@ -282,25 +359,36 @@ export default {
// 表单参数 // 表单参数
form: { form: {
}, },
detailMH: [],
detailML: [],
detailYH: [],
detailYL: [],
instea:0,
showTemplate: false, // 控制单元格的显示与隐藏
showImport: false, // 控制行转换的显示与隐藏
showLie: false, // 控制列转换的显示与隐藏
// 表单校验 // 表单校验
rules: { rules: {
roleId:[ roleId:[
{required: true, message: '关联id不能为空', trigger: 'change'}, {required: true, message: '关联id不能为空', trigger: 'change'},
], ],
detailMH:[ // detailMH:[
{required: true, message: '模板表行坐标不能为空', trigger: 'change'}, // {required: true, message: '模板表行坐标不能为空', trigger: 'change'},
], // ],
detailML:[ // detailML:[
{required: true, message: '模板表列坐标不能为空', trigger: 'change'}, // {required: true, message: '模板表列坐标不能为空', trigger: 'change'},
], // ],
detailYH:[ // detailYH:[
{required: true, message: '导入表行坐标不能为空', trigger: 'change'}, // {required: true, message: '导入表行坐标不能为空', trigger: 'change'},
], // ],
detailYL:[ // detailYL:[
{required: true, message: '导入表列坐标不能为空', trigger: 'change'}, // {required: true, message: '导入表列坐标不能为空', trigger: 'change'},
], // ],
convertStatus:[ convertStatus:[
{required: true, message: '是否物料转换不能为空', trigger: 'change'}, {required: true, message: '是否物料转换不能为空', trigger: 'change'},
],
detailName:[
{required: true, message: '是否物料转换不能为空', trigger: 'change'},
] ]
} }
}; };
...@@ -308,39 +396,48 @@ export default { ...@@ -308,39 +396,48 @@ export default {
created() { created() {
this.getList(); this.getList();
this.getnameid(); this.getnameid();
this.form.detailMH=1;
this.form.detailML=1;
this.form.detailYH=1;
this.form.detailYL=1;
}, },
methods: { methods: {
/**启用 */ removeInputs(index){
this.detailMH.splice(index - 1, 1);
this.detailML.splice(index - 1, 1);
this.detailYH.splice(index - 1, 1);
this.detailYL.splice(index - 1, 1);
this.instea = this.instea-1;
},
addInputs() {
this.instea +=1;
this.detailMH[this.instea-1]=1;
this.detailML[this.instea-1]=1;
this.detailYH[this.instea-1]=1;
this.detailYL[this.instea-1]=1;
},
toggleEnable(suppliesroledetail){ toggleEnable(suppliesroledetail){
console.log('你点击了【' + suppliesroledetail.s+'】的开关控件，当前开关值:' + suppliesroledetail.status); console.log('你点击了【' + suppliesroledetail.s+'】的开关控件，当前开关值:' + suppliesroledetail.status);
let enableText=['启用','禁用']; let enableText=['启用','禁用'];
if(suppliesroledetail.status == 0) { if(suppliesroledetail.status === 0) {
toggleEnable(suppliesroledetail.id).then((response) =>{ toggleEnable(suppliesroledetail.id).then((response) =>{
if(response.code == 200){ if(response.code === 200){
let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !'; let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
this.$message({ this.$message({message: message,type:'success'});
message: message,
type:'success'
});
}else { }else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}); });
}else { }else {
toggleDisable(suppliesroledetail.id).then((response) =>{ toggleDisable(suppliesroledetail.id).then((response) =>{
if(response.code == 200){ if(response.code === 200){
let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !'; let message = '操作成功，已经将【' + suppliesroledetail.roleName +'】的状态改为【'+ enableText[suppliesroledetail.status] +'】 !';
this.$message({ this.$message({message: message, type:'success'});
message: message,
type:'error'
});
}else { }else {
this.$message.error(response.message); this.$message.error(response.message);
} }
...@@ -416,6 +513,11 @@ export default { ...@@ -416,6 +513,11 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.instea=0;
this.showTemplate = false;
this.showImport = false;
this.showLie = false;
this.getnameid();
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加规则详情"; this.title = "添加规则详情";
...@@ -432,6 +534,13 @@ export default { ...@@ -432,6 +534,13 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.detailMH = this.detailMH;
this.form.detailML = this.detailML;
this.form.detailYH = this.detailYH;
this.form.detailYL = this.detailYL;
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
...@@ -453,7 +562,7 @@ export default { ...@@ -453,7 +562,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm('是否确认删除规则详情编号为"' + ids + '"的数据项?', "警告", { this.$confirm('是否确认删除规则详情编号为"' + row.detailName + '"的数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
......
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