From 5412c13b1d7a983fcd97e532b08dfd4ad21eb6c8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 09:20:55 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 4 ++--
manifest.json | 2 +-
pages/pakin/pakin.vue | 40 ++++++++++++++++++++++++++++++++++++----
pages/order/zlOrderPakin.vue | 6 ++++++
4 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/manifest.json b/manifest.json
index 0120ced..c478ad9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2024031401",
+ "versionName" : "2024071201",
"versionCode" : "100",
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 6cbc97a..8ac9d36 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -44,7 +44,7 @@
maktx: null,
specs: null,
batch: null,
- anfme: 0,
+ anfme: 1,
},
baseIP:'',
basePORT:'',
@@ -62,7 +62,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
that.mat = data.data
- that.mat.anfme = 0
+ that.mat.anfme = 1
})
diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index 67c56be..e00b921 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -28,6 +28,7 @@
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="checkBom()">
+ <uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons>
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -222,6 +223,10 @@
},
methods: {
back() { uni.navigateBack({}) },
+ clearMatnr() {
+ // this.matnr = ''
+ this.focuss()
+ },
// 鏄惁婊℃澘
isFullPlt() {
var temp = this.ck1
@@ -554,6 +559,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
fullPlt: that.fullPlt,
+ owner: that.storeId,
barcode: that.barcode,
combMats: that.dataList
}),
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 96ee51a..8243044 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -22,14 +22,27 @@
</view>
<view class="item">
<view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" style="width: 350rpx;" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons>
<view class="item-right">
<button></button>
<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" style="width: 25vw;">鏄惁婊℃澘:</view>
+ <radio-group @change="isFullPlt">
+ <label>
+ <radio :checked="ck1" /><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </view>
</view>
+
<view class="mat-list-title">
鍟嗗搧鍒楄〃
</view>
@@ -172,6 +185,9 @@
matFocus: false,
matData: '',
removeNum: 0,
+ ck1: false,
+ ck2: true,
+ fullPlt: 'N',
}
},
onLoad() {
@@ -190,6 +206,21 @@
},
methods: {
back() { uni.navigateBack({}) },
+ // 鏄惁婊℃澘
+ isFullPlt() {
+ var temp = this.ck1
+ this.ck1 = this.ck2
+ this.ck2 = temp
+ if (this.ck1) {
+ this.fullPlt = 'Y'
+ } else {
+ this.fullPlt = 'N'
+ }
+ },
+ clearMatnr() {
+ // this.matnr = ''
+ this.focuss()
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -222,7 +253,7 @@
},
// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
focuss() {
- this.focus = false;
+ this.matFocus = false;
setTimeout(() => {
this.matnr = '';
this.matFocus = true;
@@ -416,6 +447,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
owner: that.store,
+ fullPlt: that.fullPlt,
barcode: that.barcode,
combMats: that.dataList
}),
@@ -479,7 +511,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 210rpx;
background-color: #FFF;
z-index: 10;
}
@@ -487,7 +519,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
--
Gitblit v1.9.1