From 4b50f602850763d852deaeaa53b3347c9df53d14 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期三, 26 十月 2022 22:23:14 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 1
pages/basics/piking.vue | 40 ++++++++++---
pages/basics/stockCheck.vue | 66 ++++++++++++++++++----
unpackage/cache/apk/__UNI__DA5854D_cm.apk | 0
components/y-pop/y-pop.vue | 54 +++++++++++++++---
5 files changed, 130 insertions(+), 31 deletions(-)
diff --git a/components/y-pop/y-pop.vue b/components/y-pop/y-pop.vue
index 403dacc..ec5e617 100644
--- a/components/y-pop/y-pop.vue
+++ b/components/y-pop/y-pop.vue
@@ -1,14 +1,14 @@
<template>
- <view class="canvas">
+ <view class="canvas flex-center" v-show="show">
<view class="main">
- <view class="titles">
+ <view class="titles flex-center">
{{title}}
</view>
- <view class="decs">
- <slot></slot>
+ <view class="decs flex-center">
+ <uni-number-box v-model="num" :max="max" :min="min"></uni-number-box>
</view>
- <view class="operation">
- {{title}}
+ <view class="operation flex-center">
+ <button size="mini" @click="confrim">纭</button>
</view>
</view>
</view>
@@ -21,11 +21,50 @@
type: [String,Number],
default: 'title'
},
+ // num: {
+ // type: Number,
+ // default: 0
+ // },
+ max: {
+ type: Number,
+ default: 100
+ },
+ min: {
+ type: Number,
+ default: 0
+ },
+ show: {
+ type: Boolean,
+ default: false
+ }
},
+ watch: {
+ // num(num) {
+ // this.num = num
+ // },
+ show(show) {
+ this.show = show
+ }
+ },
+ data() {
+ return {
+ num: 0,
+ };
+ },
+ methods: {
+ confrim() {
+ this.show = false
+ },
+ }
}
</script>
<style>
+ .flex-center {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
.canvas {
height: 100vh;
width: 100%;
@@ -33,9 +72,6 @@
position: fixed;
left: 0;
top: 0;
- display: flex;
- align-items: center;
- justify-content: center;
}
.main {
width: 80%;
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 4d39b4d..1ce0727 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -84,7 +84,6 @@
<button class="cu-btn bg-blue " @click="comb()">缁勬墭</button>
</label>
</view>
-
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
<uni-popup ref="revise" background-color="#fff">
diff --git a/pages/basics/piking.vue b/pages/basics/piking.vue
index f5f363b..5e37e47 100644
--- a/pages/basics/piking.vue
+++ b/pages/basics/piking.vue
@@ -61,22 +61,25 @@
</view>
</view>
</scroll-view>
-
+ <y-pop>
+ </y-pop>
<view>
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#fff" @change="change">
+ <uni-popup ref="revise" @change="change">
<view class="revise-box">
<view class="revise-box-top">
<view class="color-block-blue"></view>
<text class="title">淇敼</text>
</view>
- <view class="text-box">
- <text>鍙粍鏁伴噺锛歿{enableQty}}</text>
- </view>
- <view class="changeBox">
- <view class="num-box">
- <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474" @change="changeValue"/>
- </view>
+ <view class="change">
+ <view class="text-box">
+ <text>鏁伴噺锛歿{enableQty}}</text>
+ </view>
+ <view class="changeBox">
+ <view class="num-box">
+ <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474" @change="changeValue"/>
+ </view>
+ </view>
</view>
<view class="revise-box-buttom">
<view>
@@ -297,6 +300,25 @@
} // exprot
</script>
<style>
+ .revise-box {
+ width: 500rpx;
+ height: 300rpx;
+ display: flex;
+ flex-direction: column;
+ border-radius: 20rpx;
+ background-color: #fff;
+ }
+ .change {
+ height: 150rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .revise-box-buttom {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
.pak-seach-box {
background-color: #FFFFFF;
margin: 15rpx 15rpx 0rpx 15rpx;
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 1022705..3358a66 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -26,6 +26,22 @@
</view>
</view>
</view>
+ <view class="square-2">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>娣诲姞鍟嗗搧</text></view>
+ </view>
+ <view class="square-content">
+ <view class="content-input-btn">
+ <input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+ :focus="focus" placeholder-style="line-height: 85rpx;">
+ <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
+ </view>
+ <view class="content-btn">
+ <button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
+ </view>
+ </view>
+ </view>
<view class="pak-data-box">
<view class="box-top">
<view class="color-block-blue"></view>
@@ -61,23 +77,26 @@
</view>
</view>
</scroll-view>
- <y-pop title="璋冩暣"></y-pop>
+ <!-- <y-pop v-model="count" title="淇敼" :max="9999999" :show="show"></y-pop> -->
<view>
<!-- 淇敼鏁伴噺 -->
- <uni-popup ref="revise" background-color="#fff" @change="change">
+ <uni-popup ref="revise" @change="change">
<view class="revise-box">
<view class="revise-box-top">
<view class="color-block-blue"></view>
<text class="title">淇敼</text>
</view>
- <view class="text-box">
- <text>鍙粍鏁伴噺锛歿{enableQty}}</text>
+ <view class="change">
+ <view class="text-box">
+ <text>鏁伴噺锛歿{enableQty}}</text>
+ </view>
+ <view class="changeBox">
+ <view class="num-box">
+ <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474" @change="changeValue"/>
+ </view>
+ </view>
</view>
- <view class="changeBox">
- <view class="num-box">
- <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474" @change="changeValue"/>
- </view>
- </view>
+
<view class="revise-box-buttom">
<view>
<button class="cu-btn bg-blue" @click="confirm()">纭</button>
@@ -94,16 +113,19 @@
data() {
return {
commonUrl:null,
- matList:[{}],
+ matList:[],
staNoList:[],
barcode: '',
staNo:'',
matnr:'',
enableQty:'',
- count:'',
+ count:15,
maxCount:'',
minCount:0,
- rowNum:''
+ rowNum:'',
+ show: false,
+ focus: false,
+
}
},
mounted(){
@@ -237,6 +259,7 @@
this.maxCount = item.maxCount
this.rowNum = index
this.eject()
+ // this.show = true
},
remove(item,index) {
this.matList.splice(index,1)
@@ -297,6 +320,25 @@
} // exprot
</script>
<style>
+ .revise-box {
+ width: 500rpx;
+ height: 300rpx;
+ display: flex;
+ flex-direction: column;
+ border-radius: 20rpx;
+ background-color: #F1F1F1;
+ }
+ .change {
+ height: 150rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .revise-box-buttom {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
.pak-seach-box {
background-color: #FFFFFF;
margin: 15rpx 15rpx 0rpx 15rpx;
diff --git a/unpackage/cache/apk/__UNI__DA5854D_cm.apk b/unpackage/cache/apk/__UNI__DA5854D_cm.apk
index bc16c5d..b2de1b6 100644
--- a/unpackage/cache/apk/__UNI__DA5854D_cm.apk
+++ b/unpackage/cache/apk/__UNI__DA5854D_cm.apk
Binary files differ
--
Gitblit v1.9.1