From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git
---
src/components/makepager/TableCommonView.vue | 139 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 121 insertions(+), 18 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 70254b3..d4bc001 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -1,6 +1,6 @@
<!-- eslint-disable vue/no-use-v-if-with-v-for -->
<template>
- <div :class="{ 'table-view': true, table_height: !showSummary }" v-loading="loading">
+ <div class="table-view" v-loading="loading">
<el-table
ref="table"
border
@@ -22,7 +22,7 @@
:summary-method="getSummaries"
:show-summary="showSummary"
>
- <el-table-column v-if="tableList.selectBox" type="selection" width="40"> </el-table-column>
+ <el-table-column v-if="tableList.selectBox" type="selection" width="40" :selectable="selectable"> </el-table-column>
<el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"> </el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
@@ -33,6 +33,7 @@
:min-width="item.min"
show-overflow-tooltip
:sortable="item.sortable"
+ :align="item.textAlign"
v-if="item.isShowColumn"
>
<template slot-scope="scope">
@@ -42,9 +43,9 @@
<span
class="Badge"
:class="{
- greenSlot: scope.row.status == '4',
+ greenSlot: scope.row.status == '4' || scope.row.status == '瀹屾垚',
redSlot: scope.row.status == '5',
- blueSlot: scope.row.status == '3',
+ blueSlot: scope.row.status == '3' || scope.row.status == '灏辩华',
graySlot: scope.row.status == '1'
}"
>{{
@@ -62,10 +63,10 @@
:style="{
color: new Date().getTime() > new Date(scope.row[item.prop]).getTime() ? '#D23F3A' : '#606266'
}"
- >{{ timeAgo(scope.row[item.prop]) }}</span
+ >{{ scope.row[item.prop] }}</span
>
<div v-else-if="item.conversion">
- <span>{{ item.getStatus(scope.row[item.prop]) }}</span>
+ <p class="exceed_width">{{ item.getStatus(scope.row[item.prop]) }}</p>
</div>
<span
v-else-if="item.isClick && scope.row[item.prop]"
@@ -101,6 +102,10 @@
export default {
name: "TableCommonView",
props: {
+ warehouseId:{
+ type:Number,
+ default:0
+ },
tableList: {
type: Object,
default: () => {
@@ -115,7 +120,7 @@
highlight: false,
tableColumn: [
// table琛ㄥ崟
- { label: "", prop: "", min: 200, tooltip: true }
+ { label: "", prop: "", min: 200, tooltip: true, textAlign: "center" }
]
}
},
@@ -150,6 +155,15 @@
showSummary: {
type: Boolean,
default: false
+ },
+ // 鍒楄〃涓嶅彲閫夌殑鏁版嵁
+ selectBoxList: {
+ type: Array,
+ default: () => []
+ },
+ name:{
+ type:String,
+ default:''
}
},
data() {
@@ -209,12 +223,20 @@
},
// 鍗曢�夎鐩稿叧
tableRowClassName({ row }) {
- if (Object.keys(this.selectClassRow).length > 0) {
- if (row.id == this.selectClassRow.id) {
- return "onSelect"
+ if(this.$route.query.workType!=1){
+ if(Object.keys(this.selectClassRow).length>0&&this.selectClassRow.location){
+ if(this.selectClassRow.id==row.id&&this.selectClassRow.location.warehouseId==row.location.warehouseId&&row.location.name==this.selectClassRow.location.name){
+ return "onSelect";
+ }
+ }
+ } else{
+ if (Object.keys(this.selectClassRow).length > 0) {
+ if (row.id == this.selectClassRow.id) {
+ return "onSelect"
+ }
+ }
}
- }
- this.$emit("tableRowClassName", row)
+ this.$emit("tableRowClassName", row);
},
timeAgo(val) {
return timeago(val)
@@ -231,7 +253,7 @@
}
this.tableList.countcol.forEach((countcols) => {
if (column.label === countcols) {
- const values = data.map((item) => Number(item[column.property]))
+ const values = (data||[]).map((item) => Number(item[column.property]))
if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
@@ -241,7 +263,8 @@
return prev
}
}, 0)
- sums[index] = this.tableList.tableColumn[index - 1].unit + "" + sums[index]
+ let unitIndex = this.tableList.tableColumn.findIndex((obj) => obj.label === column.label)
+ sums[index] = this.tableList.tableColumn[unitIndex].unit + sums[index]
} else {
sums[index] = ""
}
@@ -251,6 +274,28 @@
})
})
return sums
+ }
+ },
+ selectable(row) {
+ let prop='id'
+ if(this.name=='product'){
+ prop='productId'
+ }
+ if(this.$route.query.workType!=1){
+ const flag= this.selectBoxList.some(item=>{
+ if(item.location){
+ return item[prop]==row.id&&item.location.warehouseId==row.location.warehouseId&&item.location.name==row.location.name;
+ }
+ return false;
+ })
+ return !flag;
+ }else{
+ let list = (this.selectBoxList||[]).map((item) => item[prop])
+ if (list.findIndex((v) => v == row.id) == -1) {
+ return true
+ } else {
+ return false
+ }
}
}
}
@@ -298,16 +343,18 @@
.styleBtn {
position: absolute;
width: 30px;
- height: 48px;
+ height: 35px;
// line-height: 26px;
- background: #f1f3f8;
+ background: transparent;
border-top-right-radius: 8px;
top: 0px;
right: 2px;
- // z-index: 9999;
+ display: flex;
+ align-items: center;
+ z-index: 9999;
.label {
position: absolute;
- top: 12px;
+ top: 6px;
font-size: 20px;
cursor: pointer;
color: #000;
@@ -344,6 +391,62 @@
border-top-left-radius: 12px;
border-top-right-radius: 12px;
overflow: auto;
+ .exceed_width {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
}
+
+::v-deep .el-table .cell {
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
+ color: rgba(0, 0, 0, 0.9);
+ .el-button--text {
+ width: auto;
+ height: auto;
+ font-family: PingFangSC-Medium, sans-serif;
+ }
+}
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
+
+::v-deep {
+ .el-table .cell .el-button--text.el-button--small {
+ padding: 4px 0;
+ }
+ .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+ }
+ .el-table__body-wrapper {
+ height: unset !important;
+ }
+ .el-table__cell.is-left {
+ text-align: left !important;
+ }
+ .el-table__cell.is-right {
+ text-align: right !important;
+ }
+ .el-table::before{ width: 0px; }
+}
+.overSpread1 {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0);
+ z-index: 10;
+}
+.el-table__cell {
+ text-align: unset !important;
+}
</style>
--
Gitblit v1.8.0