From e43adae114f0edc580a20e84605c34ee0671c59d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 04 一月 2025 09:36:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/raworderboxing.vue | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 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 d919d69..94cbf35 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"
@@ -16,12 +16,12 @@
<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
v-model="materSn" @input="snInput" />
</uni-forms-item>
- <uni-forms-item label="鍒濆瀵垮懡:" v-if="Test">
- <uni-easyinput type="text" placeholder="璇疯緭鍏ュ垵濮嬪鍛�" ref='midInput' v-model="Initiallife" />
+
+ <uni-forms-item :label="Testlabel" v-if="Test">
+ <uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
+ v-model="Initiallife" />
</uni-forms-item>
- <uni-forms-item label="缁勭洏鏁伴噺:" v-if="YMHouse">
- <uni-easyinput type="text" placeholder="璇疯緭鍏ョ粍鐩樻暟閲�" ref='midInput' v-model="Initiallife" />
- </uni-forms-item>
+
<!-- <uni-forms-item>
<checkbox checked="check">鏄惁婊＄洏</checkbox>
</uni-forms-item> -->
@@ -181,7 +181,8 @@
matTotals: [],
warehouseId: "",
Test: false,
- YMHouse:false,
+ Testlabel: "",
+ Testplaceholder: "",
Testcheck: false,
}
},
@@ -191,8 +192,16 @@
this.addressFocus = false;
this.orderNo = res.orderNo;
this.warehouseId = res.warehouseId;
- this.Test = this.warehouseId == 6; //娴嬭瘯鏋朵粨搴撳尯ID
- this.YMHouse = this.warehouseId == 2;
+ if (this.warehouseId == 6) { //娴嬭瘯鏋朵粨搴撳尯ID
+ this.Test = true;
+ this.Testlabel = "鍒濆瀵垮懡:";
+ this.Testplaceholder = "璇疯緭鍏ュ垵濮嬪鍛�";
+ } else if (this.warehouseId == 2) { //娌瑰ⅷ浠撳簱鍖篒D
+ this.Test = true;
+ this.Testlabel = "鏁伴噺:";
+ this.Testplaceholder = "璇疯緭鍏ユ暟閲�";
+ this.Initiallife = 16;
+ }
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.getData();
},
@@ -491,27 +500,8 @@
})
},
deleteList(res) {
- // var sn = '';
-
- this.matInfos.splice(res, 1);
- this.sns.splice(res, 1);
- // this.matInfos.map((item, index) => {
- // if (item.sn == res) {
- // this.matInfos.splice(index, 1);
- // sn = item.sn;
- // var tmp = this.matTotal.find(x => x.matCode == item.matCode);
- // if (tmp) {
- // tmp.matQuantity -= parseInt(item.quantity);
- // } else {
-
- // }
- // }
- // })
- // this.sns.map((item, index) => {
- // if (item == res) {
- // this.sns.splice(index, 1);
- // }
- // })
+ this.matInfos.splice(res, 1);
+ this.sns.splice(res, 1);
},
submit() {
if (this.barcode == "") {
@@ -542,7 +532,7 @@
MainData: {
"palletCode": this.barcode,
"orderNo": this.orderNo,
- "initiallife":this.Initiallife,
+ "initiallife": this.Initiallife,
// "isFull": this.check
"warehouseId": this.warehouseId
},
--
Gitblit v1.9.3