Merge remote-tracking branch 'origin/master'

yiming
2 parents 7eba48b8 c397f373
Showing 8 changed files with 78 additions and 25 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesBoxController.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesCollectBoxMapper.java
ruoyi-archives/src/main/java/com/ruoyi/service/IArchivesBoxService.java
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesBoxServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/api/archives/box.js
ruoyi-ui/src/views/archives/box/index.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
@@ -108,4 +108,13 @@ public class ArchivesBoxController extends BaseController
         return getDataTable(list);
     }
  
+    /**
+     * 打散
+     */
+   // @PreAuthorize("@ss.hasPermi('archives:box:list')")
+    @PostMapping("/Scatter/{id}")
+    public AjaxResult Scatter(@PathVariable Long id){
+        return toAjax(archivesBoxService.Scatter(id));
+    }
+
 }
@@ -2,6 +2,7 @@ package com.ruoyi.mapper;
  
 import java.util.List;
 import com.ruoyi.domain.ArchivesCollectBox;
+import org.apache.ibatis.annotations.Param;
  
 /**
  * 【请填写功能名称】Mapper接口
@@ -58,4 +59,13 @@ public interface ArchivesCollectBoxMapper
      * @return 结果
      */
     public int deleteArchivesCollectBoxByIds(Long[] ids);
+
+
+    /**
+     * 
+     * @param apprvoal
+     * @param boxId
+     * @return
+     */
+    public int Scatter(@Param("apprvoal")String apprvoal, @Param("boxId") Long boxId,@Param("status") String status);
 }
 package com.ruoyi.service;
  
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.ArchivesBox;
+import org.springframework.web.bind.annotation.PathVariable;
  
 import java.util.List;
  
@@ -67,4 +69,7 @@ public interface IArchivesBoxService
      * @return 结果
      */
     public int deleteArchivesBoxById(Long id);
+
+
+    public int Scatter(Long id);
 }
@@ -3,9 +3,11 @@ package com.ruoyi.service.impl;
 import com.ruoyi.domain.ArchivesBox;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.mapper.ArchivesBoxMapper;
+import com.ruoyi.mapper.ArchivesCollectBoxMapper;
 import com.ruoyi.service.IArchivesBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
  
 import java.util.List;
  
@@ -20,7 +22,9 @@ public class ArchivesBoxServiceImpl implements IArchivesBoxService
 {
     @Autowired
     private ArchivesBoxMapper archivesBoxMapper;
-
+    @Autowired
+    private ArchivesCollectBoxMapper archivesCollectBoxMapper;
+    
     /**
      * 查询【请填写功能名称】
      * 
@@ -106,4 +110,12 @@ public class ArchivesBoxServiceImpl implements IArchivesBoxService
     {
         return archivesBoxMapper.deleteArchivesBoxById(id);
     }
+
+    @Override
+    @Transactional
+    public int Scatter(Long id){ 
+        ArchivesBox box =  archivesBoxMapper.selectArchivesBoxById(id);
+        //box.getApprvoal() 让文档和盒提交状态保持一样 1表示已整理文件
+        return archivesCollectBoxMapper.Scatter(box.getApprvoal(),box.getId(),"1");
+    }
 }
@@ -214,4 +214,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             #{id}
         </foreach>
     </delete>
+    
+    <update id="Scatter" >
+        update archives_collect_box set
+        <if test="boxId != null">box_id =Null , status = #{status} ,apprvoal= #{apprvoal} where box_id = #{boxId}</if>
+    </update>
+    
+    
 </mapper>
 \ No newline at end of file
@@ -66,3 +66,11 @@ export function shelveDown(data) {
     data: data
   })
 }
+// 打散功能
+export function Scatter(id) {
+  return request({
+    url: '/archives/box/Scatter/' + id,
+    method: 'post'
+  })
+}
+
@@ -106,6 +106,20 @@
         >归档</el-button>
       </el-col>
  
+
+      <el-col :span="1.5" v-if="updatefiling">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdateScatter"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >打散</el-button>
+      </el-col>
+
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
  
@@ -191,7 +205,7 @@
 </template>
  
 <script>
-import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box";
+import {listBox, getBox, delBox, addBox, updateBox, Scatter} from "@/api/archives/box";
  
 import indexbox from "@/views/archives/collerctbox/index.vue";
  
@@ -370,6 +384,14 @@ export default {
         });
       });
     },
+    //打散
+    handleupdateScatter(row){
+      const id = row.id || this.ids
+      Scatter(id).then(response=> {
+        this.$modal.msgSuccess("打散成功");
+        this.open = false;
+      })
+    },
  
  
   }
@@ -349,32 +349,10 @@
         <el-table-column label="库位码" align="center" prop="deportNodeId" />
         <el-table-column label="描述" align="center" prop="describes" />
       </el-table>
-
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['archives:box:edit']"
-        >修改</el-button>
-      </el-col>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary"    @click="insetBox">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-
-<!--
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />-->
-
     </el-dialog>
   </div>
 </template>
@@ -649,6 +627,7 @@ export default {
       const collerboxid = row.id || this.ids;
       this.boxOpen = true;
       this.collerboxid = collerboxid;
+      this.status = "2" //盒
       listBox(this.queryParams).then(response => {
         this.boxtwoList = response.rows;
       });
@@ -667,8 +646,9 @@ export default {
         from.boxId =  id + ""; //盒id
         from.status = "2";
         updateBox(from).then(response => {
-          this.$modal.msgSuccess("提交成功");
+          this.$modal.msgSuccess("已成功加入盒内");
           this.boxOpen = false;
+          this.getList();
         });
       });
     },