出入库bug/档案统计-首页数量

src/api/archivesManage/statistics.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 获取档案总数
+export function FetchGetArchivesNum(parameter) {
+  return request({
+    url: 'api/archives/getArchivesNum',
+    method: 'get',
+    params: parameter
+  })
+}
+
+// 获取档案盒总数
+export function FetchGetCaseNum(parameter) {
+  return request({
+    url: 'api/case/getCaseNum',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/archivesManage/archivesList/mixins/archives.js

@@ -192,7 +192,7 @@ export const archivesCrud = {
                 } else if (item.is_borrow === 3) {
                   this.borrowTxt[index] = '已借'
                 } else if (item.is_borrow === -1) {
-                  this.borrowTxt[index] = '-'
+                  this.borrowTxt[index] = '在库'
                 }
               })
             }

src/views/archivesManage/outInStorage/inStorage/index.vue

@@ -51,11 +51,11 @@
       </el-table-column>
       <el-table-column prop="depositNum" align="center" label="已装" min-width="80" />
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="150" />
-      <el-table-column prop="tid" align="center" label="TID" min-width="250" />
-      <el-table-column prop="barcode" align="center" label="条形码" width="200" />
+      <el-table-column prop="tid" align="center" label="TID" min-width="150" />
+      <el-table-column prop="barcode" align="center" label="条形码" width="150" />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
-          <div v-if="scope.row.folderLocationDetails.includes(',')">
+          <div v-if="scope.row.folderLocationDetails && scope.row.folderLocationDetails.includes(',')">
             <el-tag
               v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
               :key="index"
@@ -66,7 +66,7 @@
             </el-tag>
           </div>
           <div v-else>
-            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+            <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
           </div>
         </template>
       </el-table-column>

src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue

@@ -61,12 +61,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog {
+  width: 750px;
+  .el-dialog__body{
+    padding: 30px 0;
+  }
+}
 .setting-dialog{
   color: #fff;
   font-size: 16px;
 }
 .msg{
-  padding: 0 10px 10px 10px;
+  padding: 0 10px 20px 10px;
 }
 .btn-save{
   width: 90px;

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -55,7 +55,7 @@
       <el-table-column prop="barcode" label="条形码" align="center" min-width="100" />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
-          <div v-if="scope.row.folderLocationDetails.includes(',')">
+          <div v-if="scope.row.folderLocationDetails && scope.row.folderLocationDetails.includes(',')">
             <el-tag
               v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
               :key="index"
@@ -66,7 +66,7 @@
             </el-tag>
           </div>
           <div v-else>
-            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+            <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
           </div>
         </template>
       </el-table-column>

src/views/archivesManage/outInStorage/outStorage/index.vue

@@ -25,13 +25,13 @@
           <span v-if="scope.row.storageType===3" class="clear" style="width:56px">待出</span>
         </template>
       </el-table-column>
-      <el-table-column prop="depositNum" label="已装" align="center" min-width="90" />
+      <el-table-column prop="depositNum" label="已装" align="center" min-width="80" />
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="150" />
       <el-table-column prop="tid" align="center" label="TID" min-width="200" />
       <el-table-column prop="barcode" label="条形码" align="center" min-width="150" />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
-          <div v-if="scope.row.folderLocationDetails.includes(',')">
+          <div v-if="scope.row.folderLocationDetails && scope.row.folderLocationDetails.includes(',')">
             <el-tag
               v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
               :key="index"
@@ -42,7 +42,7 @@
             </el-tag>
           </div>
           <div v-else>
-            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+            <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
           </div>
         </template>
       </el-table-column>

src/views/dashboard/PanelGroup.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+            <count-to :start-val="0" :end-val="archivesNum" :duration="3200" class="card-panel-num" />
           </div>
           档案总量
         </div>
@@ -20,7 +20,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+            <count-to :start-val="0" :end-val="caseNum" :duration="3200" class="card-panel-num" />
           </div>
           档案盒总量
         </div>
@@ -70,14 +70,36 @@
 
 <script>
 import CountTo from 'vue-count-to'
-
+import { FetchGetArchivesNum, FetchGetCaseNum } from '@/api/archivesManage/statistics'
 export default {
   components: {
     CountTo
   },
+  data() {
+    return {
+      archivesNum: 0,
+      caseNum: 0
+    }
+  },
+  mounted() {
+    this.handleArchivesNum()
+    this.handleCaseNum()
+  },
   methods: {
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
+    },
+    // 档案总数
+    handleArchivesNum() {
+      FetchGetArchivesNum().then(data => {
+        this.archivesNum = data
+      })
+    },
+    // 档案盒总数
+    handleCaseNum() {
+      FetchGetCaseNum().then(data => {
+        this.caseNum = data
+      })
     }
   }
 }