重置按钮/规则详情缺陷修复

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

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    </resultMap>-->
 
     <sql id="selectActSuppliesRoleDetailVo">
-        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l, detail_content,convert_status, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
+        select id, role_id, detail_name, detail_m_h, detail_m_l, detail_y_h, detail_y_l,detail_y_s, detail_content,convert_status, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
     </sql>
 
     <select id="saveSid" parameterType="com.ruoyi.system.domain.ActSuppliesRole" resultMap="ActSuppliesRoleResult">
@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id,a.role_id,a.detail_name,a.detail_content,a.convert_status,a.status,b.role_name,b.id detaId from act_supplies_role_detail a,act_supplies_role b
         <where>  
             <if test="detaId != null "> and b.id = #{detaId}</if>
+            <if test="roleId != null"> and a.role_id = #{roleId}</if>
             <if test="detailName != null  and detailName != ''"> and a.detail_name like concat('%', #{detailName}, '%')</if>
             <if test="detailContent != null  and detailContent != ''"> and a.detail_content = #{detailContent}</if>
             <if test="status != null "> and a.status = #{status}</if>

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

@@ -138,7 +138,7 @@
           ref="uploadRef"
           class="upload-demo"
           drag
-          action="https://jsonplaceholder.typicode.com/posts/"
+          action=""
           multiple
           :before-upload="beforeUpload"
           :on-change="handleChange"

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

@@ -30,8 +30,8 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <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="0"></el-option>
+          <el-option label="禁用" :value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -201,7 +201,7 @@ export default {
         pageSize: 10,
         tempId: null,
         roleName: null,
-        status: null,
+        status: 0,
       },
       // 表单参数
       form: {},
@@ -223,13 +223,13 @@ export default {
   methods: {
 
     /**启用 */
-    toggleEnable(suppliesRole){
-      console.log('你点击了【' + suppliesRole.s+'】的开关控件，当前开关值:' + suppliesRole.status);
+    toggleEnable(suppliesrole){
+      console.log('你点击了【' + suppliesrole.s+'】的开关控件，当前开关值:' + suppliesrole.status);
       let enableText=['启用','禁用'];
-      if(suppliesRole.status === 0) {
-        toggleEnable(suppliesRole.id).then((response) =>{
+      if(suppliesrole.status === 0) {
+        toggleEnable(suppliesrole.id).then((response) =>{
           if(response.code === 200){
-            let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
+            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
             this.$message({
               message: message,
               type:'success'
@@ -239,16 +239,15 @@ export default {
           }
         });
       }else {
-        toggleDisable(suppliesRole.id).then((response) =>{
-          if(response.msg === "200"){
-            let message = '操作成功，已经将【' + suppliesRole.roleName +'】的状态改为【'+ enableText[suppliesRole.status] +'】 !';
+        toggleDisable(suppliesrole.id).then((response) =>{
+          if(response.code === 200){
+            let message = '操作成功，已经将【' + suppliesrole.roleName +'】的状态改为【'+ enableText[suppliesrole.status] +'】 !';
             this.$message({
               message: message,
               type:'error'
             });
           }else {
-            this.getList();
-            this.$message.error(response.msg);
+            this.$message.error(response.message);
           }
 
         });
@@ -314,6 +313,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getnameid();
       this.reset();
       this.open = true;
       this.title = "添加导入规则";

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

@@ -2,7 +2,7 @@
   <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-select v-model="queryParams.roleId" filterable placeholder="请选择关联项" >
+        <el-select v-model="queryParams.roleId" filterable clearable placeholder="请选择关联项" >
           <el-option
             v-for="option in options1"
             :key="option.roleName"
@@ -174,7 +174,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="规则名称" prop="detailName">
-          <el-input v-model="form.detailName" placeholder="请输入规则名称" />
+          <el-input v-model="form.detailName" placeholder="请输入规则名称" maxlength="10" show-word-limit/>
         </el-form-item>
         <el-form-item label="运算方法" prop="convertStatus">
           <el-select v-model="form.convertStatus" filterable placeholder="请选择运算方法" >
@@ -202,9 +202,9 @@
           <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 label="1">单元格转换</el-radio>
+                <el-radio label="2">行转换</el-radio>
+                <el-radio label="3">列转换</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -385,10 +385,10 @@ export default {
         //   {required: true, message: '导入表列坐标不能为空', trigger: 'change'},
         // ],
         convertStatus:[
-          {required: true, message: '是否物料转换不能为空', trigger: 'change'},
+          {required: true, message: '运算规则不能为空', trigger: 'change'},
         ],
         detailName:[
-          {required: true, message: '是否物料转换不能为空', trigger: 'change'},
+          {required: true, message: '规则名称不能为空', trigger: 'change'},
         ]
       }
     };
@@ -485,6 +485,7 @@ export default {
         id: null,
         roleId: null,
         detailName: null,
+        detailYS: null,
         detailContent: null,
         status: 0,
         convertStatus: null,
@@ -533,7 +534,6 @@ export default {
         this.detailYH = parse.map(obj =>parseInt(obj.re) + 1);
         this.detailYL = parse.map(obj =>parseInt(obj.ce) + 1);
         this.instea = this.detailMH.length;
-        debugger
 
         this.open = true;
         this.title = "修改规则详情";