From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/outraworderboxing.vue | 107 +++++++++++------------------------------------------
1 files changed, 23 insertions(+), 84 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/outraworderboxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/outraworderboxing.vue"
index 1bc1830..ac2fe9c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/outraworderboxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/outraworderboxing.vue"
@@ -7,39 +7,24 @@
<view class="itemstyle">
<uni-forms style="margin-left: 2%;margin-top: 20px;" label-width="180">
<uni-forms-item :label="label" style="margin-top: -20px;"></uni-forms-item>
- <!-- <uni-forms-item label="鍗曟嵁绫诲瀷锛氱敓浜ч鏂欏崟" style="margin-top: -20px;"></uni-forms-item> -->
<uni-forms-item label="鐗╂枡鐮侊細" style="margin-top: -20px;">
- <uni-easyinput type="text" placeholder="璇锋壂鎻忕墿鏂欑爜" ref='midInput' :focus="focus"
- v-model="innerCode" @input="snInput" />
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忕墿鏂欑爜" ref='midInput' :focus="!focus"
+ v-model="materSn" @input="snInput" />
</uni-forms-item>
- <!-- <uni-forms-item :label="PurchaseOrderNo" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="matCode" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="LotNo" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="ProductionDate" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="EffectiveDate" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="orderQty" style="margin-top: -20px;"></uni-forms-item>
- <uni-forms-item :label="remaindQty" style="margin-top: -20px;"> -->
<uni-list>
- <uni-list-item direction="column" v-for="item in matInfos" :key="item.palletCode">
+ <uni-list-item direction="column" v-for="(item,index) in matInfos" :key="index">
<template v-slot:body>
<view class="uni-content">
- <view>鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
- <view>鎵樼洏缂栧彿锛歿{item.palletCode}}</view>
- <view>鐗╂枡鎵规锛歿{item.batchNo}}</view>
+ <!-- <view class="uni-title-sub uni-ellipsis-2">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view> -->
<view>鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
- <view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
- <view>鍗曟嵁鏁伴噺锛歿{item.orderQuantity}}</view>
- <view>鍘熷搴撳瓨锛歿{item.originalQuantity}}</view>
- <view>鍒嗛厤搴撳瓨锛歿{item.assignQuantity}}</view>
- <view>鍓╀綑搴撳瓨锛歿{item.originalQuantity-item.assignQuantity}}</view>
+ <view>鎵规鍙凤細{{item.lotNo}}</view>
+ <view>鏁伴噺锛歿{item.quantity}}</view>
+ <!-- <view class="uni-note">鐢熶骇鏃ユ湡锛歿{item.productionDate}}</view>
+ <view class="uni-note">鏈夋晥鏈燂細{{item.effectiveDate}}</view> -->
</view>
</template>
</uni-list-item>
</uni-list>
- <uni-forms-item label="鍑哄簱鏁伴噺锛�" style="margin-top: -20px;">
- <uni-easyinput type="text" placeholder="璇疯緭鍏ュ嚭搴撴暟閲�" ref='midInput' :focus="focus"
- v-model="outQty" />
- </uni-forms-item>
</uni-forms-item>
</uni-forms>
<uni-forms-item>
@@ -58,8 +43,8 @@
<view>鐗╂枡缂栫爜锛歿{item.materielCode}}</view>
<view>鐗╂枡鍚嶇О锛歿{item.materielName}}</view>
<view>鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
- <view>鍑哄簱鏁伴噺锛歿{item.orderQuantity}}</view>
- <view>宸插嚭鏁伴噺锛歿{item.overOutQuantity}}</view>
+ <view>鍑哄簱鏁伴噺锛歿{item.orderQuantity+item.unit}}</view>
+ <view>宸插嚭鏁伴噺锛歿{item.overOutQuantity+item.unit}}</view>
</view>
</view>
</template>
@@ -79,40 +64,19 @@
return {
items: ['鐗╂枡淇℃伅', '鍗曟嵁淇℃伅'],
current: 0,
- matTotal: [],
matInfos: [],
orderNo: "",
label: "",
- outQty: "",
orderInfo: [],
focus: false,
- pkfocus: false,
- barcode: "",
materSn: "",
- Initiallife: 1000,
- sns: [],
- pksns: [],
- addressFocus: false,
- inboundBarcode: "",
- address: "",
- check: true,
- value: "",
- matInfo: [],
- value2: "",
- matTotals: [],
+ sn: "",
warehouseId: "",
- Test: false,
- Testlabel: "",
- Testplaceholder: "",
- Testcheck: false,
- pkmaterSn: "",
- pkmatInfos: []
}
},
onShow() {},
onLoad(res) {
this.focus = false;
- this.addressFocus = false;
this.orderNo = res.orderNo;
this.warehouseId = res.warehouseId;
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
@@ -140,7 +104,6 @@
},
onClickItem(e) {
this.focus = false;
- this.addressFocus = false;
if (this.current !== e.currentIndex) {
this.current = e.currentIndex;
if (this.current == 2) {
@@ -152,7 +115,7 @@
snInput() {
this.$nextTick(() => {
if (this.materSn != "") {
- this.focus = false;
+ this.focus = true;
var matSn = this.materSn;
setTimeout(() => {
this.materSn = "";
@@ -160,8 +123,8 @@
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
this.Testcheck = false;
if (res.status) {
- this.sns.push(res.data.serialNumber);
-
+ this.matInfos = [];
+ this.sn = res.data.serialNumber;
this.matInfos.push(res.data);
if (res.message) {
this.$refs.uToast.show({
@@ -177,6 +140,8 @@
this.voiceSpeech('../../static/success.mp3');
}, 100);
} else {
+ this.matInfos = [];
+ this.sns = [];
this.$refs.uToast.show({
title: res.message,
type: "error"
@@ -189,56 +154,30 @@
}
})
},
- deleteList(res) {
- this.matInfos.splice(res, 1);
- this.sns.splice(res, 1);
- },
submit() {
- if (this.barcode == "") {
+ if (this.sn == "") {
this.$refs.uToast.show({
- title: "璇锋壂鎻忔墭鐩樻潯鐮�",
+ title: "璇锋壂鎻忕墿鏂欑爜",
type: 'error'
})
return;
}
- if (this.matInfos.length == 0) {
- this.$refs.uToast.show({
- title: "璇锋壂鎻忓唴绠辨爣绛�",
- type: 'error'
- })
- return;
- }
- if (this.Test) {
- if (!this.Testcheck) {
- this.Testcheck = true;
- this.$refs.uToast.show({
- title: "璇风‘璁ゅ垵濮嬪鍛�",
- type: 'error'
- })
- return;
- }
- }
- this.$u.post('/api/InboundOrder/MaterielGroup', {
+ debugger
+ this.$u.post('/api/OutboundOrder/outpinku', {
MainData: {
- "palletCode": this.barcode,
"orderNo": this.orderNo,
- "initiallife": this.Initiallife,
- // "isFull": this.check
+ "sn": this.sn,
"warehouseId": this.warehouseId
- },
- DelKeys: this.sns
+ }
}).then(res => {
- this.Testcheck = false;
if (res.status) {
this.$refs.uToast.show({
title: "鍑哄簱鎴愬姛",
type: "success"
})
this.focus = false;
- this.barcode = "";
this.matInfos = [];
- this.sns = [];
- this.matTotal = [];
+ this.sn = "";
} else {
this.$refs.uToast.show({
title: res.message,
--
Gitblit v1.9.3