From 28a1197bac94552ff4b0353fa7654a7ee5ee885f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 11 四月 2023 16:22:56 +0800
Subject: [PATCH] #

---
 pages/basics/changePallet.vue |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 manifest.json                 |    2 
 pages/basics/outPakin.vue     |    6 +-
 pages.json                    |    9 ++++
 pages/index/index.vue         |    6 +++
 5 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 278e9b2..fad9c9f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "20220825A",
+    "versionName" : "20230411B",
     "versionCode" : 103,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
diff --git a/pages.json b/pages.json
index 9ca07af..2733416 100644
--- a/pages.json
+++ b/pages.json
@@ -126,6 +126,15 @@
 		        "enablePullDownRefresh": false
 				
 		    }
+		},
+		{
+		    "path" : "pages/basics/changePallet",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "鎹㈡澘缁戝畾",
+		        "enablePullDownRefresh": false
+				
+		    }
 		}
 		
 		
diff --git a/pages/basics/changePallet.vue b/pages/basics/changePallet.vue
new file mode 100644
index 0000000..ac5573c
--- /dev/null
+++ b/pages/basics/changePallet.vue
@@ -0,0 +1,94 @@
+<template>
+	<view >
+		<scroll-view scroll-y catch:touchmove="touchmove">
+			<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">
+						<input readonly="value" v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8"
+						:focus="barcodeFocus" @input="nextInput">
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
+					</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">
+						<input v-model="matnrId" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+						:focus="focus"@focus="empty()">
+						 <!-- :focus="focus" @blur="clear "> -->
+						<!-- @focus="focuss" -->
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="foucss()"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="footer flex justify-around">
+			<view>
+				<button class="cu-btn lg" @click="resst()">閲嶇疆</button>
+			</view>
+			<view>
+				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/common/permission.js"
+	export default {
+		data() {
+			return {
+				commonUrl:null,
+				barcode: '',
+				barcodeFocus:true,
+				focus:false,
+				hide:true,
+				msgType: 'success',
+				messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
+				
+			}
+		},
+		mounted(){
+			const UIP = uni.getStorageSync('UIP');
+			this.baseIP = UIP;
+			const UPORT = uni.getStorageSync('UPORT');
+			this.basePORT = UPORT
+			const PROJ = uni.getStorageSync('UPROJ');
+			this.baseUrl = PROJ
+			this.getUrl()
+		},
+		onLoad() {
+			// #ifdef APP
+			setInterval(()=>{
+				if (this.hide) {
+					uni.hideKeyboard()
+				} else {
+					
+				}
+			},20)
+			// #endif
+		},
+		methods: {
+			// 鑾峰彇url
+			getUrl() {
+				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+			},
+		}
+	}
+</script>
+
+
+
+<style>
+	.pakin-btn {
+		background-color: #1E9FFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index f554a9c..4a5cd3c 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -29,7 +29,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="square-1">
+			<!-- <view class="square-1">
 				<view class="square-title" style="display: flex;">
 					<view class="title-sign"><view class="sign"></view></view>
 					<view class="title-text" style="width: 200rpx;"><text>鎷ユ湁鑰�</text></view>
@@ -37,7 +37,7 @@
 						<uni-combox :candidates="ownerList" placeholder="璇烽�夋嫨鎷ユ湁鑰�" v-model="owner"></uni-combox>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="square-1">
 				<view class="square-title">
 					<view class="title-sign"><view class="sign"></view></view>
@@ -227,7 +227,7 @@
 				    data: JSON.stringify({
 						barcode: that.barcode,
 						origin: that.origin,
-						owner: that.ownerId,
+						owner: 1,
 						combMats: that.matList
 					}),
 					method: 'POST',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 06793a1..a7f2d42 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -60,6 +60,12 @@
 						cuIcon: 'safe'
 					},
 					{
+						title: '鎹㈡澘缁戝畾',
+						name: 'changePallet',
+						color: 'blue',
+						cuIcon: 'refresh'
+					},
+					{
 						title: '缁勬墭鍏ュ簱',
 						name: 'pakin',
 						color: 'grey',

--
Gitblit v1.9.1