From 9f8c2ee719613a600ddf76f4958c5c860cbe2ac6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 26 三月 2024 13:08:40 +0800
Subject: [PATCH] #
---
pages/phyz/order/orderList.vue | 169 +++++++++++++++++++++++++------------------------------
1 files changed, 77 insertions(+), 92 deletions(-)
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
index a74fbfc..6e31484 100644
--- a/pages/phyz/order/orderList.vue
+++ b/pages/phyz/order/orderList.vue
@@ -15,16 +15,26 @@
<view>缂栧彿锛歿{item.matnr}}</view>
<view>鍚嶇О锛歿{item.maktx}}</view>
<view>瑙勬牸锛歿{item.specs}}</view>
- <view>鏁伴噺锛歿{item.anfme}}</view>
+ <view>鎵瑰彿锛歿{item.batch}}</view>
+ <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
+ <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
+ <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
<view class="card-id">{{i + 1}}</view>
</view>
<view class="list-right" @click="checkboxChange(item)">
<label >
- <checkbox :value="item.orderNo" :checked="item.checked" color="#FFCC33" style="transform:scale(0.7)" /><text></text>
+ <checkbox :value="item.orderNo" :checked="item.checked" color="" :disabled="item.anfme <= item.qty" style="transform:scale(0.7)" /><text></text>
</label>
</view>
</view>
<view style="height: 100rpx;"></view>
+
+ <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
+ <view class="buttom">
+ <button size="mini" @click="reset('warn')">閲嶇疆</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">鍘荤粍鎵�</button>
+ </view>
+
</view>
</template>
@@ -38,94 +48,17 @@
matFocus: true,
matnr: '',
checck: true,
- dataList: [
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931255',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z',
- checked: true
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931225',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- {
- orderNo: 'cg0931241',
- matnr: 'cg0931241',
- maktx: '浣犲ソ',
- anfme: 10,
- specs: '10-z'
- },
- ],
+ dataList: [],
oldDataList: [],
newDataList: [],
allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��'
+ allCheckBtnTitle: '鍏ㄩ��',
}
},
onLoad() {
let that = this
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
const eventChannel = this.getOpenerEventChannel();
@@ -133,19 +66,26 @@
eventChannel.on('item', function(data) {
console.log(data);
that.orderId = data.item.orderId
+ console.log(data.item.id);
+ uni.setNavigationBarTitle({
+ title: data.item.orderNo,
+
+ })
+ that.getOrderDetl(data.item.id)
})
},
onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.oldDataList = [...this.dataList]
- this.getOrderDetl(this.orderId)
+ if (this.dataList.length > 0) {
+ this.oldDataList = [...this.dataList]
+ }
+ // this.getOrderDetl(this.orderId)
},
methods: {
// 璁㈠崟鏄庣粏
getOrderDetl(id) {
let _this = this
+ console.log(id);
uni.request({
url: `${_this.baseUrl}/orderDetl/list/auth`,
header: {'token': uni.getStorageSync('token')},
@@ -160,6 +100,7 @@
console.log(res);
if (res.code === 200) {
_this.dataList = res.data.records
+ _this.oldDataList = [..._this.dataList]
}
}
})
@@ -167,7 +108,9 @@
matInput() {
let count = 0
let sign = 0
- this.dataList = [...this.oldDataList]
+ if (this.oldDataList.length > 0) {
+ this.dataList = [...this.oldDataList]
+ }
this.newDataList = []
for (let k in this.dataList) {
if (!this.dataList[k].matnr.includes(this.matnr)) {
@@ -199,7 +142,12 @@
if (e.checked) {
this.$set(e,'checked',false)
} else {
- this.$set(e,'checked',true)
+ if (e.anfme == e.qty) {
+ this.$set(e,'checked',false)
+ } else {
+ this.$set(e,'checked',true)
+ }
+
}
},
allChecked() {
@@ -212,7 +160,11 @@
}
for (let item of this.dataList) {
if (this.allCheck) {
- this.$set(item,'checked',true)
+ if (item.anfme == item.qty) {
+ this.$set(item,'checked',false)
+ } else {
+ this.$set(item,'checked',true)
+ }
} else {
this.$set(item,'checked',false)
}
@@ -221,12 +173,45 @@
clear() {
this.matnr = ''
this.dataList = [...this.oldDataList]
- }
+ },
+ combConfirm(type) {
+ let _this = this
+ let combList = []
+ for (let k of _this.dataList) {
+ if (k.checked) {
+ combList.push(k)
+ }
+ }
+ if (combList.length == 0) {
+ uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'})
+ return
+ }
+ uni.navigateTo({
+ url: "../AGV/AGVPakin2",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('mats', {
+ mats: combList
+ })
+ },
+ });
+ },
}
}
</script>
<style>
@import url('../../../static/css/common/order.css');
-
+ .list-anfme {
+ color: #0082ff;
+ font-weight: bold;
+ }
+ .list-qty-1 {
+ color: #33ba43;
+ font-weight: bold;
+ }
+ .list-qty-2 {
+ color: #e2231a;
+ font-weight: bold;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1