|
@@ -44,8 +44,8 @@
|
|
<ws-form class='right-content'>
|
|
<ws-form class='right-content'>
|
|
<div class="left">
|
|
<div class="left">
|
|
<div class="tab">
|
|
<div class="tab">
|
|
- <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重({{mList.length}})</div>
|
|
|
|
- <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重({{pList.length}})</div>
|
|
|
|
|
|
+ <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重({{mListTop.length}})</div>
|
|
|
|
+ <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重({{pListTop.length}})</div>
|
|
</div>
|
|
</div>
|
|
<div class="title">基本信息</div>
|
|
<div class="title">基本信息</div>
|
|
<ws-info-table>
|
|
<ws-info-table>
|
|
@@ -112,13 +112,15 @@
|
|
<el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
|
|
<el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <div class="right">
|
|
|
|
|
|
+ <div class="car-right">
|
|
<el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
|
|
<el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
|
|
- style="width: 100%;overflow:auto;height: calc(100% - 32px);">
|
|
|
|
|
|
+ style="width: 100%;overflow:auto;height:680px">
|
|
<el-table-column property="number" label="编号">
|
|
<el-table-column property="number" label="编号">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column property="carNumber" label="车牌号">
|
|
<el-table-column property="carNumber" label="车牌号">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
+ <el-table-column property="status" label="状态">
|
|
|
|
+ </el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<div style="text-align: center">
|
|
<div style="text-align: center">
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
@@ -234,6 +236,10 @@
|
|
warehouseName: '',
|
|
warehouseName: '',
|
|
result1: '00',
|
|
result1: '00',
|
|
allowEdit: 0,
|
|
allowEdit: 0,
|
|
|
|
+ mListTop:[],
|
|
|
|
+ mListBottom:[],
|
|
|
|
+ pListTop:[],
|
|
|
|
+ pListBottom:[]
|
|
}
|
|
}
|
|
},
|
|
},
|
|
activated() {
|
|
activated() {
|
|
@@ -339,14 +345,21 @@
|
|
continue
|
|
continue
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
|
|
|
|
- this.mList.push(_list[i])
|
|
|
|
|
|
+ if (_list[i].status == '已质检') {
|
|
|
|
+ this.mListTop.push(_list[i])
|
|
}
|
|
}
|
|
-
|
|
|
|
- if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
|
|
|
|
- this.pList.push(_list[i])
|
|
|
|
|
|
+ if (_list[i].status == '已称毛重') {
|
|
|
|
+ this.mListBottom.push(_list[i])
|
|
|
|
+ }
|
|
|
|
+ if (_list[i].status == '已称皮重') {
|
|
|
|
+ this.pListBottom.push(_list[i])
|
|
|
|
+ }
|
|
|
|
+ if (_list[i].status == '已称毛重') {
|
|
|
|
+ this.pListTop.push(_list[i])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ this.mList= this.mListTop.concat(this.mListBottom)
|
|
|
|
+ this.pList= this.pListTop.concat(this.pListBottom)
|
|
if (this.information == '毛重') {
|
|
if (this.information == '毛重') {
|
|
this.index = 0
|
|
this.index = 0
|
|
this.carList = this.mList
|
|
this.carList = this.mList
|
|
@@ -414,6 +427,10 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
tabClick(val) {
|
|
tabClick(val) {
|
|
|
|
+ this.mListTop=[]
|
|
|
|
+ this.mListBottom=[]
|
|
|
|
+ this.pListTop=[]
|
|
|
|
+ this.pListBottom=[]
|
|
this.carWeightInfo.carNumber = ''
|
|
this.carWeightInfo.carNumber = ''
|
|
this.weighingList = []
|
|
this.weighingList = []
|
|
this.index = val
|
|
this.index = val
|
|
@@ -828,6 +845,7 @@
|
|
|
|
|
|
.ws-info-table {
|
|
.ws-info-table {
|
|
border: none;
|
|
border: none;
|
|
|
|
+ height: 610px;
|
|
}
|
|
}
|
|
|
|
|
|
.ws-info-table .el-form-item {
|
|
.ws-info-table .el-form-item {
|
|
@@ -872,6 +890,8 @@
|
|
}
|
|
}
|
|
|
|
|
|
.substance {
|
|
.substance {
|
|
|
|
+ padding-bottom: 20px;
|
|
|
|
+ overflow-y: scroll;
|
|
.active {
|
|
.active {
|
|
background: #5878e8;
|
|
background: #5878e8;
|
|
color: white;
|
|
color: white;
|
|
@@ -926,10 +946,10 @@
|
|
}
|
|
}
|
|
|
|
|
|
.right {
|
|
.right {
|
|
- width: 60%;
|
|
|
|
|
|
+ width: 70%;
|
|
padding: 20px;
|
|
padding: 20px;
|
|
|
|
+ height: 750px;
|
|
background: white;
|
|
background: white;
|
|
- margin-right: 20px;
|
|
|
|
border-radius: 10px;
|
|
border-radius: 10px;
|
|
|
|
|
|
.tab {
|
|
.tab {
|
|
@@ -1040,7 +1060,6 @@
|
|
|
|
|
|
.right-content {
|
|
.right-content {
|
|
display: flex;
|
|
display: flex;
|
|
- height: 100%;
|
|
|
|
|
|
|
|
.left {
|
|
.left {
|
|
position: relative;
|
|
position: relative;
|
|
@@ -1049,7 +1068,6 @@
|
|
position: absolute;
|
|
position: absolute;
|
|
left: 0;
|
|
left: 0;
|
|
right: 0;
|
|
right: 0;
|
|
- bottom: 20px;
|
|
|
|
margin: auto;
|
|
margin: auto;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1057,7 +1075,9 @@
|
|
.left,
|
|
.left,
|
|
.right {
|
|
.right {
|
|
width: 50%;
|
|
width: 50%;
|
|
- height: 100%;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .car-right{
|
|
|
|
+ width: 50%;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|