From 811cafda3d16f7c6db6247c55b92fb01ca4844d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 24 Apr 2024 09:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E5=8D=8F=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/inWarehouse/inWarehouse.vue |  2 +-
 pages/index/index.vue             | 21 ++++++++++++++-------
 pages/user/user.vue               |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index eb6d30e..a4fe608 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -24,7 +24,7 @@
 		</view>
 		<!-- 货物列表 -->
 		<view class="scroll-view-box">
-			<view class="scroll-view-title">{{this.isStrict?'':'无校验'}}入库清单</view>
+			<view class="scroll-view-title">{{this.isStrict?'':'外协'}}入库清单</view>
 			<view class="scroll-view-last" v-if="newMaterialList.length > 1">上次批次号：{{ newMaterialList[newMaterialList.length - 2].patchCode }}</view>
 			<view class="scroll-view-last" v-if="newMaterialList.length === 1">上次批次号：</view>
 			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 56dad08..ac8f6a2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,31 +1,31 @@
 <template>
 	<view class="home-container">
 		<u--text text="入库" size="36" bold></u--text>
-		<u-grid :border="true" @click="gridCheck" col="4">
+		<u-grid :border="false" @click="gridCheck" col="4">
 			<u-grid-item v-if="item.type === 1" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
 				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
 				<text class="grid-text">{{item.name}}</text>
 			</u-grid-item>
 		</u-grid>
-		<u-gap height="40"></u-gap>
+		<u-gap height="20"></u-gap>
 		<u--text text="出库" size="36" bold></u--text>
-		<u-grid :border="true" @click="gridCheck" col="4">
+		<u-grid :border="false" @click="gridCheck" col="4">
 			<u-grid-item v-if="item.type === 2" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
 				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
 				<text class="grid-text">{{item.name}}</text>
 			</u-grid-item>
 		</u-grid>
-		<u-gap height="40"></u-gap>
+		<u-gap height="20"></u-gap>
 		<u--text text="库存操作" size="36" bold></u--text>
-		<u-grid :border="true" @click="gridCheck" col="4">
+		<u-grid :border="false" @click="gridCheck" col="4">
 			<u-grid-item v-if="item.type === 3" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
 				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
 				<text class="grid-text">{{item.name}}</text>
 			</u-grid-item>
 		</u-grid>
-		<u-gap height="40"></u-gap>
+		<u-gap height="20"></u-gap>
 		<u--text text="库内操作" size="36" bold></u--text>
-		<u-grid :border="true" @click="gridCheck" col="4">
+		<u-grid :border="false" @click="gridCheck" col="4">
 			<u-grid-item v-if="item.type === 4" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
 				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
 				<text class="grid-text">{{item.name}}</text>
@@ -70,6 +70,13 @@
 						type: 1,
 						index: 4
 					},
+					{
+						name: '外协入库',
+						icon: 'grid-fill',
+						url: '/pages/inWarehouse/inWarehouse?isStrict=false',
+						type: 1,
+						index: 14
+					},
 					{
 						name: '成品出库',
 						icon: 'grid-fill',
diff --git a/pages/user/user.vue b/pages/user/user.vue
index a86a617..9817c98 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -11,7 +11,7 @@
 					<!-- <text class="font">手机号：{{userInfo.phonenumber}}</text> -->
 				</view>
 			</view>
-			<uni-card class="card-box" is-shadow>
+			<!-- <uni-card class="card-box" is-shadow>
 				<u-grid :border="false" @click="gridClick" col="3">
 					<u-grid-item v-for="(baseListItem,baseListIndex) in gridList" :key="baseListIndex"
 						:name="baseListItem.url">
@@ -19,7 +19,7 @@
 						<text class="grid-text">{{baseListItem.title}}</text>
 					</u-grid-item>
 				</u-grid>
-			</uni-card>
+			</uni-card> -->
 			<u-cell-group>
 				<u-cell :iconStyle="{fontSize:'24px',color:'#2979ff'}" icon="server-man" title="问题反馈" isLink></u-cell>
 				<u-cell :iconStyle="{fontSize:'24px',color:'#909399'}" icon="setting-fill" title="个人设置" isLink></u-cell>