Commit 530498f497f7b413b2efb8aea2ca420bb366ad13

Authored by yiming
1 parent c284570e

档案上架

ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesBoxController.java
@@ -95,4 +95,17 @@ public class ArchivesBoxController extends BaseController @@ -95,4 +95,17 @@ public class ArchivesBoxController extends BaseController
95 { 95 {
96 return toAjax(archivesBoxService.deleteArchivesBoxByIds(ids)); 96 return toAjax(archivesBoxService.deleteArchivesBoxByIds(ids));
97 } 97 }
  98 +
  99 + /**
  100 + * 查询【请填写功能名称】列表
  101 + */
  102 + @PreAuthorize("@ss.hasPermi('archives:box:list')")
  103 + @PostMapping("/listByIds/{ids}")
  104 + public TableDataInfo listByIds(@PathVariable Long[] ids)
  105 + {
  106 + startPage();
  107 + List<ArchivesBox> list = archivesBoxService.selectArchivesBoxListByIds(ids);
  108 + return getDataTable(list);
  109 + }
  110 +
98 } 111 }
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesBoxMapper.java
@@ -29,6 +29,14 @@ public interface ArchivesBoxMapper @@ -29,6 +29,14 @@ public interface ArchivesBoxMapper
29 public List<ArchivesBox> selectArchivesBoxList(ArchivesBox archivesBox); 29 public List<ArchivesBox> selectArchivesBoxList(ArchivesBox archivesBox);
30 30
31 /** 31 /**
  32 + * 查询【请填写功能名称】列表
  33 + *
  34 + * @param ids 【请填写功能名称】
  35 + * @return 【请填写功能名称】集合
  36 + */
  37 + public List<ArchivesBox> selectArchivesBoxListByIds(Long[] ids);
  38 +
  39 + /**
32 * 新增【请填写功能名称】 40 * 新增【请填写功能名称】
33 * 41 *
34 * @param archivesBox 【请填写功能名称】 42 * @param archivesBox 【请填写功能名称】
ruoyi-archives/src/main/java/com/ruoyi/service/IArchivesBoxService.java
@@ -29,6 +29,14 @@ public interface IArchivesBoxService @@ -29,6 +29,14 @@ public interface IArchivesBoxService
29 public List<ArchivesBox> selectArchivesBoxList(ArchivesBox archivesBox); 29 public List<ArchivesBox> selectArchivesBoxList(ArchivesBox archivesBox);
30 30
31 /** 31 /**
  32 + * 查询【请填写功能名称】列表
  33 + *
  34 + * @param ids 【请填写功能名称】
  35 + * @return 【请填写功能名称】集合
  36 + */
  37 + public List<ArchivesBox> selectArchivesBoxListByIds(Long[] ids);
  38 +
  39 + /**
32 * 新增【请填写功能名称】 40 * 新增【请填写功能名称】
33 * 41 *
34 * @param archivesBox 【请填写功能名称】 42 * @param archivesBox 【请填写功能名称】
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesBoxServiceImpl.java
@@ -46,6 +46,18 @@ public class ArchivesBoxServiceImpl implements IArchivesBoxService @@ -46,6 +46,18 @@ public class ArchivesBoxServiceImpl implements IArchivesBoxService
46 } 46 }
47 47
48 /** 48 /**
  49 + * 查询【请填写功能名称】列表
  50 + *
  51 + * @param ids 【请填写功能名称】
  52 + * @return 【请填写功能名称】
  53 + */
  54 + @Override
  55 + public List<ArchivesBox> selectArchivesBoxListByIds(Long[] ids)
  56 + {
  57 + return archivesBoxMapper.selectArchivesBoxListByIds(ids);
  58 + }
  59 +
  60 + /**
49 * 新增【请填写功能名称】 61 * 新增【请填写功能名称】
50 * 62 *
51 * @param archivesBox 【请填写功能名称】 63 * @param archivesBox 【请填写功能名称】
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
@@ -34,6 +34,14 @@ @@ -34,6 +34,14 @@
34 </where> 34 </where>
35 </select> 35 </select>
36 36
  37 + <select id="selectArchivesBoxListByIds" parameterType="String" resultMap="ArchivesBoxResult">
  38 + <include refid="selectArchivesBoxVo"/>
  39 + where id in
  40 + <foreach item="id" collection="array" open="(" separator="," close=")">
  41 + #{id}
  42 + </foreach>
  43 + </select>
  44 +
37 <select id="selectArchivesBoxById" parameterType="Long" resultMap="ArchivesBoxResult"> 45 <select id="selectArchivesBoxById" parameterType="Long" resultMap="ArchivesBoxResult">
38 <include refid="selectArchivesBoxVo"/> 46 <include refid="selectArchivesBoxVo"/>
39 where id = #{id} 47 where id = #{id}
ruoyi-ui/src/api/archives/box.js
@@ -42,3 +42,10 @@ export function delBox(id) { @@ -42,3 +42,10 @@ export function delBox(id) {
42 method: 'delete' 42 method: 'delete'
43 }) 43 })
44 } 44 }
  45 +
  46 +export function listByIds(id) {
  47 + return request({
  48 + url: '/archives/box/listByIds/' + id,
  49 + method: 'post'
  50 + })
  51 +}
ruoyi-ui/src/views/archives/box/filingindex.vue
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 plain 78 plain
79 icon="el-icon-download" 79 icon="el-icon-download"
80 size="mini" 80 size="mini"
81 - :disabled="single" 81 + :disabled="multiple"
82 @click="handleupdateyreturn1" 82 @click="handleupdateyreturn1"
83 v-hasPermi="['archives:collerctbox:inserBox']" 83 v-hasPermi="['archives:collerctbox:inserBox']"
84 >上架</el-button> 84 >上架</el-button>
@@ -168,6 +168,14 @@ @@ -168,6 +168,14 @@
168 <el-dialog :title="title" :visible.sync="boxtOpen" width="80%" append-to-body> 168 <el-dialog :title="title" :visible.sync="boxtOpen" width="80%" append-to-body>
169 <indexbox :boxsId= boxsId :statusPd= "2" v-if="boxtOpen"/> 169 <indexbox :boxsId= boxsId :statusPd= "2" v-if="boxtOpen"/>
170 </el-dialog> 170 </el-dialog>
  171 +
  172 + <el-dialog :title="title" :visible.sync="shelveOpen" width="80%" append-to-body>
  173 + <shelve :ids=ids ref="shelve" />
  174 + <div slot="footer" class="dialog-footer">
  175 + <el-button type="primary" @click="handleCheckShelve">确 定</el-button>
  176 + <el-button >取 消</el-button>
  177 + </div>
  178 + </el-dialog>
171 </div> 179 </div>
172 </template> 180 </template>
173 181
@@ -175,10 +183,10 @@ @@ -175,10 +183,10 @@
175 import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box"; 183 import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box";
176 184
177 import indexbox from "@/views/archives/collerctbox/index.vue"; 185 import indexbox from "@/views/archives/collerctbox/index.vue";
178 - 186 +import shelve from "@/views/archives/box/shelveindex.vue";
179 export default { 187 export default {
180 name: "Box", 188 name: "Box",
181 - components: { indexbox }, 189 + components: { indexbox,shelve },
182 data() { 190 data() {
183 return { 191 return {
184 // 遮罩层 192 // 遮罩层
@@ -219,6 +227,7 @@ export default { @@ -219,6 +227,7 @@ export default {
219 updateyfiling :true, //预归档 227 updateyfiling :true, //预归档
220 updatefiling: true,//归档 228 updatefiling: true,//归档
221 apprvoal: 4, //归档 229 apprvoal: 4, //归档
  230 + shelveOpen : false
222 }; 231 };
223 }, 232 },
224 created() { 233 created() {
@@ -319,9 +328,15 @@ export default { @@ -319,9 +328,15 @@ export default {
319 handleupdateyreturn(row){ 328 handleupdateyreturn(row){
320 329
321 }, 330 },
  331 + handleupdateyreturn1(row){
  332 + this.title="上架";
  333 + this.shelveOpen = true;
  334 + },
  335 + handleupdateyreturn2(row){
322 336
323 -  
324 - 337 + },handleCheckShelve(){
  338 + this.$refs.shelve.handleCheck();
  339 + }
325 } 340 }
326 }; 341 };
327 </script> 342 </script>