From fed5bfbaf6d45176320cd15861cf7a92ba821d73 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 12 Oct 2023 15:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/archives-manage.scss | 93 +++++++++++++
.../archivesManage/archivesCheck/index.vue | 124 ++++++++++++++++--
.../archivesCheck/module/checkDetail.vue | 107 ++++++++++-----
3 files changed, 278 insertions(+), 46 deletions(-)
diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 080befb..699e030 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/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;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue
index 71ca3f8..d37dd87 100644
--- a/src/views/archivesManage/archivesCheck/index.vue
+++ b/src/views/archivesManage/archivesCheck/index.vue
@@ -36,11 +36,21 @@
+
清空缓存
-
+
+ 提示:应盘 =
+ 已盘+
+ 已借+
+ 错位+
+ 未盘+
+ 异常
+ 多盘为非本盘点单计数
+
+
@@ -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 @@
-
+
{{ scope.row.checkState | checkState }}
-
-
-
+
+
+ {{ scope.row.should }}
+
+
+
+
+ {{ scope.row.checked }}
+
+
-
- {{ scope.row.borrowed }}
+ {{ scope.row.borrowed }}
+
+
+
+
+ {{ scope.row.dislocation }}
+
+
+
+
+ {{ scope.row.noCheck }}
-
-
+
+
+ {{ scope.row.abnormal }}
+
+
+
+
+ {{ scope.row.surplus }}
+
+
@@ -111,6 +147,35 @@
+
+
+
+
+
+
+
+ 应盘 =
+ 已盘 +
+ 已借 +
+ 错位 +
+ 未盘 +
+ 异常
+
+
+ - 应盘当前盘点单中涉及到的全部档案文件或档案盒的数量
+ - 已盘正确的档案文件或档案盒在正确的位置被盘点到
+ - 已借在当前盘点单中,已经借出的档案文件(按盒盘点时,无已借数量)
+ - 错位在当前盘点单中,盘点到不属于当前位置的档案文件或档案盒
+ - 未盘在当前盘点单中,未被盘点到的档案文件或档案盒(默认状态)
+ - 异常在按件盘点时,已借档案被盘点到,盘点时自动变更状态;在按盒盘点时,盒内档案数量异常,盘点时手动变更状态
+ - 多盘不在当前盘点单中但被盘点到的档案文件或档案盒
+
+
+
+
+
@@ -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 {
diff --git a/src/views/archivesManage/archivesCheck/module/checkDetail.vue b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
index c23d92c..a169736 100644
--- a/src/views/archivesManage/archivesCheck/module/checkDetail.vue
+++ b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
@@ -4,27 +4,52 @@
-
+
-
-
+
+
{{ scope.row.checkState | checkState }}
-
-
-
+
+
+ {{ scope.row.should }}
+
+
+
+
+ {{ scope.row.checked }}
+
+
- -
- {{ scope.row.borrowed }}
+ -
+ {{ scope.row.borrowed }}
+
+
+
+
+ {{ scope.row.dislocation }}
+
+
+
+
+ {{ scope.row.noCheck }}
-
-
+
+
+ {{ scope.row.abnormal }}
+
+
+
+
+ {{ scope.row.surplus }}
+
+
@@ -82,7 +107,7 @@
-
+
@@ -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'
-// }
-// }