diff --git a/pages.json b/pages.json index 7325b4f..7d2367d 100644 --- a/pages.json +++ b/pages.json @@ -273,6 +273,12 @@ "navigationBarTitleText": "物料取货" } }, + { + "path": "pages/logistics/intoStock", + "style": { + "navigationBarTitleText": "物料回库" + } + }, { "path": "pages/logistics/site", "style": { diff --git a/pages/index/menu.js b/pages/index/menu.js index c175b31..7c4074c 100644 --- a/pages/index/menu.js +++ b/pages/index/menu.js @@ -324,6 +324,18 @@ const menus = { type: '' } }, + { + key: "intoStock", + title: "物料回库", + url: "../logistics/intoStock", + bgColor: '', + limit: 'RB2325', + icon: { + size: 20, + color: '#00b7ee', + type: '' + } + }, // { // key: "claimGoods", // title: "物料取货", diff --git a/pages/logistics/intoStock.vue b/pages/logistics/intoStock.vue new file mode 100644 index 0000000..2909142 --- /dev/null +++ b/pages/logistics/intoStock.vue @@ -0,0 +1,603 @@ + + + + \ No newline at end of file diff --git a/pages/logistics/packaging.vue b/pages/logistics/packaging.vue index 16b0bba..9beb06c 100644 --- a/pages/logistics/packaging.vue +++ b/pages/logistics/packaging.vue @@ -45,6 +45,9 @@ :focus="boxInputFocus" :key="'box-' + boxInputFocus" /> + 清空 @@ -131,7 +134,7 @@ {{ order.partCode }} {{ - (order.actualWeighing >= 0) || (order.actualWeighing != null) + order.actualWeighing >= 0 || order.actualWeighing != null ? order.actualWeighing + "g" : 0 + "g" }} @@ -191,6 +194,14 @@ export default { }, }, methods: { + clearBoxInput() { + this.boxCode = ""; + // 先失焦再聚焦,或者通过改变 key 强制重渲染 input 以触发 focus + this.boxInputFocus = false; + this.$nextTick(() => { + this.boxInputFocus = true; + }); + }, handleOneClickUnbind() { if (!this.activeBox) { uni.showToast({ @@ -266,7 +277,7 @@ export default { const code = this.boxCode.trim(); if (!code) return; this.$u.api - .boxbarcodeDetails({ boxBarcode: this.boxCode,isDetail:false }) + .boxbarcodeDetails({ boxBarcode: this.boxCode, isDetail: false }) .then((res) => { this.boxInfo = res.data; if (this.boxInfo.yieldOrderList == null) { @@ -440,7 +451,7 @@ export default { // 刷新箱内明细 refreshBoxInfo() { this.$u.api - .boxbarcodeDetails({ boxBarcode: this.activeBox,isDetail:false }) + .boxbarcodeDetails({ boxBarcode: this.activeBox, isDetail: false }) .then((res) => { this.boxInfo = res.data; if (this.boxInfo.yieldOrderList == null) { @@ -831,4 +842,18 @@ export default { .uni-forms-item { margin-bottom: 40rpx; } +.input-box { + position: relative; + display: flex; + align-items: center; +} +.input-box .uni-input-border{ + flex: 1; +} +.clear-icon { + position: absolute; + right: 10rpx; + color:#999; + padding: 5rpx 10rpx 5rpx 5rpx; +} diff --git a/static/images/menus/intoStock.png b/static/images/menus/intoStock.png new file mode 100644 index 0000000..9d65c14 Binary files /dev/null and b/static/images/menus/intoStock.png differ