From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
index dc7561a..8e03ce0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
@@ -8,7 +8,7 @@
<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"
+ <uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辩爜" ref='midInput' :focus="!focus"
v-model="innerCode" @input="innercodeInput" />
</uni-forms-item>
<uni-forms-item :label="PurchaseOrderNo" style="margin-top: -20px;"></uni-forms-item>
@@ -31,11 +31,6 @@
</view>
<view v-if="current === 1" class="headerstyle">
<view class="itemstyle">
- <u-sticky>
- <!-- <view style="background-color: #ffffff;">
- <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar>
- </view> -->
- </u-sticky>
<!-- <uni-forms label-width="180">
<uni-forms-item label="鍖哄煙">
<uni-data-select v-if="show" v-model="value" :localdata="range"></uni-data-select>
@@ -48,23 +43,16 @@
</uni-forms-item>
</uni-forms> -->
<uni-list :border="true">
- <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId">
+ <uni-list-item direction="column" v-for="item in orderinfoDetails" :key="item.id">
<template v-slot:body>
- <view class="uni-list-box">
- <!-- <button class="button" type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="inputDialogToggle(item.matCode)"><text
- class="button-text">鍑哄簱</text></button> -->
- <!-- <button type="primary" style="position: absolute;right: 1%;" size="mini"
- @click="outbound(item.matCode)">鍑哄簱</button> -->
<view class="uni-content">
- <view style="font-size: 18px;">鏀惰揣鍗曞彿锛歿{orderNo}}</view>
- <view style="font-size: 18px;">閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
- <view style="font-size: 18px;">鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
- <view style="font-size: 18px;">鎵规鍙凤細{{item.lotNo}}</view>
- <view style="font-size: 18px;">鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
- <view style="font-size: 18px;">鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
+ <view>鏀惰揣鍗曞彿锛歿{orderNo}}</view>
+ <view>閲囪喘鍗曞彿锛歿{item.purchaseOrderNo}}</view>
+ <view>鐗╂枡缂栧彿锛歿{item.materielCode}}</view>
+ <view>鎵规鍙凤細{{item.lotNo}}</view>
+ <view>鏀惰揣鏁伴噺锛歿{item.receivedQuantity}}</view>
+ <view>鏄惁璐ㄦ锛歿{item.ifInspection==1?"鏄�":"鍚�"}}</view>
</view>
- </view>
</template>
</uni-list-item>
</uni-list>
@@ -187,6 +175,7 @@
current: 0,
orderNo: "",
orderInfo: [],
+ orderinfoDetails:[],
label: "",
innerCode: "",
PurchaseOrderNo: "閲囪喘鍗曞彿锛�",
@@ -203,7 +192,7 @@
remaindQty: "瀹為檯鏁伴噺锛�",
tagFocus: true,
numberFocus: false,
- focus: true,
+ focus: false,
tag: "",
number: "",
tagmatCode: "鐗╂枡缂栫爜锛�",
@@ -229,7 +218,8 @@
endType: "",
endTypeRange: [],
sns: "",
- receiveOrderId:0,
+ receiveOrderId: 0,
+ warehouseId:""
}
},
@@ -243,8 +233,9 @@
this.value = config.warehouseArea;
}
this.orderNo = res.orderNo;
- this.receiveOrderId=res.receiveOrderId;
+ this.receiveOrderId = res.receiveOrderId;
this.label = "鏀惰揣鍗曞彿锛�" + this.orderNo;
+ this.warehouseId=res.warehouseId;
this.getData();
},
mounted() {
@@ -375,6 +366,12 @@
})
return;
}
+ if(this.warehouseId==2){
+ //鏇挎崲鎸囧畾涓や釜瀛楃闂寸殑瀛楃
+ this.sns = this.sns.replace(/(Q:)([^,PO]+)(,PO)/, (match, p1, p2, p3) => {
+ return p1 + this.Quantity + p3;
+ });
+ }
this.$u.post('/api/ReceiveOrderDetail/AddReceiveOrderDetail?serNum=' + this.sns + '&orderNo=' + this
.orderNo, {}).then(res => {
if (res.status) {
@@ -382,6 +379,7 @@
title: "纭鏀惰揣鎴愬姛",
type: "success"
})
+ this.orderInfo=[];
this.sns = "";
} else {
this.$refs.uToast.show({
@@ -475,8 +473,8 @@
}
this.$u.post('/api/ReceiveOrderDetail/GetReceiveOrderInfos', postData).then((res) => {
if (res.status) {
- this.orderInfo = res.data;
- if (this.orderInfo.length > 3) {
+ this.orderinfoDetails = res.data;
+ if (this.orderinfoDetails.length > 3) {
this.loadVisible = true;
}
}
@@ -490,7 +488,8 @@
var innerCode = this.innerCode;
setTimeout(() => {
this.innerCode = "";
- }, 10);
+ this.focus=false;
+ }, 1);
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + innerCode, {}).then((res) => {
if (res.status) {
@@ -504,7 +503,7 @@
this.ProductionDate = "鐢熶骇鏃ユ湡锛�" + res.data.productionDate;
this.orderQty = "璁㈠崟鏁伴噺锛�" + res.data.quantity;
this.Quantity = res.data.quantity;
- if (res.message) {
+ if (!res.status) {
this.$refs.uToast.show({
title: res.message,
type: "error"
--
Gitblit v1.9.3