From 3dd6c88cbf2ced0b94d5817345396cae8edbc320 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 八月 2025 19:52:45 +0800
Subject: [PATCH] #
---
pages/order/orderPakin.vue | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 118ae3e..e698924 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -1,11 +1,6 @@
<template>
<view>
<view class="code">
- <!-- <view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="order" :focus="orderFocus"
- @input="orderInput()" disabled>
- </view> -->
<view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@@ -19,6 +14,17 @@
<!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
<!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
</view>
+ </view>
+ <view class="item">
+ <view class="code-decs">婊℃墭:</view>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
</view>
</view>
<view class="mat-list-title">
@@ -45,7 +51,7 @@
</view>
<view class="list-left-item">
<view class="desc">鍚嶇О锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="left-item" style="word-break: break-all;">{{item.maktx}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
@@ -57,6 +63,12 @@
<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>
@@ -71,7 +83,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">鍏ュ簱</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -87,14 +99,18 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <view class="popup-item">
+ <!-- <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
+ </view> -->
+ <!-- <view class="popup-item">
+ <view class="popup-item-left">閲嶉噺:</view>
+ <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ </view> -->
<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" :max="9999999" color="#747474" @change="changeValue" />
+ <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
</view>
</view>
<view class="btn">
@@ -118,7 +134,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭缁勬墭 -->
+ <!-- 纭鍏ュ簱 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -148,23 +164,26 @@
baseUrl: '',
token: '',
order: '',
- orderFocus: true,
barcode: '',
- barcodeFocus: '',
dataList: [],
count: 0,
rowNum: '',
matnr: '',
matnr1: '',
batch: '',
+ weight: '',
msgType1: 'success',
msgType: 'success',
messageText: '',
title: '',
content: '',
- barcodeFocus: false,
+ barcodeFocus: true,
matFocus: false,
- matData: ''
+ matData: '',
+ removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true
}
},
onShow() {
@@ -279,8 +298,11 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪鍏ュ簱!'
this.$refs.combConfirm.open()
+ },
+ isFrozen() {
+ this.isFull = !this.isFull
},
comb() {
uni.vibrateShort();
@@ -297,7 +319,7 @@
}
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.messageText = that.dataList[i].matnr + '鍏ュ簱鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
@@ -306,6 +328,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
+ isFull: that.isFull,
combMats: that.dataList
}),
method: 'POST',
@@ -316,7 +339,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "鍏ュ簱鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
@@ -357,6 +380,7 @@
this.matnr1 = this.dataList[i].matnr
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
+ this.weight = this.dataList[i].weight
this.rowNum = i
this.eject()
},
@@ -366,6 +390,7 @@
},
// 鍒楄〃绉婚櫎鎸夐挳
remove(item, i, type) {
+ this.removeNum = i
this.msgType = type
this.title = '璀﹀憡'
this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
@@ -375,11 +400,12 @@
removeConfirm(i) {
this.messageText = "绉婚櫎鎴愬姛"
this.messageToggle('success')
- this.dataList.splice(i, 1)
+ 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')
this.$refs.revise.close()
@@ -396,6 +422,13 @@
this.dataList = []
this.barcode = ''
this.barcodeFocuss()
+ },
+ combClose() {
+ this.$refs.combConfirm.close()
+ },
+ // 鍙栨秷绉婚櫎
+ removeClose() {
+ this.$refs.alertDialog.close()
},
}
}
@@ -427,7 +460,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
--
Gitblit v1.9.1