From 65256395588a29f150b41576fbeece0de533e288 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 02 十二月 2024 08:18:09 +0800
Subject: [PATCH] 项目框架搭建完成
---
pages/order/orderComb.vue | 118 ++++++++++++++++++++++++++---------------------------------
1 files changed, 52 insertions(+), 66 deletions(-)
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index 682f1ac..97c6d01 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -20,10 +20,10 @@
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
- <view class="item">
+ <!-- <view class="item">
<view class="code-decs">璁㈠崟鍙�:</view>
<uni-combox :candidates="orderNoList" placeholder="璇烽�夋嫨璁㈠崟" v-model="orderNo" @input="getOrderDet"></uni-combox>
- </view>
+ </view> -->
</view>
<view class="mat-list-title">
<view style="width: 200rpx;"></view>
@@ -32,49 +32,21 @@
</view>
<scroll-view>
<checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
- <view class="aside">
- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
- </view>
<view class="list-left" style="margin: 0;">
<view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
+ <view class="desc">No锛歿{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">璁㈠崟鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.orderNo" type="primary"></uni-tag>
- </view>
+ <view class="desc">璁㈠崟鍙凤細{{item.orderNo}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
+ <view class="desc">鏂欏彿锛歿{item.matnr}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鍚嶇О锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="desc">鎵瑰彿锛歿{item.batch}}</view>
</view>
- <view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鍓╀綑鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
+ <view class="list-left-item" >
+ <view class="desc">鏁伴噺锛歿{item.anfme}}</view>
</view>
</view>
<view class="list-right">
@@ -113,7 +85,7 @@
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
+ <uni-number-box :value="count" :step='1' :max="maxCount" color="#747474"
@change="changeValue" />
</view>
</view>
@@ -191,6 +163,7 @@
removeNum: 0,
orderNoList: [],
orderNo: '',
+ maxCount: 0
}
},
onShow() {
@@ -212,14 +185,35 @@
this.dataList[e].checked = ck ? false:true
},
getChecked() {
- var checkedList = []
- for(var i = 0; i < this.dataList.length; i++) {
- var t = !this.dataList[i].checked
- if (this.dataList[i].checked) {
- checkedList.push(this.dataList[i])
+ let _this = this
+ uni.navigateTo({
+ url: './orderSelect',
+ success(res) {
+ res.eventChannel.emit('matList', {
+ matList: _this.dataList
+ })
+ },
+ events: {
+ pickList: function(data) {
+ for (let k of data.data) {
+ let add = true
+ if (_this.dataList.length == 0) {
+ _this.dataList.push(k)
+ continue
+ }
+ for (let m of _this.dataList) {
+ if (k.matnr == m.matnr && k.orderNo == k.orderNo) {
+ add = false
+ }
+ }
+ if (add) {
+ k['maxCount'] = k.anfme
+ _this.dataList.push(k)
+ }
+ }
+ }
}
- }
- this.dataList = checkedList
+ })
},
getOrderDet() {
let that = this
@@ -243,7 +237,7 @@
getOrderNoList() {
let that = this
uni.request({
- url: this.baseUrl + '/order/list/all',
+ url: this.baseUrl + '/order/comb/list/all',
header: {
'token': uni.getStorageSync('token')
},
@@ -394,19 +388,16 @@
uni.vibrateShort();
let that = this;
if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
+ uni.showToast({ title: "璇锋壂鎻忔墭鐩樻潯鐮�", icon: "error", position: 'center' })
return;
}
if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
+ uni.showToast({ title: "璇锋坊鍔犲晢鍝佸垪琛�", icon: "error", position: 'center' })
return;
}
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
+ uni.showToast({ title: that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0', icon: "error", position: 'center' })
return;
}
}
@@ -425,19 +416,16 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
+ uni.showToast({ title: "缁勬墭鎴愬姛", icon: "success", position: 'center' })
} else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
setTimeout(() => {
uni.reLaunch({
url: '../login/login'
});
}, 1000);
} else {
- that.messageText = res.msg
- that.messageToggle('error')
+ uni.showToast({ title: res.msg, icon: "error", position: 'center' })
}
}
});
@@ -453,8 +441,7 @@
this.dataList = []
this.orderNo = ''
this.barcode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
+ uni.showToast({ title:"閲嶇疆瀹屾垚", icon: "success", position: 'center' })
},
// 鍙栨秷閲嶇疆
resetClose() {
@@ -466,6 +453,7 @@
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
this.weight = this.dataList[i].weight
+ this.maxCount = this.dataList[i].maxCount
this.rowNum = i
this.eject()
},
@@ -483,16 +471,14 @@
},
// 纭绉婚櫎
removeConfirm(i) {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title:"绉婚櫎鎴愬姛", icon: "success", position: 'center' })
this.dataList.splice(this.removeNum, 1)
},
reviseConfirm() {
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
+ uni.showToast({ title:"淇敼鎴愬姛", icon: "success", position: 'center' })
this.$refs.revise.close()
this.$forceUpdate() // 寮哄埗鍒锋柊
},
@@ -533,7 +519,7 @@
}
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 240rpx;
}
.list:last-child {
@@ -551,7 +537,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 100rpx;
background-color: #FFF;
z-index: 10;
}
@@ -592,7 +578,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 100rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1