diff --git a/common/style/layout.css b/common/style/layout.css index 499a170..02a1877 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -247,7 +247,7 @@ uni-button{ align-items: center; font-size: 12px; line-height: 13px; - height: 65px; + height: 40px; color: #fff; background-color: rgba(194, 86, 62, 0.2); padding: 0 5px; @@ -416,7 +416,7 @@ uni-button{ width: 100%; height: 100%; background-color: rgba(0,0,0,0.8); - z-index: 2010; + z-index: 100; } .pop-wraper { position: fixed; @@ -426,7 +426,7 @@ uni-button{ height: 80%; padding: 1% 2%; background: center / 100% 100% url(./static/images/pop_bg.png) no-repeat; - z-index: 2017; + z-index: 102; transition: all .4s; } .pop-wraper_1 { diff --git a/common/style/reset.css b/common/style/reset.css index 2892c62..a731f57 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -154,7 +154,7 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re transform: translateY(0); } .pophide { - transform: translateY(180%); + transform: translateY(120%); } .scale8 { transform: scale(0.8) diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue index 7e5a4d0..5e54cab 100644 --- a/pages/management/in-storage.vue +++ b/pages/management/in-storage.vue @@ -55,12 +55,12 @@ 组织名称 仓库名称 物料编号 - 物料名称 - 规格型号 + 物料名称 单位 库位 数量 {{crType === 'IN'? '已入数量':'已出数量'}} + 剩余数量 库存 @@ -70,12 +70,12 @@ {{el.zzmc}} {{el.ckmc}} {{el.wlbm}} - {{el.wlmc}} - {{el.ggxh}} + {{el.wlmc}} {{el.jldw}} {{el.kwbm}} {{el.sl}} {{el.czsl}} + {{el.sysl}} {{el.kcsl}} @@ -114,8 +114,8 @@ /> - - {{ele.sl}} + + {{ele.sysl}} @@ -334,7 +334,7 @@ if (res.code ===1) { res.result.map(el => { this.$set(el, 'checked', false) - this.$set(el, 'yqty', el.sl) + this.$set(el, 'yqty', el.sysl) }) this.dataList3 = [...res.result] this.show = true @@ -346,8 +346,8 @@ } }, handleBlur (ele) { - if (Number(ele.sl) >= Number(ele.yqty)) { - ele.sl = ele.yqty + if (Number(ele.sysl) >= Number(ele.yqty)) { + ele.sysl = ele.yqty return } ele.checked = true @@ -356,7 +356,7 @@ this.dataList3.map((e, i) => { if (e.id === ele.id) { index = i - obj = Object.assign({}, e, {'checked': false}, {'kwbm': ''}, {id: e.id + Math.random() * 1000}, {sl: Number(e.yqty) - Number(ele.sl)}, {yqty: Number(e.yqty) - Number(ele.sl)}) + obj = Object.assign({}, e, {'checked': false}, {'kwbm': ''}, {id: e.id + Math.random() * 1000}, {sysl: Number(e.yqty) - Number(ele.sysl)}, {yqty: Number(e.yqty) - Number(ele.sysl)}) } }) this.dataList3.splice(index+1, 0, obj)