From 1ba2a7f64ecf40c9d39b1ef200301eefbaae9f3b Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 31 Aug 2022 13:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=A3=85=E7=9B=92size/?=
 =?UTF-8?q?=E7=9B=92=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85/=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=AD=E5=BF=83-=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97date/style=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesCheck/module/addCheck.vue         | 18 +++----
 .../archivesList/archivesAnjuan/index.vue     |  2 +-
 .../archivesManage/archivesList/index.vue     | 16 +++---
 .../module/deltArchives/index.vue             |  3 +-
 .../archivesList/module/packing/index.vue     | 49 ++++++++++++++++---
 .../caseList/module/detailDialog.vue          | 16 ++++--
 .../outInStorage/inStorage/index.vue          |  1 -
 .../outInStorage/module/detailDialog.vue      | 20 +++-----
 src/views/system/user/center.vue              |  2 +-
 9 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/src/views/archivesManage/archivesCheck/module/addCheck.vue b/src/views/archivesManage/archivesCheck/module/addCheck.vue
index 9e61595..a1811e3 100644
--- a/src/views/archivesManage/archivesCheck/module/addCheck.vue
+++ b/src/views/archivesManage/archivesCheck/module/addCheck.vue
@@ -11,7 +11,7 @@
           label-width="80px"
           :rules="rules"
         >
-          <el-form-item label="选择区域" prop="selectArea" class="down-select" style="padding-top:1px;margin-right:20px">
+          <el-form-item label="选择区域" prop="selectArea" class="down-select" style="margin-right:20px">
             <treeselect
               v-model="selectAreaValue"
               :options="selectArea"
@@ -25,7 +25,7 @@
           <el-form-item label="选择门类" prop="category" class="down-select">
             <el-select
               v-model="categoryValue"
-              style="width: 280px;"
+              style="width: 280px;height:30px"
               multiple
               filterable
               clearable
@@ -332,14 +332,8 @@ export default {
   padding: 30px 0;
 }
 ::v-deep .el-tag.el-tag--info{
-  height: 26px;
-  line-height: 26px;
-  background-color: #13439E;
-  border: none;
-  color: #fff;
-}
-::v-deep .el-tag.el-tag--info .el-tag__close{
-  background-color: #fff;
+  height: 24px !important;
+  line-height: 24px !important;
 }
 ::v-deep .el-input__inner{
   height: 30px !important;
@@ -349,6 +343,9 @@ export default {
   background: transparent;
 }
 // 树形选择器
+::v-deep .vue-treeselect__placeholder, .vue-treeselect__single-value{
+  line-height: 30px;
+}
 ::v-deep .vue-treeselect--has-value .vue-treeselect__multi-value{
   margin-bottom: 0;
 }
@@ -358,6 +355,7 @@ export default {
 }
 
 ::v-deep .el-dialog .el-form .vue-treeselect__control{
+  height: 30px !important;
   line-height: 18px;
 }
 ::v-deep .vue-treeselect__limit-tip{
diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index 0152152..b8c40cb 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -407,7 +407,7 @@ export default {
       this.$refs.packing.packingVisible = true
       this.$refs.packing.isPackingOrPartType = type
       if (type) {
-        this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData))
+        this.$refs.packing.getPackingFileList()
       }
       this.getTotalSumAll()
     },
diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue
index 3f2188e..f65c826 100644
--- a/src/views/archivesManage/archivesList/index.vue
+++ b/src/views/archivesManage/archivesList/index.vue
@@ -340,7 +340,6 @@ export default {
       }
       if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) {
         this.isAnjuan = true
-
         this.anjuanSelection = {}
         this.$nextTick(() => {
           if (this.$refs.file) {
@@ -498,10 +497,12 @@ export default {
               }
               this.isAnjuan = false
             } else {
-              this.$refs.anjuan.anjuanData = []
-              this.$refs.anjuan.anjuanTableHeight = ''
-              this.$refs.file.junneiData = []
-              this.$refs.file.juanneiTableHeight = ''
+              this.clearAnjuan()
+              this.clearFile()
+              // this.$refs.anjuan.anjuanData = []
+              // this.$refs.anjuan.anjuanTableHeight = ''
+              // this.$refs.file.junneiData = []
+              // this.$refs.file.juanneiTableHeight = ''
             }
           }, 500)
           if (!this.treeCurrentNode) {
@@ -538,8 +539,9 @@ export default {
               }
               this.isAnjuan = false
             } else {
-              this.$refs.file.junneiData = []
-              this.$refs.file.juanneiTableHeight = ''
+              // this.$refs.file.junneiData = []
+              // this.$refs.file.juanneiTableHeight = ''
+              this.clearFile()
             }
           }, 500)
           if (!this.treeCurrentNode) {
diff --git a/src/views/archivesManage/archivesList/module/deltArchives/index.vue b/src/views/archivesManage/archivesList/module/deltArchives/index.vue
index f712c1c..eb26a71 100644
--- a/src/views/archivesManage/archivesList/module/deltArchives/index.vue
+++ b/src/views/archivesManage/archivesList/module/deltArchives/index.vue
@@ -95,19 +95,18 @@ export default {
       // 删除fetch
       if (!this.recycleMain.isRecycle) {
         del(params).then(res => {
-          this.crud.delAllLoading = false
           this.$message.success('删除成功!')
           this.crud.refresh()
           localStorage.setItem('isDelt', this.isDeltType)
         })
       } else {
         FetchCompletelyDelete(params).then(res => {
-          this.crud.delAllLoading = false
           this.$message.success('删除成功!')
           this.crud.refresh()
           localStorage.setItem('isDelt', this.isDeltType)
         })
       }
+      this.crud.delAllLoading = false
     },
     // 删除 - 关闭
     handleClose(done) {
diff --git a/src/views/archivesManage/archivesList/module/packing/index.vue b/src/views/archivesManage/archivesList/module/packing/index.vue
index bc4b11f..e640659 100644
--- a/src/views/archivesManage/archivesList/module/packing/index.vue
+++ b/src/views/archivesManage/archivesList/module/packing/index.vue
@@ -159,6 +159,7 @@
 
 <script>
 import { FetchInitCartoningList, FetchCartoning } from '@/api/archivesManage/caseManage'
+import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
 import { header, form } from '@crud/crud'
 export default {
   name: 'Packing',
@@ -170,6 +171,7 @@ export default {
   ],
   data() {
     return {
+      packingData: [],
       tableData: [],
       selectTableData: [],
       archivesTable: [],
@@ -232,16 +234,48 @@ export default {
         this.tableData = res.content
       })
     },
+    async getPackingFileList() {
+      let categoryId
+      if (this.caseData.selectedCategory.isType === 2) {
+        categoryId = this.caseData.selectedCategory.children[0].children[0].id
+      } else {
+        categoryId = this.caseData.selectedCategory.children[0].id
+      }
+      const params = {
+        'categoryId': categoryId,
+        'parentsId': this.recycleMain.anjuanSelection.id,
+        'isdel': false,
+        'page': 0,
+        'size': null,
+        'sort': null,
+        'queryType': null,
+        'queryTitle': null,
+        'itemNo': null,
+        'archiveCtgNo': null,
+        'responsibleby': null,
+        'archiveNo': null,
+        'archiveYear': null,
+        'department': null,
+        'retention': null,
+        'securityClass': null,
+        'organizationMatter': null
+      }
+      await FetchInitArchivesView(params).then(data => {
+        if (data) {
+          this.packingData = data.list.content
+          this.archivesTable = data.list.content
+        }
+      })
+    },
     // 装盒 api
-    handleCartoning(row) {
-      let packingData = []
+    async handleCartoning(row) {
       let jnCategoryId
       let archivesParentsId
       if (this.caseData.selectedCategory.isType === 5) {
-        packingData = this.caseData.selections
+        this.packingData = this.caseData.selections
         jnCategoryId = this.caseData.selectedCategory.id
       } else {
-        packingData = this.recycleMain.$refs.file.junneiData
+        await this.getPackingFileList()
         if (this.caseData.selectedCategory.isType === 2) {
           jnCategoryId = this.caseData.selectedCategory.children[0].children[0].id
         } else {
@@ -249,7 +283,7 @@ export default {
         }
         archivesParentsId = this.caseData.selections[0].id
       }
-      const arrParams = packingData.map(item => {
+      const arrParams = this.packingData.map(item => {
         const json = {}
         json.archivesId = item.id
         if (this.caseData.selectedCategory.isType === 5) {
@@ -262,8 +296,7 @@ export default {
         json.categoryId = jnCategoryId
         return json
       })
-      console.log(arrParams)
-      this.FetchCartioning(arrParams)
+      await this.FetchCartioning(arrParams)
     },
     FetchCartioning(arrParams) {
       FetchCartoning(arrParams).then(res => {
@@ -271,7 +304,7 @@ export default {
         this.packingVisible = false
         this.crud.refresh()
         this.tableData = []
-        this.caseQuery[this.inputSelect] = []
+        this.caseQuery[this.inputSelect] = ''
       })
     },
     // 分卷装盒
diff --git a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
index 525439c..da2c087 100644
--- a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
+++ b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
@@ -10,12 +10,19 @@
             <p class="right"><span class="color-blue">盒条码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
           </div>
           <div class="dpflex">
-            <p class="left"><span class="color-blue">存放位置：</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
+            <p class="left"><span class="color-blue">存放位置：</span>
+              <span class="color-white">
+                <div v-if="!rowData.folderLocationDetails">-</div>
+                <div v-else>
+                  <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
+                </div>
+              </span>
+            </p>
             <p class="right"><span class="color-blue">TID：</span><span class="color-white">{{ rowData.tid }}</span></p>
           </div>
           <p class="left"><span class="color-blue">创建时间：</span><span class="color-white">{{ rowData.create_time | parseTime }}</span></p>
         </div>
-        <el-table :data="tableData" style="margin-top:15px;height:356px">
+        <el-table :data="tableData" style="margin-top:15px;" height="342px">
           <el-table-column type="index" label="序号" align="center" width="80" />
           <el-table-column prop="child" label="子条数目" align="center" width="100" />
           <el-table-column prop="categoryType" label="门类级别" align="center" width="100">
@@ -25,7 +32,7 @@
               <span v-if="scope.row.categoryType === 3" style="width:56px">案卷级</span>
             </template>
           </el-table-column>
-          <el-table-column prop="categoryName" label="门类名称" align="center" width="100" />
+          <el-table-column prop="categoryName" label="门类名称" align="center" width="140" :show-overflow-tooltip="true" />
           <el-table-column prop="fondsNo" label="全宗号" align="center" width="180" />
           <el-table-column prop="archiveNo" label="档号" align="center" width="220" />
           <el-table-column prop="archiveYear" label="归档年度" align="center" width="150" />
@@ -67,7 +74,7 @@ export default {
 <style lang="scss" scoped>
 ::v-deep .el-dialog{
   width: 950px;
-  height: 520px;
+  // height: 520px;
 }
 ::v-deep .el-dialog__body{
   padding: 20px 0;
@@ -93,6 +100,7 @@ p{
   color: #339CFF;
 }
 .color-white{
+  display: inline-block;
   color: #fff;
 }
 </style>
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 4df8127..ca93f3b 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -163,7 +163,6 @@ export default {
     },
     // 双击详情
     handleDbClick(row) {
-      console.log(1)
       this.$refs.detailDom.rowData = row
       const params = {
         caseId: row.id
diff --git a/src/views/archivesManage/outInStorage/module/detailDialog.vue b/src/views/archivesManage/outInStorage/module/detailDialog.vue
index 0c9177f..d6f44b1 100644
--- a/src/views/archivesManage/outInStorage/module/detailDialog.vue
+++ b/src/views/archivesManage/outInStorage/module/detailDialog.vue
@@ -9,16 +9,7 @@
             <p class="left"><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.caseName }}</span></p>
             <p class="right"><span class="color-blue">存放位置:</span>
               <span class="color-white">
-                <div v-if="rowData.folderLocationDetails.indexOf(',')">
-                  <el-tag
-                    v-for="(item,index) in rowData.folderLocationDetails.split(',')"
-                    :key="index"
-                    :type="item"
-                    effect="dark"
-                  >
-                    {{ item }}
-                  </el-tag>
-                </div>
+                <div v-if="!rowData.folderLocationDetails">-</div>
                 <div v-else>
                   <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
                 </div>
@@ -53,8 +44,11 @@
           <el-table-column prop="department" align="center" label="部门" width="100" />
           <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
           <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="300">
-            <template v-if="rowData" slot-scope="">
-              <el-tag effect="dark">{{ rowData.folderLocationDetails }}</el-tag>
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folderLocationDetails">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+              </span>
             </template>
           </el-table-column>
           <el-table-column prop="update_time" align="center" label="创建时间" width="180">
@@ -84,7 +78,7 @@ export default {
 @import "~@/assets/styles/lend-manage.scss";
 ::v-deep .el-dialog {
   width: 950px;
-  height: 520px;
+  // height: 520px;
 }
 ::v-deep .el-dialog__body{
   padding: 20px 0;
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index d7948f5..328d752 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -87,7 +87,7 @@
                   <div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div>
                 </template>
                 <template slot-scope="scope">
-                  <span>{{ scope.row.createTime }}</span>
+                  <span>{{ scope.row.createTime | parseTime }}</span>
                 </template>
               </el-table-column>
             </el-table>