Browse Source

更新

fix_bug_pro20231227
zhangsiyu 2 years ago
parent
commit
7bf1904542
  1. 63
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  2. 4
      vite.config.js

63
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -66,6 +66,28 @@
</div>
</el-scrollbar>
</div>
<div class="tips">
<div>
总货位:
<span class="def">{{ boxdetails.cargoNub }}</span>
</div>
<div>
占用货位:
<span class="red">{{ boxdetails.employNub }}</span>
</div>
<div>
未用货位:
<span class="green">{{ boxdetails.unusedNub }}</span>
</div>
<div>
禁用货位:
<span class="red">{{ boxdetails.disableNub }}</span>
</div>
<div>
货物总数:
<span class="red">{{ boxdetails.goodsNub }}</span>
</div>
</div>
<div class="mabx">
<el-scrollbar max-height="70vh">
<div class="contentbx" :style="contenbxsty">
@ -496,6 +518,7 @@ let details = reactive({
checkselectchangearr: [],
isshowdow: false,
inputtxts1: '',
boxdetails:{}
});
onMounted(() => {
details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@ -716,7 +739,8 @@ async function checkshelves() {
console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');
let arrs = [];
let maxlength = 0;
res.data.data.map(item => {
details.boxdetails=res.data.data
res.data.data.list.map(item => {
if (item.columnNum > maxlength) {
maxlength = item.columnNum;
}
@ -725,7 +749,7 @@ async function checkshelves() {
arrs.push([]);
}
console.log(arrs, 'arrsarrsarrs');
res.data.data.map(item => {
res.data.data.list.map(item => {
arrs[item.columnNum - 1]?.push(item);
});
arrs.map(item => {
@ -2155,6 +2179,7 @@ const checkitem = ite => {
console.log(details.isshowcon, 'details.isshowcondetails.isshowcon');
};
const {
boxdetails,
isshowdow,
inputtxts1,
total,
@ -2221,7 +2246,7 @@ const {
// box-sizing: border-box;
box-sizing: border-box;
.contentbx {
width: calc(150 * var(--length) * 1px);
width: calc(150 * var(--length) * 0.0521vw);
display: flex;
// flex-direction: column;
align-items: flex-end;
@ -2380,4 +2405,36 @@ const {
}
}
}
.tips {
display: flex;
align-items: center;
.exprbuts{
width: 70px;
height: 30px;
color: #666666;
font-size: 12px;
background-color: #fff;
border-radius: 3px;
display: flex;
align-items: center;
justify-content: center;
border: 1.5px solid #E8E8E8;
cursor: pointer;
}
> div {
margin-left: 20px;
}
.def {
color: rgb(30, 159, 255);
font-weight: 600;
}
.red {
color: rgb(255, 87, 34);
font-weight: 600;
}
.green {
color: rgb(95, 184, 120);
font-weight: 600;
}
}
</style>

4
vite.config.js

@ -14,9 +14,9 @@ export default ({ mode, command }) => {
'/api': {
// target: 'http://192.168.10.126:8889',
// target: 'http://192.168.10.48:8888',
// target: 'http://192.168.10.123:8889',
target: 'http://192.168.10.123:8889',
// target: 'http://192.168.10.75:8777',
target: 'http://192.168.10.101:8888',
// target: 'http://192.168.10.101:8888',
// target: 'http://192.168.10.29:13000',
// target: 'http://test.api.huitongys.com',
changeOrigin: true,

Loading…
Cancel
Save