From c374c2573c98919b9f249de0ab404e2e3718a13e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 12 四月 2023 07:11:29 +0800
Subject: [PATCH] #

---
 pages/basics/outPakin.vue |   10 +++-
 pages/index/index.vue     |   96 ++++++++++++++++++++++++------------------------
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 4a5cd3c..d01d3c3 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>
@@ -185,7 +185,11 @@
 					url: that.commonUrl + '/locOwner/list/auth',
 					header: {'token':uni.getStorageSync('token')},
 					success(result) {
+						console.log(result);
 						for (var i = 0; i < result.data.data.records.length; i++) {
+							if(result.data.data.records[i].id == 1){
+								break
+							}
 							that.ownerList.push(result.data.data.records[i].owner)
 						}
 						that.ownerList2 = result.data.data.records
@@ -227,7 +231,7 @@
 				    data: JSON.stringify({
 						barcode: that.barcode,
 						origin: that.origin,
-						owner: 1,
+						owner: that.owner,
 						combMats: that.matList
 					}),
 					method: 'POST',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a7f2d42..1475260 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,60 +23,60 @@
 		data() {
 			return {
 				elements:[
-					{
-						title: '涓嬬嚎鎵撳寘',
-						name: 'offline',
-						color: 'blue',
-						cuIcon: 'forward'
-					},
+					// {
+					// 	title: '涓嬬嚎鎵撳寘',
+					// 	name: 'offline',
+					// 	color: 'blue',
+					// 	cuIcon: 'forward'
+					// },
 					{
 						title: '濮斿鍏ュ簱',
 						name: 'outPakin',
 						color: 'blue',
 						cuIcon: 'copy'
 					},
-					{
-						title: '鍏ュ簱閫氳繃妗�',
-						name: 'notificationFile',
-						color: 'blue',
-						cuIcon: 'copy'
-					},
-					{
-						title: '鍑哄簱纭',
-						name: 'checkout',
-						color: 'blue',
-						cuIcon: 'edit'
-					},
-					{
-						title: '娈嬫鍝�',
-						name: 'bad',
-						color: 'blue',
-						cuIcon: 'delete'
-					},
-					{
-						title: '搴撲綅鐩樼偣',
-						name: 'stockCheck',
-						color: 'blue',
-						cuIcon: 'safe'
-					},
-					{
-						title: '鎹㈡澘缁戝畾',
-						name: 'changePallet',
-						color: 'blue',
-						cuIcon: 'refresh'
-					},
-					{
-						title: '缁勬墭鍏ュ簱',
-						name: 'pakin',
-						color: 'grey',
-						cuIcon: 'copy'
-					},
-					{
-						title: '璁㈠崟缁勬墭',
-						name: 'order',
-						color: 'grey',
-						cuIcon: 'goods'
-					},
+					// {
+					// 	title: '鍏ュ簱閫氳繃妗�',
+					// 	name: 'notificationFile',
+					// 	color: 'blue',
+					// 	cuIcon: 'copy'
+					// },
+					// {
+					// 	title: '鍑哄簱纭',
+					// 	name: 'checkout',
+					// 	color: 'blue',
+					// 	cuIcon: 'edit'
+					// },
+					// {
+					// 	title: '娈嬫鍝�',
+					// 	name: 'bad',
+					// 	color: 'blue',
+					// 	cuIcon: 'delete'
+					// },
+					// {
+					// 	title: '搴撲綅鐩樼偣',
+					// 	name: 'stockCheck',
+					// 	color: 'blue',
+					// 	cuIcon: 'safe'
+					// },
+					// {
+					// 	title: '鎹㈡澘缁戝畾',
+					// 	name: 'changePallet',
+					// 	color: 'blue',
+					// 	cuIcon: 'refresh'
+					// },
+					// {
+					// 	title: '缁勬墭鍏ュ簱',
+					// 	name: 'pakin',
+					// 	color: 'grey',
+					// 	cuIcon: 'copy'
+					// },
+					// {
+					// 	title: '璁㈠崟缁勬墭',
+					// 	name: 'order',
+					// 	color: 'grey',
+					// 	cuIcon: 'goods'
+					// },
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',

--
Gitblit v1.9.1