From 9e0ddea78ab892d1ffd819965fc703850b247205 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 十月 2023 08:05:44 +0800
Subject: [PATCH] #

---
 pages/home/home.vue       |   82 ++++++++++++++++++++++------------------
 pages/mat/matSelected.vue |   22 ++++++++--
 pages.json                |    8 +++
 pages/pakin/pakin.vue     |    2 
 4 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/pages.json b/pages.json
index 00bda98..1d6996c 100644
--- a/pages.json
+++ b/pages.json
@@ -37,6 +37,12 @@
 			}
 		},
 		{
+			"path": "pages/order/createOrder",
+			"style": {
+				"navigationBarTitleText": "鐢熸垚璁㈠崟"
+			}
+		},
+		{
 			"path": "pages/order/orderPutOn",
 			"style": {
 				"navigationBarTitleText": "璁㈠崟涓婃灦"
@@ -93,7 +99,7 @@
 		{
 			"path": "pages/order/orderPutOn2",
 			"style": {
-				"navigationBarTitleText": "璁㈠崟缁勬墭2"
+				"navigationBarTitleText": "璁㈠崟缁勬墭"
 			}
 		},
 		{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 720897a..adf7b0c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -39,19 +39,20 @@
 					// 	url: '/order/orderPakin'
 					// },
 					{
+						title: '璁㈠崟缁勬墭',
+						name: 'putOn',
+						color: 'cyan',
+						cuIcon: 'pullup',
+						url: '/order/orderPutOn2'
+					},
+					{
 						title: '缁勬墭涓婃灦',
 						name: 'putOn',
 						color: 'cyan',
 						cuIcon: 'pullup',
 						url: '/pakin/putOn'
 					},
-					// {
-					// 	title: '璁㈠崟缁勬墭2',
-					// 	name: 'putOn',
-					// 	color: 'cyan',
-					// 	cuIcon: 'pullup',
-					// 	url: '/order/orderPutOn2'
-					// },
+					
 					// {
 					// 	title: '璁㈠崟缁勬墭3',
 					// 	name: 'putOn',
@@ -67,12 +68,19 @@
 					// 	url: '/print/print'
 					// },
 					{
-						title: '璁㈠崟涓婃灦',
+						title: '鐢熸垚璁㈠崟',
 						name: 'orderPutOn',
 						color: 'mauve',
 						cuIcon: 'pullup',
-						url: '/order/orderPutOn'
+						url: '/order/createOrder'
 					},
+					// {
+					// 	title: '璁㈠崟涓婃灦',
+					// 	name: 'orderPutOn',
+					// 	color: 'mauve',
+					// 	cuIcon: 'pullup',
+					// 	url: '/order/orderPutOn'
+					// },
 					{
 						title: '璁㈠崟涓嬫灦',
 						name: 'orderPutDown',
@@ -101,34 +109,34 @@
 						cuIcon: 'order',
 						url: '/loc/locMove'
 					},
-					{
-						title: '鍟嗗搧鎵撳嵃',
-						name: 'matList',
-						color: 'orange',
-						cuIcon: 'post',
-						url: '/mat/matList'
-					},
-					{
-						title: '琛ヨ揣',
-						name: 'restock',
-						color: 'yellow',
-						cuIcon: 'punch',
-						url: '/stock/restock'
-					},
-					{
-						title: '杞叏鏉�',
-						name: 'piking',
-						color: 'olive',
-						cuIcon: 'order',
-						url: '/pakin/piking'
-					},
-					{
-						title: '鎹㈡澘缁戝畾',
-						name: 'changePallet',
-						color: 'green',
-						cuIcon: 'order',
-						url: '/stock/changePallet'
-					},
+					// {
+					// 	title: '鍟嗗搧鎵撳嵃',
+					// 	name: 'matList',
+					// 	color: 'orange',
+					// 	cuIcon: 'post',
+					// 	url: '/mat/matList'
+					// },
+					// {
+					// 	title: '琛ヨ揣',
+					// 	name: 'restock',
+					// 	color: 'yellow',
+					// 	cuIcon: 'punch',
+					// 	url: '/stock/restock'
+					// },
+					// {
+					// 	title: '杞叏鏉�',
+					// 	name: 'piking',
+					// 	color: 'olive',
+					// 	cuIcon: 'order',
+					// 	url: '/pakin/piking'
+					// },
+					// {
+					// 	title: '鎹㈡澘缁戝畾',
+					// 	name: 'changePallet',
+					// 	color: 'green',
+					// 	cuIcon: 'order',
+					// 	url: '/stock/changePallet'
+					// },
 					{
 						title: '閫�鍑虹櫥褰�',
 						name: 'logOut',
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 60560ac..61384d4 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -2,16 +2,28 @@
 	<view>
 		<view class="form">
 			<view class="form-item">
-				<view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
+				<view class="form-item-desc"><text>鍒嗗寘鐮�</text></view>
 				<view class="form-item-content"><text>{{mat.matnr}}</text></view>
 			</view>
 			<view class="form-item">
-				<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
-				<view class="form-item-content"><text>{{mat.maktx}}</text></view>
+				<view class="form-item-desc"><text>璁㈠崟鍙�</text></view>
+				<view class="form-item-content"><text>{{mat.orderNo}}</text></view>
 			</view>
 			<view class="form-item">
-				<view class="form-item-desc"><text>瑙勬牸</text></view>
-				<view class="form-item-content"><text>{{mat.specs}}</text></view>
+				<view class="form-item-desc"><text>鐗╂祦鏂瑰悜</text></view>
+				<view class="form-item-content"><text>{{mat.string1}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>鍒嗙被</text></view>
+				<view class="form-item-content"><text>{{mat.tag}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>灏哄</text></view>
+				<view class="form-item-content"><text>{{mat.size}}</text></view>
+			</view>
+			<view class="form-item">
+				<view class="form-item-desc"><text>浣撶Н</text></view>
+				<view class="form-item-content"><text>{{mat.volume}}</text></view>
 			</view>
 			<!-- <view class="form-item">
 				<view class="form-item-desc"><text>鎵瑰彿</text></view>
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 483aa1d..456e187 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -141,7 +141,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
-				dataList: [{}],
+				dataList: [],
 				count: 0,
 				rowNum: '',
 				matnr: '',

--
Gitblit v1.9.1