删除校验功能修改

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

@@ -99,10 +99,22 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
     {
 
         //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()+"\"}]" ;
+        List<String> filteredList = new ArrayList<>();
+
+
+        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);
 
-        actSuppliesRoleDetail.setDetailContent(content1);
+        String content2 = "["+content+"]";
+
+        actSuppliesRoleDetail.setDetailContent(content2);
         SysUser user = SecurityUtils.getLoginUser().getUser();
         actSuppliesRoleDetail.setUpdateBy(user.getUserName());
         actSuppliesRoleDetail.setUpdateTime(DateUtils.getNowDate());

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

+// import request from '@/utils/request'
+//
+//
+// //小物料转大物料
+// export function materialConvert(data) {
+//   return request({
+//     url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// // 查询Excel模板列表
+// export function listSuppliesTemplate(query) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+//
+// //展示excel模板
+// export function listSuppliesTemplateId(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// // 查询Excel模板详细
+// export function getSuppliesTemplate(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// // 新增Excel模板
+// export function addSuppliesTemplate(data) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate',
+//     headers:{
+//       repeatSubmit:false
+//     },
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改Excel模板
+// export function updateSuppliesTemplate(data) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate',
+//     method: 'put',
+//     data: data
+//   })
+// }
+//
+// // 删除Excel模板
+// export function delSuppliesTemplate(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+//     method: 'delete'
+//   })
+// }
+//
+// // 展示Excel模板
+// export function delSuppliesSave(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/save/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// //启用
+// export function toggleEnable(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
+//     method: 'get',
+//
+//   })
+// }
+// //禁用
+// export function toggleDisable(id) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
+//     method: 'get',
+//   })
+// }
+//
+//
+// export function findName(name) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
+//     method: 'get'
+//   })
+// }
+//
+//
+//
+//

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

@@ -18,6 +18,7 @@ export function listSuppliesTemplate(query) {
   })
 }
 
+//展示excel模板
 export function listSuppliesTemplateId(id) {
   return request({
     url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
@@ -180,55 +181,55 @@ export function delRuleManagement(id) {
 
 
 
-// 查询模板列表
-export function listMyluckyexcel(query) {
-  return request({
-    url: '/system/supplies/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询模板详情详细
-export function getMyluckyexcel(id) {
-  return request({
-    url: '/system/supplies/' + id,
-    method: 'get'
-  })
-}
-
-// 新增模板详情
-export function addMyluckyexcel(data) {
-  return request({
-    url: '/system/supplies/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改模板详情
-export function updateMyluckyexcel(data) {
-  return request({
-    url: '/system/supplies/edit',
-    method: 'put',
-    data: data
-  })
-}
-// 删除模板详情
-export function delMyluckyexcel(id) {
-  return request({
-    url: '/system/supplies/' + id,
-    method: 'delete'
-  })
-
-
-}
-
-// 导出模板详情
-export function exportMyluckyexcel(query) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/export',
-    method: 'get',
-    params: query
-  })
-}
+// // 查询模板列表
+// export function listMyluckyexcel(query) {
+//   return request({
+//     url: '/system/supplies/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+//
+// // 查询模板详情详细
+// export function getMyluckyexcel(id) {
+//   return request({
+//     url: '/system/supplies/' + id,
+//     method: 'get'
+//   })
+// }
+//
+// // 新增模板详情
+// export function addMyluckyexcel(data) {
+//   return request({
+//     url: '/system/supplies/save',
+//     method: 'post',
+//     data: data
+//   })
+// }
+//
+// // 修改模板详情
+// export function updateMyluckyexcel(data) {
+//   return request({
+//     url: '/system/supplies/edit',
+//     method: 'put',
+//     data: data
+//   })
+// }
+// // 删除模板详情
+// export function delMyluckyexcel(id) {
+//   return request({
+//     url: '/system/supplies/' + id,
+//     method: 'delete'
+//   })
+//
+//
+// }
+//
+// // 导出模板详情
+// export function exportMyluckyexcel(query) {
+//   return request({
+//     url: '/SuppliesTemplate/SuppliesTemplate/export',
+//     method: 'get',
+//     params: query
+//   })
+// }

ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/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="上级分类" prop="fname">
+      <el-form-item label="上级分类" prop="sid">
         <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">
@@ -32,8 +33,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="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>
@@ -220,7 +221,7 @@ export default {
         fname:null,
         detailsName: null,
         sysclassify: null,
-        status: null,
+        status: 0,
       },
       // 表单参数
       form: {

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="大类名称" prop="fname">
+      <el-form-item label="大类名称" prop="pid">
         <el-select v-model="queryParams.pid" filterable clearable placeholder="请输入上级分类" >
           <el-option
             v-for="option in options"
@@ -32,8 +23,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="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>
@@ -221,7 +212,7 @@ export default {
         fname:null,
         suppliesName: null,
         orderNum: null,
-        status: null,
+        status: 0,
       },
       // 表单参数
       form: {},

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

@@ -11,8 +11,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="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>
@@ -238,7 +238,7 @@ export default {
         detId: null,
         templateName: null,
         templateContent: null,
-        status: null,
+        status: 0,
       },
       form: {},
       rules: {},

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

@@ -353,7 +353,7 @@ export default {
         roleId: null,
         detailName: null,
         detailContent: null,
-        status: null,
+        status: 0,
         converStatus: null,
       },
       // 表单参数
@@ -514,9 +514,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.instea=0;
-      this.showTemplate = false;
-      this.showImport = false;
-      this.showLie = false;
       this.getnameid();
       this.reset();
       this.open = true;
@@ -528,6 +525,16 @@ export default {
       const id = row.id || this.ids
       getSuppliesroledetail(id).then(response => {
         this.form = response.data;
+        const detailContent = response.data.detailContent;
+        const parse = JSON.parse(detailContent);
+
+        this.detailMH = parse.map(obj =>parseInt(obj.rt) + 1);
+        this.detailML = parse.map(obj =>parseInt(obj.ct) + 1);
+        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 = "修改规则详情";
       });