From c390c642dbf9d95ccc820ba59b25591c2b376a45 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 02 三月 2024 14:04:26 +0800
Subject: [PATCH] #

---
 pages/basics/order.vue |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/pages/basics/order.vue b/pages/basics/order.vue
index 752f385..47dd66d 100644
--- a/pages/basics/order.vue
+++ b/pages/basics/order.vue
@@ -9,13 +9,13 @@
 				<view class="square-content">
 					<view class="content-input">
 						<input  v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="10"
-						:focus="barcodeFocus" @input="barcodeInput">
+						:focus="barcodeFocus" @input="barcodeInput" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
 			</view>
 			
-			<view class="square-2">
+			<!-- <view class="square-2">
 				<view class="square-title">
 					<view class="title-sign"><view class="sign"></view></view>
 					<view class="title-text"><text>鍗曟嵁缂栧彿</text></view>
@@ -23,8 +23,25 @@
 				<view class="square-content">
 					<view class="content-input">
 						<input v-model="order" type="text" placeholder="鎵爜 / 杈撳叆" @input="findOrder()"
-						:focus="focus">
+						:focus="focus" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeOrder()"></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-btn">
+						<input v-model="order" 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>
@@ -125,6 +142,7 @@
 	export default {
 		data() {
 			return {
+				commonUrl:null,
 				barcode: '',
 				barcodeFocus:true,
 				focus:false,
@@ -150,8 +168,15 @@
 			this.baseIP = UIP;
 			const UPORT = uni.getStorageSync('UPORT');
 			this.basePORT = UPORT
+			const PROJ = uni.getStorageSync('UPROJ');
+			this.baseUrl = PROJ
+			this.getUrl()
 		},
 		methods: {
+			// 鑾峰彇url
+			getUrl() {
+				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
 				var len = this.barcode.length
@@ -283,7 +308,7 @@
 				}
 				uni.showLoading();
 				uni.request({
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
+				    url: that.commonUrl + '/mobile/comb/auth',
 				    data: JSON.stringify({
 						orderNo: that.orderNo,
 						barcode: that.barcode,
@@ -299,13 +324,10 @@
 						if (res.code === 200) {
 							uni.showToast({
 								title: res.msg,
-								position: 'bottom',
+								position: 'top',
 								duration: 1000
 							});
-							that.barcode = ''
-							that.orderNo = ''
-							that.order = ''
-							that.matList = []
+							that.resst()
 						} else if (res.code == 403) {
 							uni.showToast({title: res.msg, icon: "none", position: 'top'})
 							setTimeout(() => {
@@ -322,7 +344,7 @@
 			findOrder() {
 				let that = this
 				uni.request({
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/order/search/orderNo/auth',
+				    url: that.commonUrl + '/mobile/order/search/orderNo/auth',
 				    data: {
 						orderNo: that.order
 				    },

--
Gitblit v1.9.1