From b90f28462645ca44ed5f34d74d0294a451fc0d4e Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 31 Jan 2023 14:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/my.vue                                     | 9 +++++++++
 pages/purchase/apply.vue                              | 2 +-
 pages/purchase/newSpecs.vue                           | 2 +-
 pages/purchase/specs.vue                              | 1 +
 uni_modules/d-picker/components/d-picker/d-picker.vue | 8 +++++++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pages/home/my.vue b/pages/home/my.vue
index 6d9b9e3..2b62f98 100644
--- a/pages/home/my.vue
+++ b/pages/home/my.vue
@@ -62,6 +62,15 @@
 			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
 				<text class="plant-gerenzhongxinwode"/> <text>个人信息</text> <text class="plant-youbian"/>
 			</view>
+			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
+				<text class="plant-gerenzhongxinwode"/> <text>修改密码</text> <text class="plant-youbian"/>
+			</view>
+			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
+				<text class="plant-gerenzhongxinwode"/> <text>采购记录</text> <text class="plant-youbian"/>
+			</view>
+			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
+				<text class="plant-gerenzhongxinwode"/> <text>领用记录</text> <text class="plant-youbian"/>
+			</view>
 			<view class="item">
 				<text class="plant-tuichu"/> <text>退出</text> <text class="plant-youbian"/>
 			</view>
diff --git a/pages/purchase/apply.vue b/pages/purchase/apply.vue
index 5e8f8cb..6f1702c 100644
--- a/pages/purchase/apply.vue
+++ b/pages/purchase/apply.vue
@@ -175,7 +175,7 @@ export default {
 				body: this.formData
 			})
 			if(res.statu){
-
+				uni.showToast({title:"保存成功！",icon:"success"})
 			}else{
 				uni.showModal({
 					title:"提示",
diff --git a/pages/purchase/newSpecs.vue b/pages/purchase/newSpecs.vue
index 3b1feed..e0976b4 100644
--- a/pages/purchase/newSpecs.vue
+++ b/pages/purchase/newSpecs.vue
@@ -74,7 +74,7 @@
 			keyName="label"
 			@close="show=false"
 			@cancel="show=false"
-			@confirm="formData.dressingUnit=$event;show=false"/>
+			@confirm="formData.dressingUnit=$event.value[0].value;show=false"/>
 	</view>
 </template>
 <script>
diff --git a/pages/purchase/specs.vue b/pages/purchase/specs.vue
index 32ef8f7..7d1c02f 100644
--- a/pages/purchase/specs.vue
+++ b/pages/purchase/specs.vue
@@ -212,6 +212,7 @@ export default{
 			}
 		},
 		async setGoodsVal(val){
+			console.log(val,'----------setGoodsVal-----------------')
 			this.purchaseId=val.id
 			this.formData.goodsName=val.goodsName
 			this.formData.detailedType=val.detailedType
diff --git a/uni_modules/d-picker/components/d-picker/d-picker.vue b/uni_modules/d-picker/components/d-picker/d-picker.vue
index 4de6d36..42d7441 100644
--- a/uni_modules/d-picker/components/d-picker/d-picker.vue
+++ b/uni_modules/d-picker/components/d-picker/d-picker.vue
@@ -62,7 +62,7 @@
 	<u-popup class="dPicker" :show="show" @close="show=false">
 		<view class="btns">
 			<button class="cu-btn sm" @click="show=false">取消</button>
-			<button class="cu-btn sm bg-green" @click="$emit('select',list[changeVal||value]);show=false">确定</button>
+			<button class="cu-btn sm bg-green" @click="$emit('select',list[sureVal]);show=false">确定</button>
 		</view>
 		<picker-view :value="[value]" indicator-style="height:90rpx;" @change="changeVal=$event.detail.value[0]">
 			<picker-view-column>
@@ -75,6 +75,7 @@
 	</u-popup>
 </template>
 <script>
+import {dataType} from 'black-knight/lib/config/tools'
 	export default{
 		props:{
 			list:{
@@ -92,6 +93,11 @@
 				changeVal:null,
 			}
 		},
+		computed:{
+			sureVal(){
+				return dataType(this.changeVal,'number')?this.changeVal:this.value
+			}
+		},
 		watch:{
 			show(n){
 				if(!n){