From 177a9f745a73a1be9b068d5028edc4367d0470b0 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 30 八月 2023 18:31:16 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages/allocation/allocation.vue |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/minipro_standard/pages/allocation/allocation.vue b/minipro_standard/pages/allocation/allocation.vue
index 9d214a0..43022fc 100644
--- a/minipro_standard/pages/allocation/allocation.vue
+++ b/minipro_standard/pages/allocation/allocation.vue
@@ -7,21 +7,21 @@
 					<text>璁″垝鐢熶骇鏁伴噺锛�</text>
 				</view>
 				<view class="fp_list_item_right">
-					<input type="number" v-model="form.num" placeholder="璇疯緭鍏�" />
+					<u--input placeholder="璇疯緭鍏�" :customStyle="{width: '180rpx'}" inputAlign="right" type="number" border="surround" v-model="form.num"></u--input>
 				</view>
 			</view>
-			<view class="fp_list_item" @click="timeShow = true">
+			<view class="fp_list_item">
 				<view class="fp_list_item_left">
 					<text style="color: #f00;">*</text>
 					<text>璁″垝寮�宸ユ棩鏈燂細</text>
 				</view>
-				<view class="fp_list_item_right">
+				<view class="fp_list_item_right" @click="timeShow = true">
 					<text class="black" v-if="form.startTime">{{form.startTime}}</text>
 					<text v-else>骞� / 鏈� / 鏃�</text>
 					<u-icon name="arrow-right" color="#999999"></u-icon>
 				</view>
 			</view>
-			<view class="fp_list_item" @click="openSB">
+			<view class="fp_list_item" @click="show = true">
 				<view class="fp_list_item_left">
 					<text>鐢熶骇璁惧</text>
 				</view>
@@ -36,8 +36,8 @@
 					<text>鐢熶骇浜哄憳</text>
 				</view>
 				<view class="fp_list_item_right">
-					<u-checkbox-group v-model="form.personnelId" direction="horizontal" v-show="personnelData.length > 0">
-						<u-checkbox :name="item.id" v-for="(item, index) in personnelData" :key="index" checked-color="#4275FC">{{item.text}}</u-checkbox>
+					<u-checkbox-group v-model="form.personnelId" v-show="personnelData.length > 0">
+						<u-checkbox :name="item.id" v-for="(item, index) in personnelData" :key="index" activeColor="#4275FC">{{item.text}}</u-checkbox>
 					</u-checkbox-group>
 					<view class="wu" v-show="personnelData.length === 0">
 						<text>鏆傛棤鏁版嵁</text>
@@ -50,7 +50,9 @@
 			<button class="fp_footer_submit" @click="submit">纭</button>
 		</view>
 		<!-- 閫夋嫨鏃ユ湡 -->
-		<u-calendar :show="timeShow" mode="range" @confirm="timeConfirm"></u-calendar>
+		<u-calendar :show="timeShow" @close="timeShow = false" @confirm="timeConfirm"></u-calendar>
+		<!-- 閫夋嫨璁惧 -->
+		<u-picker :show="show" :columns="columns" @confirm="confirm" @cancel="show = false" keyName="label"></u-picker>
 	</view>
 </template>
 
@@ -59,22 +61,33 @@
 	export default {
 		data() {
 			return {
+				show: false,
+				columns: [[{ label: '璁惧涓�' }]],
 				form: {
-					num: $route.query.num,        // 鐢熶骇鏁伴噺
+					num: '',        // 鐢熶骇鏁伴噺
 					startTime: gsdate(new Date()),      // 寮�濮嬫椂闂�
 					equipmentId: '',    // 璁惧id
 					equipmentName: '',    // 璁惧鍚嶇О 
 					personnelId: []    // 浜哄憳id
 				},
+				personnelData: [],    // 浜哄憳鏁版嵁
 				timeShow: false
 			};
+		},
+		onLoad(option) {
+			this.form.num = option.num
 		},
 		methods: {
 			go() {
 				uni.navigateBack({ delta: 1 });
 			},
+			confirm(val) {
+				this.form.equipmentName = val.value[0].label
+				this.form.equipmentId = 1
+				this.show = false
+			},
 			timeConfirm(val) {
-				console.log(val)
+				this.form.startTime = val[0]
 				this.timeShow = false
 			}
 		}
@@ -109,7 +122,7 @@
 					font-weight: 400;
                 }
             }
-            .fp_list_item_right v-deep {
+            .fp_list_item_right {
                 display: flex;
                 align-items: center;
                 .wu {
@@ -146,7 +159,7 @@
                     width: 180rpx;
                     height: 60rpx;
                     border-radius: 8rpx;
-                    border: 1rpx solid #E5E5E5;
+                    border: 2rpx solid #E5E5E5;
                     padding: 0 30rpx;
                     text-align: right;
                     font-size: 25rpx;

--
Gitblit v1.9.3