档案盘点

src/assets/styles/archives-manage.scss

@@ -579,3 +579,96 @@ $arcCyan: #0FBED9;
     margin: 2px 0 !important;
   }
 }
+
+
+::v-deep .el-table .el-table__header-wrapper,
+.el-table .el-table__header{
+  th.el-table__cell{
+    &.yingp {
+      .cell{
+        color: #fff !important;
+      }
+    }
+    &.yip {
+      .cell{
+        color: #1aae93 !important;
+      }
+    }
+    &.weip {
+      .cell{
+        color: #f65163 !important;
+      }
+    }
+    &.yij {
+      .cell{
+        color: #1aae93 !important;
+      }
+    }
+    &.yic {
+      .cell{
+        color: #f65163 !important;
+      }
+    }
+    &.cuow {
+      .cell{
+        color: #fd8042 !important;
+      }
+    }
+    &.dp {
+      .cell{
+        color: #8378E8 !important;
+      }
+    }
+
+  }
+}
+
+::v-deep .el-table .el-table__body-wrapper, 
+.el-table .el-table__fixed-right {
+  td.el-table__cell{
+    &.yingp {
+      .cell span{
+        
+        color: #fff !important;
+      }
+    }
+    &.yip {
+      .cell span{
+        border: 1px solid #1aae93 !important;
+        color: #fff !important;
+        background-color:  #1aae93 !important;
+      }
+    }
+    &.weip {
+      .cell span{
+        border: 1px solid #f65163 !important;
+        color: #f65163 !important;
+      }
+    }
+    &.yij {
+      .cell span{
+        border: 1px solid #1aae93 !important;
+        color: #1aae93 !important;
+      }
+    }
+    &.yic {
+      .cell span{
+        border: 1px solid #f65163 !important;
+        color: #fff !important;
+        background-color:  #f65163 !important;
+      }
+    }
+    &.cuow {
+      .cell span{
+        border: 1px solid #fd8042 !important;
+        color: #fd8042 !important;
+      }
+    }
+    &.dp {
+      .cell span{
+        border: 1px solid #8378E8 !important;
+        color: #8378E8 !important;
+      }
+    }
+  }
+}

src/views/archivesManage/archivesCheck/index.vue

@@ -36,11 +36,21 @@
         <rrOperation />
       </div>
       <div>
+
         <el-button size="mini" icon="el-icon-brush" style="background:#1aae93;border:none;" @click="handleClear">清空缓存</el-button>
       </div>
       <!-- <crudOperation :permission="permission" /> -->
     </div>
-    <div class="container-wrap" style="min-height: calc(100vh - 242px)">
+    <div style="padding-bottom: 10px; font-weight: bold; color: #fff;font-size: 12px; text-align: right; cursor: pointer;" @click="handleTipContent">
+      <i style="font-size:14px; color:#f65163; margin-right: 2px;" class="el-icon-warning" />提示：应盘 =
+      <span style="color: #1aae93;">已盘</span>+
+      <span style="color: #1aae93;">已借</span>+
+      <span style="color: #fd8042;">错位</span>+
+      <span style="color: #f65163;">未盘</span>+
+      <span style="color: #f65163;">异常</span>
+      <span style="display: inline-block; padding-left: 20px;"><i style="font-style:normal; color: #8378E8; padding: 0 2px;">多盘</i>为非本盘点单计数</span>
+    </div>
+    <div class="container-wrap" style="min-height: calc(100vh - 262px)">
       <span class="right-top-line" />
       <span class="left-bottom-line" />
       <!--表格渲染-->
@@ -50,7 +60,8 @@
         :cell-class-name="cell"
         :loading="crud.downloadLoading"
         style="min-width: 100%"
-        height="calc(100vh - 315px)"
+        height="calc(100vh - 322px)"
+        :header-cell-class-name="headerRowStyle"
         @selection-change="selectionChangeHandler"
         @row-click="clickRowHandler"
         @row-dblclick="handleDbClick"
@@ -58,25 +69,50 @@
         <el-table-column type="selection" align="center" width="55" />
         <el-table-column prop="id" show-overflow-tooltip align="center" label="盘点单号" min-width="140" />
         <el-table-column prop="region" show-overflow-tooltip align="center" label="包含位置" min-width="100" />
-        <el-table-column prop="archiveYears" show-overflow-tooltip align="center" label="年度" min-width="60" />
+        <el-table-column prop="archiveYears" show-overflow-tooltip align="center" label="年度" min-width="80" />
         <el-table-column prop="checkState" align="center" label="盘点状态" min-width="80">
           <template slot-scope="scope">
             <!-- 已执行 / 待执行 / 执行中 -->
             <span class="clear">{{ scope.row.checkState | checkState }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="should" align="center" label="应盘" min-width="60" />
-        <el-table-column prop="checked" align="center" label="已盘" min-width="60" />
-        <el-table-column prop="noCheck" align="center" label="未盘" min-width="60" />
+        <el-table-column prop="should" align="center" label="应盘" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.should !== 0 ? '#fff': ''}">{{ scope.row.should }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checked" align="center" label="已盘" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.checked !== 0 ? '#1aae93': ''}">{{ scope.row.checked }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="borrowed" align="center" label="已借" min-width="60">
           <template slot-scope="scope">
             <span v-if="scope.row.arrangeType===1">-</span>
-            <span v-if="scope.row.arrangeType===2">{{ scope.row.borrowed }}</span>
+            <span v-if="scope.row.arrangeType===2" :style="{'color': scope.row.borrowed !== 0 ? '#1aae93': ''}">{{ scope.row.borrowed }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="dislocation" align="center" label="错位" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.dislocation !== 0 ? '#fd8042': ''}">{{ scope.row.dislocation }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="noCheck" align="center" label="未盘" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.noCheck !== 0 ? '#f65163': ''}">{{ scope.row.noCheck }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="checked" align="center" label="已盘档案" min-width="60" /> -->
-        <el-table-column prop="abnormal" align="center" label="异常" min-width="60" />
-        <el-table-column prop="dislocation" align="center" label="错位" min-width="60" />
+        <el-table-column prop="abnormal" align="center" label="异常" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.abnormal !== 0 ? '#f65163': ''}">{{ scope.row.abnormal }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="surplus" align="center" label="多盘" min-width="60">
+          <template slot-scope="scope">
+            <span :style="{'color': scope.row.surplus !== 0 ? '#8378E8': ''}">{{ scope.row.surplus }}</span>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="others" align="center" label="多余档案" min-width="60" /> -->
         <el-table-column prop="create_time" align="center" label="创建时间" min-width="120">
           <template slot-scope="scope">
@@ -111,6 +147,35 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 盘点状态说明 -->
+    <el-dialog title="盘点结果说明" :visible.sync="tipContentVisible" :before-close="handleClose">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <div class="dialog-delt">
+          <div style="font-size: 16px;">
+            应盘 =
+            <span style="color: #1aae93;">已盘</span> +
+            <span style="color: #1aae93;">已借</span> +
+            <span style="color: #fd8042;">错位</span> +
+            <span style="color: #f65163;">未盘</span> +
+            <span style="color: #f65163;">异常</span>
+          </div>
+          <ul class="checkTip">
+            <li><span style="font-weight:bold;">应盘</span>当前盘点单中涉及到的全部档案文件或档案盒的数量</li>
+            <li><span style="font-weight:bold;color: #1aae93;">已盘</span>正确的档案文件或档案盒在正确的位置被盘点到</li>
+            <li><span style="font-weight:bold;color: #1aae93;">已借</span>在当前盘点单中，已经借出的档案文件（按盒盘点时，无已借数量）</li>
+            <li><span style="font-weight:bold;color: #fd8042;">错位</span>在当前盘点单中，盘点到不属于当前位置的档案文件或档案盒</li>
+            <li><span style="font-weight:bold;color: #f65163;">未盘</span>在当前盘点单中，未被盘点到的档案文件或档案盒（默认状态）</li>
+            <li><span style="font-weight:bold;color: #f65163;">异常</span>在按件盘点时，已借档案被盘点到，盘点时自动变更状态；在按盒盘点时，盒内档案数量异常，盘点时手动变更状态</li>
+            <li><span style="font-weight:bold;color: #8378E8;">多盘</span>不在当前盘点单中但被盘点到的档案文件或档案盒</li>
+          </ul>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click.native="tipContentVisible = false">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
     <!-- 新增模态框 -->
     <addCheck ref="addCheckDom" />
     <!-- 盘点详情 -->
@@ -179,15 +244,40 @@ export default {
         { value: 'region', label: '区域' },
         { value: 'orderNo', label: '盘点单号' }
       ],
-      deleteVisible: false
+      deleteVisible: false,
+      tipContentVisible: false
     }
   },
   computed: {
     ...mapGetters([
       'baseApi'
     ])
+
   },
   methods: {
+    headerRowStyle(obj) {
+      if (obj.column.label === '应盘') {
+        return 'yingp'
+      }
+      if (obj.column.label === '已盘') {
+        return 'yip'
+      }
+      if (obj.column.label === '未盘') {
+        return 'weip'
+      }
+      if (obj.column.label === '已借') {
+        return 'yij'
+      }
+      if (obj.column.label === '异常') {
+        return 'yic'
+      }
+      if (obj.column.label === '错位') {
+        return 'cuow'
+      }
+      if (obj.column.label === '多盘') {
+        return 'dp'
+      }
+    },
     // 获取数据前的处理
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.downloadLoading = true
@@ -269,6 +359,7 @@ export default {
     },
     handleClose() {
       this.deleteVisible = false
+      this.tipContentVisible = false
     },
     cell({ row, columnIndex }) {
       if (row.checkState === 2 && columnIndex === 4) {
@@ -310,6 +401,9 @@ export default {
       }
       exportFile(this.baseApi + '/api/arrange/exportArrange?' + qs.stringify(params, { indices: false }))
       this.btnLoading = false
+    },
+    handleTipContent() {
+      this.tipContentVisible = true
     }
 
   }
@@ -319,6 +413,7 @@ export default {
 <style lang="scss" scoped>
 @import '~@/assets/styles/lend-manage.scss';
 @import "~@/assets/styles/archives-manage.scss";
+
 .head-container {
   color: #fff;
   display: flex;
@@ -337,4 +432,13 @@ export default {
 ::v-deep .input-prepend .el-input__inner{
   padding-left: 94px;
 }
+.checkTip{
+  margin-top: 20px;
+  li{
+    span{
+      display: inline-block;
+      padding-right: 20px;
+    }
+  }
+}
 </style>

src/views/archivesManage/archivesCheck/module/checkDetail.vue

@@ -4,27 +4,52 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <el-table :data="rowData" :cell-class-name="cellTop" style="margin:5px 0 15px 0; width:100%;" height="calc(25vh - 137px)">
+        <el-table :data="rowData" :cell-class-name="cellTop" :header-cell-class-name="headerRowStyle" style="margin:5px 0 15px 0; width:100%;" height="calc(25vh - 137px)">
           <el-table-column prop="id" align="center" show-overflow-tooltip label="盘点单号" min-width="160" />
           <el-table-column prop="region" align="center" label="所在区域" show-overflow-tooltip min-width="120" />
-          <el-table-column prop="archiveYears" show-overflow-tooltip align="center" label="年度" min-width="60" />
-          <el-table-column prop="checkState" align="center" label="盘点状态" min-width="90">
+          <el-table-column prop="archiveYears" show-overflow-tooltip align="center" label="年度" min-width="100" />
+          <el-table-column prop="checkState" align="center" label="盘点状态" min-width="100">
             <template slot-scope="scope">
               <span class="clear">{{ scope.row.checkState | checkState }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="should" align="center" label="应盘" min-width="60" />
-          <el-table-column prop="checked" align="center" label="已盘" min-width="60" />
-          <el-table-column prop="noCheck" align="center" label="未盘" min-width="60" />
+          <el-table-column prop="should" align="center" label="应盘" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.should !== 0 ? '#fff': ''}">{{ scope.row.should }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="checked" align="center" label="已盘" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.checked !== 0 ? '#1aae93': ''}">{{ scope.row.checked }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="borrowed" align="center" label="已借" min-width="60">
             <template slot-scope="scope">
-              <span v-if="arrangeType===1">-</span>
-              <span v-if="arrangeType===2">{{ scope.row.borrowed }}</span>
+              <span v-if="scope.row.arrangeType===1">-</span>
+              <span v-if="scope.row.arrangeType===2" :style="{'color': scope.row.borrowed !== 0 ? '#1aae93': ''}">{{ scope.row.borrowed }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="dislocation" align="center" label="错位" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.dislocation !== 0 ? '#fd8042': ''}">{{ scope.row.dislocation }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="noCheck" align="center" label="未盘" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.noCheck !== 0 ? '#f65163': ''}">{{ scope.row.noCheck }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="correct" align="center" label="在库档案" min-width="60" /> -->
-          <el-table-column prop="abnormal" align="center" label="异常" min-width="60" />
-          <el-table-column prop="dislocation" align="center" label="错位" min-width="60" />
+          <el-table-column prop="abnormal" align="center" label="异常" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.abnormal !== 0 ? '#f65163': ''}">{{ scope.row.abnormal }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="surplus" align="center" label="多盘" min-width="60">
+            <template slot-scope="scope">
+              <span :style="{'color': scope.row.surplus !== 0 ? '#8378E8': ''}">{{ scope.row.surplus }}</span>
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="others" align="center" label="其他档案" min-width="60" /> -->
           <el-table-column prop="create_time" align="center" label="创建时间" min-width="150">
             <template slot-scope="scope">
@@ -82,7 +107,7 @@
           <el-table-column prop="storageNum" align="center" label="在库" min-width="60" />
           <el-table-column prop="borrowNum" align="center" label="已借" min-width="60" />
           <el-table-column prop="caseName" label="盒名称" :show-overflow-tooltip="true" align="center" min-width="190" />
-          <el-table-column prop="tid" label="TID" align="center" min-width="180" />
+          <el-table-column prop="tid" label="TID" align="center" min-width="220" />
           <el-table-column prop="barcode" label="条形码" align="center" min-width="120" />
           <el-table-column label="存放位置" align="center" min-width="300">
             <template slot-scope="scope">
@@ -123,6 +148,8 @@ export default {
           return '未盘'
         case 5:
           return '异常'
+        case 6:
+          return '多盘'
       }
     }
   },
@@ -137,46 +164,54 @@ export default {
   },
   methods: {
     cellTop({ row, columnIndex }) {
-      if (row.checkState === 2 && columnIndex === 2) {
+      if (row.checkState === 2 && columnIndex === 3) {
         return 'have-clear'
-      } else if (row.checkState === 0 && columnIndex === 2) {
+      } else if (row.checkState === 0 && columnIndex === 3) {
         return 'fail-clear'
-      } else if (row.checkState === 1 && columnIndex === 2) {
+      } else if (row.checkState === 1 && columnIndex === 3) {
         return 'no-clear'
       }
     },
+    headerRowStyle(obj) {
+      if (obj.column.label === '应盘') {
+        return 'yingp'
+      }
+      if (obj.column.label === '已盘') {
+        return 'yip'
+      }
+      if (obj.column.label === '未盘') {
+        return 'weip'
+      }
+      if (obj.column.label === '已借') {
+        return 'yij'
+      }
+      if (obj.column.label === '异常') {
+        return 'yic'
+      }
+      if (obj.column.label === '错位') {
+        return 'cuow'
+      }
+      if (obj.column.label === '多盘') {
+        return 'dp'
+      }
+    },
     cell({ row, columnIndex }) {
       if (row.checkResult === 1 && columnIndex === 1) { // 已盘
-        return 'have-clear-bg'
+        return 'yip'
       } else if (row.checkResult === 2 && columnIndex === 1) { // 已借
-        return 'have-clear'
+        return 'yij'
       } else if (row.checkResult === 3 && columnIndex === 1) { // 错位
-        return 'fail-clear'
+        return 'cuow'
       } else if (row.checkResult === 4 && columnIndex === 1) { // 未盘
-        return 'no-clear-bg'
+        return 'weip'
       } else if (row.checkResult === 5 && columnIndex === 1) { // 异常
-        return 'error-clear-bg'
+        return 'yic'
+      } else if (row.checkResult === 6 && columnIndex === 1) { // 多盘
+        return 'dp'
       }
     }
   }
 }
-// cell({ row, columnIndex }) {
-//   if (row.checkResult === 0 && columnIndex === 1) { // 未盘
-//     return 'no-clear-bg'
-//   } else if (row.checkResult === 1 && columnIndex === 1) { // 在库
-//     return 'no-clear'
-//   } else if (row.checkResult === 2 && columnIndex === 1) { // 已盘
-//     return 'have-clear-bg'
-//   } else if (row.checkResult === 3 && columnIndex === 1) { // 错位
-//     return 'fail-clear'
-//   } else if (row.checkResult === 4 && columnIndex === 1) { // 已借
-//     return 'have-clear'
-//   } else if (row.checkResult === 5 && columnIndex === 1) { // 异常
-//     return 'error-clear-bg'
-//   } else if (row.checkResult === 6 && columnIndex === 1) { // 其他
-//     return 'other-clear'
-//   }
-// }
 </script>
 
 <style lang="scss" scoped>