|
|
@@ -205,6 +205,19 @@
|
|
|
</el-breadcrumb>
|
|
|
</div>
|
|
|
<div class="conten">
|
|
|
+ <!-- 顶部 -->
|
|
|
+ <div class="conten_top">
|
|
|
+ <h3>{{ myObj.name }}</h3>
|
|
|
+ <div v-if="myObj.status === '已入库'">已入库</div>
|
|
|
+ <div
|
|
|
+ v-else-if="myObj.status === '待入库'"
|
|
|
+ style="background-color: #ccc"
|
|
|
+ >
|
|
|
+ 待入库
|
|
|
+ </div>
|
|
|
+ <div v-else style="background-color: #85ce61">已出库</div>
|
|
|
+
|
|
|
+ </div>
|
|
|
<div class="daochu">
|
|
|
<el-button
|
|
|
v-if="userLimits.edit"
|
|
|
@@ -229,17 +242,6 @@
|
|
|
<img :src="baseURL + myObj.thumb" alt="" :onerror="defaultImg" />
|
|
|
</div>
|
|
|
<div class="conten_right">
|
|
|
- <div class="title">
|
|
|
- <h3>{{ myObj.name }}</h3>
|
|
|
- <div v-if="myObj.status === '已入库'">已入库</div>
|
|
|
- <div
|
|
|
- v-else-if="myObj.status === '待入库'"
|
|
|
- style="background-color: #ccc"
|
|
|
- >
|
|
|
- 待入库
|
|
|
- </div>
|
|
|
- <div v-else style="background-color: #85ce61">已出库</div>
|
|
|
- </div>
|
|
|
<div class="info">
|
|
|
<div class="row">
|
|
|
<div>
|
|
|
@@ -404,7 +406,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div style="height: 39px">
|
|
|
+ <div style="height: 36px">
|
|
|
<span>入库位置</span>
|
|
|
<el-cascader
|
|
|
ref="cascaderAddr"
|
|
|
@@ -445,10 +447,7 @@
|
|
|
</div>
|
|
|
<!-- 表格 -->
|
|
|
<el-table
|
|
|
- :header-cell-style="{
|
|
|
- background: 'rgba(62, 94, 179, .5)',
|
|
|
- color: '#404040',
|
|
|
- }"
|
|
|
+ :header-cell-style="{ background: '#d8dff0', color: '#404040' }"
|
|
|
:data="tableData"
|
|
|
border
|
|
|
style="width: 100%"
|
|
|
@@ -531,10 +530,7 @@
|
|
|
<el-dialog title="操作记录" :visible.sync="dialogTableVisible">
|
|
|
<el-table
|
|
|
:data="gridData"
|
|
|
- :header-cell-style="{
|
|
|
- background: 'rgba(62, 94, 179, .5)',
|
|
|
- color: '#404040',
|
|
|
- }"
|
|
|
+ :header-cell-style="{ background: '#d8dff0', color: '#404040' }"
|
|
|
border
|
|
|
>
|
|
|
<el-table-column label="序号" width="50" :resizable="false">
|
|
|
@@ -894,7 +890,7 @@ body .el-table::before {
|
|
|
color: #3e5eb3;
|
|
|
margin: 4px;
|
|
|
}
|
|
|
- .title {
|
|
|
+ .title {
|
|
|
display: flex;
|
|
|
border-bottom: 2px solid #ccc;
|
|
|
height: 40px;
|
|
|
@@ -917,13 +913,19 @@ body .el-table::before {
|
|
|
border-radius: 5px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.info {
|
|
|
- margin: 10px 0 0 55px;
|
|
|
+ border:1px solid #ccc;
|
|
|
+ border-right: none;
|
|
|
+ border-bottom: none;
|
|
|
+ margin: 0px 0 0 55px;
|
|
|
// max-height: 370px;
|
|
|
// overflow-y: auto;
|
|
|
width: 90%;
|
|
|
// margin-bottom: 60px;
|
|
|
.row {
|
|
|
+ border-bottom: 1px solid #ccc;
|
|
|
+ border-right: 1px solid #ccc;
|
|
|
/deep/.el-input__inner {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
@@ -944,18 +946,18 @@ body .el-table::before {
|
|
|
// padding: 7px 20px;
|
|
|
// height: 33px;
|
|
|
display: flex;
|
|
|
- height: 37px;
|
|
|
+ height: 36px;
|
|
|
align-items: center;
|
|
|
- border: 1px solid #ccc;
|
|
|
+ // border: 1px solid #ccc;
|
|
|
font-size: 16px;
|
|
|
color: black;
|
|
|
span {
|
|
|
display: block;
|
|
|
width: 112px;
|
|
|
- height: 37px;
|
|
|
- line-height: 37px;
|
|
|
+ height: 36px;
|
|
|
+ line-height: 36px;
|
|
|
text-align: center;
|
|
|
- background-color: #d9d9d9;
|
|
|
+ background-color: #f0eff2;
|
|
|
font-weight: 700;
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
@@ -1008,11 +1010,34 @@ body .el-table::before {
|
|
|
}
|
|
|
}
|
|
|
.conten {
|
|
|
+ .conten_top{
|
|
|
+ width: 100%;
|
|
|
+ display: flex;
|
|
|
+ border-bottom: 2px solid #ccc;
|
|
|
+ height: 50px;
|
|
|
+ align-items: center;
|
|
|
+ margin-right: 62px;
|
|
|
+ h3 {
|
|
|
+ font-size: 20px;
|
|
|
+ color: black;
|
|
|
+ margin: 0 25px 0 0px;
|
|
|
+ }
|
|
|
+ & > div {
|
|
|
+ padding: 0 5px;
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+ height: 20px;
|
|
|
+ background-color: #3e5eb3;
|
|
|
+ color: #fff;
|
|
|
+ font-size: 13px;
|
|
|
+ border-radius: 5px;
|
|
|
+ } }
|
|
|
position: relative;
|
|
|
.daochu {
|
|
|
position: absolute;
|
|
|
right: 80px;
|
|
|
- top: 12px;
|
|
|
+ top: 18px;
|
|
|
}
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
@@ -1021,9 +1046,10 @@ body .el-table::before {
|
|
|
margin: 0 20px 40px;
|
|
|
padding: 10px 0 0 40px;
|
|
|
.conten_left {
|
|
|
+ margin-top: -34px;
|
|
|
width: 465px;
|
|
|
- height: 460px;
|
|
|
- background-color: rgba(64, 64, 64, 0.9);
|
|
|
+ height: 409px;
|
|
|
+ background-color: #f1f2f6;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
img {
|
|
|
@@ -1035,8 +1061,9 @@ body .el-table::before {
|
|
|
}
|
|
|
.conten_right {
|
|
|
flex: 1;
|
|
|
- max-height: 460px;
|
|
|
+ max-height: 410px;
|
|
|
overflow-y: auto;
|
|
|
+ margin-top: -34px;
|
|
|
}
|
|
|
.conten_bot {
|
|
|
margin-top: -40px;
|
|
|
@@ -1082,10 +1109,14 @@ body .el-table::before {
|
|
|
}
|
|
|
#myPdfCon{
|
|
|
.info{
|
|
|
+ border:none;
|
|
|
.row{
|
|
|
- height: auto;
|
|
|
- display: inline;
|
|
|
+ border:none;
|
|
|
+ height: 0;
|
|
|
+ display: inline;
|
|
|
&>div {
|
|
|
+ border:1px solid #ccc;
|
|
|
+ border-top:none;
|
|
|
min-height: 37px;
|
|
|
position: relative;
|
|
|
flex-wrap: wrap;
|
|
|
@@ -1094,7 +1125,7 @@ body .el-table::before {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
- min-height: 37px;
|
|
|
+ min-height: 35px;
|
|
|
position: absolute;
|
|
|
left: 0;
|
|
|
top: 0;
|