档案删除

ljq
1 parent c397f373
Showing 8 changed files with 62 additions and 7 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesCollectBoxController.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesCollectBoxMapper.java
ruoyi-archives/src/main/java/com/ruoyi/service/IArchivesCollectBoxService.java
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesCollectBoxServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/api/archives/collerctbox.js
ruoyi-ui/src/views/archives/box/filingindex.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
@@ -92,7 +92,19 @@ public class ArchivesCollectBoxController extends BaseController
     }
     /**
-     * 删除【请填写功能名称】
+     * 删除【请填写功能名称】 恢复
+     */
+    @PreAuthorize("@ss.hasPermi('archives:collerctbox:collerctbox')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/updateremove/{ids}/{remove}")
+    public AjaxResult UpdateremoveType(@PathVariable Long[] ids,@PathVariable String remove)
+    {
+        return toAjax(archivesCollectBoxService.UpdateremoveTypeArchivesCollectBoxByIds(ids,remove));
+    }
+    
+    
+    /**
+     * 彻底删除【请填写功能名称】
      */
     @PreAuthorize("@ss.hasPermi('archives:collerctbox:remove')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
@@ -61,6 +61,7 @@ public interface ArchivesCollectBoxMapper
     public int deleteArchivesCollectBoxByIds(Long[] ids);
+    public int UpdateremoveTypeArchivesCollectBoxByIds(@Param("ids")Long[] ids,@Param("remove")String remove);
     /**
      * 
      * @param apprvoal
@@ -51,6 +51,8 @@ public interface IArchivesCollectBoxService
      */
     public int deleteArchivesCollectBoxByIds(Long[] ids);
+
+    public int UpdateremoveTypeArchivesCollectBoxByIds(Long[] id,String remove);
     /**
      * 删除【请填写功能名称】信息
      * 
@@ -82,6 +82,12 @@ public class ArchivesCollectBoxServiceImpl implements IArchivesCollectBoxService
         return archivesCollectBoxMapper.deleteArchivesCollectBoxByIds(ids);
     }
+
+    public int UpdateremoveTypeArchivesCollectBoxByIds(Long[] id,String remove){
+
+        return archivesCollectBoxMapper.UpdateremoveTypeArchivesCollectBoxByIds(id,remove);
+    }
+
     /**
      * 删除【请填写功能名称】信息
      * 
@@ -214,6 +214,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             #{id}
         </foreach>
     </delete>
+
+
+    <delete id="UpdateremoveTypeArchivesCollectBoxByIds">
+        update  archives_collect_box set remove =#{remove} where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
     <update id="Scatter" >
         update archives_collect_box set
@@ -36,6 +36,14 @@ export function updateBox(data) {
 }
 // 删除【请填写功能名称】
+export function updatedelBox(id,remove) {
+  return request({
+    url: '/archives/collerctbox/updateremove/' + id +"/"+remove,
+    method: 'delete'
+  })
+}
+
+// 彻底删除【请填写功能名称】
 export function delBox(id) {
   return request({
     url: '/archives/collerctbox/' + id,
@@ -70,7 +70,7 @@
           :disabled="single"
           @click="handleupdateyreturn"
           v-hasPermi="['archives:collerctbox:inserBox']"
-        >退回</el-button>
+        >打回</el-button>
       </el-col>
       <el-col :span="1.5" v-if="updateyfiling">
         <el-button
@@ -325,10 +325,24 @@ export default {
       this.boxsId = row.id;
       this.boxtOpen = true;
     },
-    /** 退回 **/
+    /** 打回 **/
     handleupdateyreturn(row){
+      const id = row.id || this.ids
+      this.handleSelectId(id,"2")
+    },
+    handleSelectId(id,apprvoal){
+      getBox(id).then(response => {
+        let from  = response.data;
+        from.apprvoal = apprvoal;
+        updateBox(from).then(response => {
+          this.$modal.msgSuccess("提交成功");
+          this.open = false;
+          this.getList();
+        });
+      });
     },
+
     handleupdateyreturn1(row){
       this.title="上架";
       this.shelveType=1;
@@ -344,9 +358,11 @@ export default {
       this.$nextTick(()=>{
         this.$refs.shelve.getList();
       })
-    },handleCheckShelve(){
+    },
+    handleCheckShelve(){
       this.$refs.shelve.shelve();
-    },handleCheckShelveDown(){
+    },
+    handleCheckShelveDown(){
       this.$refs.shelve.shelveDown();
     }
@@ -358,7 +358,7 @@
 </template>
 <script>
-import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
+import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
 import { listBox } from "@/api/archives/box";
 import file from "@/views/archives/file/index.vue";
@@ -587,8 +587,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
+      let remove = 1;
       this.$modal.confirm('是否确认删除【登记著录】编号为"' + ids + '"的数据项？').then(function() {
-        return delBox(ids);
+        return updatedelBox(ids,remove);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");