From ce08db7fdb31a61c6ee672d89d6c4b4b66c1f6d6 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 16 一月 2025 14:41:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/raworderboxing.vue | 106 ++++++----------------------------------------------
1 files changed, 13 insertions(+), 93 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
index ab57cba..6754ebf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/raworderboxing.vue"
@@ -68,8 +68,8 @@
placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
- :focus="addressFocus" />
+ <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
+ placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput' :focus="addressFocus" />
</uni-forms-item>
<uni-forms-item>
<button @click="inbound" type="primary" size="default" style="margin-top: 2%;">鍏ュ簱纭</button>
@@ -87,8 +87,7 @@
<view style="font-size: 18px;">鍗曟嵁鍙凤細{{orderNo}}</view>
<view style="font-size: 18px;">鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
<!-- <view style="font-size: 18px;">鐗╂枡鍚嶇О锛歿{item.matName}}</view> -->
- <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity}}</view>
- <view style="font-size: 18px;">鍗曚綅锛歿{item.unit}}</view>
+ <view style="font-size: 18px;">鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
<view style="font-size: 18px;">缁勭洏鏁伴噺锛歿{item.receiptQuantity}}</view>
</view>
</view>
@@ -147,12 +146,12 @@
label: "",
orderInfo: [],
focus: false,
- pkfocus:false,
+ pkfocus: false,
barcode: "",
materSn: "",
Initiallife: 1000,
sns: [],
- pksns:[],
+ pksns: [],
addressFocus: false,
inboundBarcode: "",
address: "",
@@ -167,7 +166,8 @@
Testplaceholder: "",
Testcheck: false,
pkmaterSn: "",
- pkmatInfos: []
+ pkmatInfos: [],
+ addressdisabled: false
}
},
onShow() {},
@@ -189,6 +189,9 @@
this.items.push("鍏ュ钩搴�");
this.items[1] = "鍏ョ珛搴�";
this.address = "8005";
+ } else if (this.warehouseId == 3) { //杈呮枡
+ this.address = "1011";
+ this.addressdisabled = true;
}
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.getData();
@@ -198,90 +201,6 @@
innerAudioContext.src = src; // '../../static/success.mp3';
innerAudioContext.play();
},
- //瑙ｇ洏
- releasebox() {
- if (this.value.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鐮�",
- type: "error"
- })
- return;
- }
- var param;
- var matInfo = this.value.split('|');
- if (matInfo.length == 7) {
- param = {
- MainData: {
- "innerCode": this.value
- }
- }
- } else {
- param = {
- MainData: {
- "barcode": this.value
- }
- }
- }
- this.$u.post('/api/StockOperate/ReleaseAllBox', param).then(resdt => {
- if (resdt.status) {
- uni.$showMsg('瑙ｇ洏鎴愬姛!')
- this.value = "";
- this.matInfo = [];
- this.matTotals = [];
- this.value2 = "";
- } else {
- this.$refs.uToast.show({
- title: resdt.message,
- type: "error"
- })
- }
- })
- },
- releaseboxInput() {
- this.$nextTick(() => {
- if (this.value.length == 0) {
- return;
- }
- var matInfo = this.value.split('|');
- this.matInfo = [];
- if (matInfo.length == 7) {
- this.$u.post('/api/StockOperate/GetStockInfoByInnerCode', {
- MainData: {
- "innerCode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- } else {
- this.$u.post('/api/StockOperate/GetStockInfoByBarcode', {
- MainData: {
- "barcode": this.value
- }
- }).then(res => {
- if (res.status) {
- this.matInfo = res.data.stockInfo;
- this.matTotals = res.data.stockTotal;
- this.value2 = res.data.barcode;
- } else {
- this.$refs.uToast.show({
- title: res.message,
- type: "error"
- })
- }
- })
- }
- })
- },
-
updateFocus() {
debugger
this.$nextTick(() => {
@@ -478,7 +397,7 @@
this.pkmatInfos.splice(res, 1);
this.pksns.splice(res, 1);
},
- pksubmit(){
+ pksubmit() {
if (this.pkmatInfos.length == 0) {
this.$refs.uToast.show({
title: "璇锋壂鎻忓唴绠辨爣绛�",
@@ -486,7 +405,8 @@
})
return;
}
- this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId+"&orderNo="+ this.orderNo, this.pksns).then(res => {
+ this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId + "&orderNo=" + this.orderNo, this
+ .pksns).then(res => {
if (res.status) {
this.$refs.uToast.show({
title: "鍏ュ簱鎴愬姛",
--
Gitblit v1.9.3