Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk-storeroom-system

src/api/archivesManage/caseManage.js

@@ -47,6 +47,15 @@ export function FetchInitCaseList(parameter) {
   })
 }
 
+// 档案盒装盒列表
+export function FetchInitCartoningList(parameter) {
+  return request({
+    url: 'api/case/initCartoningList',
+    method: 'get',
+    params: parameter
+  })
+}
+
 // 装盒
 export function FetchCartoning(data) {
   return request({

src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue

@@ -352,15 +352,17 @@ export default {
   methods: {
     doExport(fileName = '未知文件') {
       this.crud.downloadLoading = true
-      if (this.selectedCategory.pid !== '0') {
-        this.parentsId = this.selectedCategory.pid
+      if (this.selectedCategory.isType !== 3 || this.selectedCategory.isType !== 5) {
+        this.parentsId = this.projectSelection.id
       } else {
         this.parentsId = null
       }
+      console.log(this.parentsId)
       const params = {
-        'categoryId': this.selectedCategory.id,
+        'categoryId': this.categoryId,
         'parentsId': this.parentsId
       }
+      console.log(params)
       exportFile(this.baseApi + '/api/archives/exportArchives?' + qs.stringify(params))
       this.crud.downloadLoading = false
     },
@@ -644,7 +646,7 @@ export default {
       this.$refs.packing.packingVisible = true
       this.$refs.packing.isPackingOrPartType = type
       if (type) {
-        this.$refs.packing.archivesTable = this.recycleMain.$refs.file.junneiData
+        this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData))
       }
       this.getTotalSumAll()
     }

src/views/archivesManage/archivesList/module/archivesJuannei/index.vue

@@ -104,7 +104,7 @@
           <!-- state-active 已装/已入/已借/已绑 -->
           <template slot-scope="scope">
             <!-- 未装 / 已装 -->
-            <span class="row-state row-packing state-active">{{ scope.row.case_no ? '已装': '未装' }}</span>
+            <span :class="['row-state', 'row-packing', scope.row.case_no?'state-active':'']">{{ scope.row.case_no ? '已装': '未装' }}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="!recycleMain.isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar?false:'right'">

src/views/archivesManage/archivesList/module/packing/index.vue

@@ -158,7 +158,7 @@
 </template>
 
 <script>
-import { FetchInitCaseList, FetchCartoning } from '@/api/archivesManage/caseManage'
+import { FetchInitCartoningList, FetchCartoning } from '@/api/archivesManage/caseManage'
 import { header, form } from '@crud/crud'
 export default {
   name: 'Packing',
@@ -198,6 +198,7 @@ export default {
     querySelect(val) {
       this.inputSelect = val
     },
+    // 搜索盒列表
     getCaseList() {
       if (!this.caseQuery[this.inputSelect]) {
         this.$message.error('请输入后再搜索！')
@@ -227,10 +228,11 @@ export default {
         'page': 0,
         'size': 10
       }
-      FetchInitCaseList(params).then(res => {
+      FetchInitCartoningList(params).then(res => {
         this.tableData = res.content
       })
     },
+    // 装盒 api
     handleCartoning(row) {
       let packingData = []
       let jnCategoryId
@@ -238,7 +240,6 @@ export default {
       if (this.caseData.selectedCategory.isType === 5) {
         packingData = this.caseData.selections
         jnCategoryId = this.caseData.selectedCategory.id
-        archivesParentsId = null
       } else {
         packingData = this.recycleMain.$refs.file.junneiData
         if (this.caseData.selectedCategory.isType === 2) {
@@ -251,12 +252,17 @@ export default {
       const arrParams = packingData.map(item => {
         const json = {}
         json.archivesId = item.id
-        json.archivesParentsId = archivesParentsId
+        if (this.caseData.selectedCategory.isType === 5) {
+          json.archivesParentsId = item.id
+        } else {
+          json.archivesParentsId = archivesParentsId
+        }
         json.caseId = row.id
         json.caseName = row.caseName
         json.categoryId = jnCategoryId
         return json
       })
+      console.log(arrParams)
       this.FetchCartioning(arrParams)
     },
     FetchCartioning(arrParams) {

src/views/archivesManage/caseManage/caseList/module/openCaseDlg.vue

@@ -30,9 +30,7 @@ export default {
     handleConfirm() {
       // console.log(this.caseData)
       const caseIds = this.caseData.map(item => item.id)
-      console.log(caseIds)
       unpacking(JSON.stringify(caseIds)).then(res => {
-        console.log(res, 'res')
         this.$message.success('拆盒成功！')
         this.caseData = []
         this.openCaseVisible = false