From bbfe4dd2532bbd41c7f9d26285c7f0aae84ccb54 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 14:59:06 +0800
Subject: [PATCH] #
---
pages/phyz/order/pakinOrderSelect.vue | 205 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 189 insertions(+), 16 deletions(-)
diff --git a/pages/phyz/order/pakinOrderSelect.vue b/pages/phyz/order/pakinOrderSelect.vue
index 4d60b26..c054c9d 100644
--- a/pages/phyz/order/pakinOrderSelect.vue
+++ b/pages/phyz/order/pakinOrderSelect.vue
@@ -6,8 +6,8 @@
</uni-search-bar>
<view class="code-title">
<view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
- <view></view>
+ <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+ <view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">绛涢��</view>
</view>
</view>
@@ -17,6 +17,7 @@
<view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
<view>缂栧彿锛歿{orderDetl.matnr}}</view>
<view>鍚嶇О锛歿{orderDetl.maktx}}</view>
+ <view>绫诲瀷锛歿{orderDetl.brand}}</view>
<view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
<view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
</view>
@@ -35,7 +36,9 @@
</view>
</view>
<!-- 鍨珮 -->
- <view style="height: 50rpx;"></view>
+ <view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+ - 宸茬粡鍒板簳浜� -
+ </view>
<!-- 寮圭獥 -->
<view>
<uni-popup ref="addItem" type="dialog">
@@ -52,6 +55,49 @@
</view>
</uni-popup>
</view>
+ <!-- 绛涢�夊脊绐� -->
+ <view>
+ <uni-popup ref="filter" type="dialog">
+ <view class="filter-popup">
+ <!-- 鏍囬 -->
+ <view class="title">绛涢��</view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>閿�鍞鍗曪細</view>
+ <input type="text" v-model="searchValue">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>涓昏鍗曞彿锛�</view>
+ <input type="text" v-model="orderNo">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧缂栧彿锛�</view>
+ <input type="text" v-model="matnr">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧鍚嶇О锛�</view>
+ <input type="text" v-model="maktx">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧绉嶇被锛�</view>
+ <input type="text" v-model="brand">
+ </view>
+ </view>
+ <view class="btn filter-btn">
+ <view class="btn-left" @click="filterClose">閲嶇疆</view>
+ <view class="btn-right" @click="filterConfirm()">纭</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -63,6 +109,10 @@
token: '',
searchValueFocus: true,
searchValue: '',
+ orderNo: '',
+ matnr: '',
+ maktx: '',
+ brand: '',
total: '',
dataList: [],
orderCarList: [],
@@ -70,22 +120,40 @@
curr: 1,
limit: 100,
three_code: '',
+ matnr: '',
+ maktx: '',
+ order_no: '',
+ brand: ''
},
index: 0,
count: 0,
-
+ mask: false
}
+ },
+ // 涓嬫媺鍒锋柊
+ onReachBottom() {
+ this.status = 'more';
+ this.getOrderDetlList(this.searchValue,10);
},
onLoad() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.searchValue = uni.getStorageSync('threeCode');
- this.getOrderDetlList(this.searchValue,30)
+ this.getOrderDetlList(this.searchValue,10)
+ console.log("onLoad");
+ },
+ onShow() {
+ console.log(uni.getStorageSync('pakinOrderCar'));
+ },
+ onHide() {
+ uni.setStorageSync('pakinOrderCar', this.orderCarList);
},
methods: {
getOrderDetlList(threeCode,limit) {
+ uni.showLoading({})
let _this = this
+ _this.mask = true
_this.data.three_code = threeCode
_this.data.limit = limit
uni.request({
@@ -94,6 +162,7 @@
data: _this.data,
method: 'GET',
success(res) {
+ uni.hideLoading()
res = res.data
if (res.code === 200) {
for (let k of res.data.records) {
@@ -105,23 +174,38 @@
k['color'] = 'order-sts-end'
}
}
- _this.dataList = res.data.records
+ let list = res.data.records
+ _this.dataList = _this.dataList.concat(list);
+ _this.data.curr = _this.data.curr + 1
+ // _this.dataList = res.data.records
_this.total = res.data.total
- }
+ _this.mask = false
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
}
})
},
searchValueInput2() {
+ this.dataList = []
+ this.data.curr = 1
uni.setStorageSync('threeCode', this.searchValue);
if (this.searchValue.length == 0) {
- this.getOrderDetlList(this.searchValue,30)
+ this.getOrderDetlList(this.searchValue,10)
} else {
- this.getOrderDetlList(this.searchValue,999999)
+ this.getOrderDetlList(this.searchValue,10)
}
},
clear() {
- this.getOrderDetlList(this.searchValue,30)
+ this.dataList = []
+ this.data.curr = 1
+ setTimeout(()=> {
+ this.getOrderDetlList(this.searchValue,10)
+ },300)
},
// 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
addItem(index) {
@@ -143,10 +227,10 @@
this.count = 0
},
addConfirm() {
- if (this.count == 0) {
- uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
- return
- }
+ // if (this.count == 0) {
+ // uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
+ // return
+ // }
this.dataList[this.index]['used'] = true
this.dataList[this.index]['pakinQty'] = this.count
this.orderCarList.push(this.dataList[this.index])
@@ -157,6 +241,10 @@
// 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
orderCar() {
let _this = this
+ if (_this.orderCarList.length === 0) {
+ uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
+ return
+ }
uni.navigateTo({
url: './orderCar',
success(res) {
@@ -167,6 +255,10 @@
events: {
acceptDataFromOpenedPage: function(data) {
console.log(data);
+ if (data.data == 1) {
+ _this.orderCarList = []
+ _this.getOrderDetlList(uni.getStorageSync('threeCode'),10)
+ }
}
}
})
@@ -174,6 +266,31 @@
changeValue(value) {
this.count = value
},
+ // 绛涢��
+ filter() {
+ this.$refs.filter.open('bottom')
+ },
+ filterConfirm() {
+ this.dataList = []
+ this.data.curr = 1
+ this.data.maktx = this.maktx
+ this.data.matnr = this.matnr
+ this.data.order_no = this.order_no
+ this.data.brand = this.brand
+ this.getOrderDetlList(this.searchValue,10)
+ this.$refs.filter.close()
+ },
+ filterClose() {
+ this.dataList = []
+ this.data.curr = 1
+ this.data.maktx = ''
+ this.data.matnr = ''
+ this.data.order_no = ''
+ this.data.brand = ''
+ this.getOrderDetlList(this.searchValue,10)
+ this.$refs.filter.close()
+ }
+
}
}
@@ -200,8 +317,8 @@
}
.shop-car {
position: fixed;
- left: 60rpx;
- bottom: 80rpx;
+ left: 22rpx;
+ bottom: 150rpx;
background-color: #2299ff;
width: 260rpx;
height: 90rpx;
@@ -219,6 +336,21 @@
}
.car-right {
flex: 4;
+ }
+
+ .mask {
+ position: absolute;
+ width: 100%;
+ height: 100vh;
+ z-index: 999;
+ top: 0;
+ left: 0;
+ background-color: rgba(0, 0, 0, .4);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16px;
+ color: #fff;
}
.popup {
@@ -285,4 +417,45 @@
align-items: center;
color: #409EFF;
}
+ .filter-popup {
+ width: 100%;
+ height: 80vh;
+ background-color: #FFF;
+ position: relative;
+ border-radius: 30rpx 30rpx 0rpx 0rpx;
+ }
+ .filter-popup-item {
+ height: 100%;
+ width: 100%;
+ background-color: #c9cdd5;
+ }
+ .filter-popup-item-left {
+ width: 30%;
+ height: 100%;
+ background-color: #DCDFE6;
+
+ }
+ .item-btn {
+ width: 100%;
+ height: 80rpx;
+ line-height: 80rpx;
+ background-color: #c9cdd5;
+ text-align: center;
+ }
+ .item-btn:checked {
+ background-color: #606266;
+ }
+ .filter-btn {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: #FFF;
+ }
+ .item-cl {
+ display: flex;align-items: center;
+ }
+ .item-cl input {
+ border-bottom: 1px solid #b9b9b9;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1