From d3fdb7d54b346f46aa17484dda5af59d70586dd6 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期三, 17 十二月 2025 09:21:11 +0800
Subject: [PATCH] 安佑农牧-修改生产报工适配问题
---
src/pages/productionManagement/productionDispatching/components/DispatchModal.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/pages/productionManagement/productionDispatching/components/DispatchModal.vue b/src/pages/productionManagement/productionDispatching/components/DispatchModal.vue
index 95c3705..99a719a 100644
--- a/src/pages/productionManagement/productionDispatching/components/DispatchModal.vue
+++ b/src/pages/productionManagement/productionDispatching/components/DispatchModal.vue
@@ -1,7 +1,7 @@
<template>
- <up-popup
- v-model:show="show"
- mode="bottom"
+ <uni-popup
+ ref="popup"
+ type="bottom"
:round="20"
:safeAreaInsetBottom="true"
@close="handleClose"
@@ -131,7 +131,7 @@
@confirm="handleDateSelect"
@cancel="showDatePicker = false"
/>
- </up-popup>
+ </uni-popup>
</template>
<script setup>
@@ -141,12 +141,13 @@
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
+
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
const emit = defineEmits(['confirm']);
// 寮圭獥鏄剧ず鐘舵��
-const show = ref(false);
+const popup = ref()
const submitting = ref(false);
// 閫夋嫨鍣ㄦ樉绀虹姸鎬�
@@ -155,12 +156,13 @@
// 鐢ㄦ埛鍒楄〃
const userList = ref([]);
-const userColumns = computed(() => [
- userList.value.map(user => ({
+const userColumns = computed(() => {
+ console.log('userList',userList)
+ return userList.value.map(user => ({
label: user.nickName,
value: user.userId
}))
-]);
+});
// 閫変腑鐨勭敤鎴峰悕绉帮紙鐢ㄤ簬鏄剧ず锛�
const selectedUserName = computed(() => {
@@ -210,8 +212,7 @@
schedulingUserId: userStore.id,
schedulingDate: dayjs().format("YYYY-MM-DD")
});
-
- show.value = true;
+ popup.value.open()
} catch (error) {
uni.showToast({
title: '鍔犺浇鐢ㄦ埛鍒楄〃澶辫触',
@@ -292,7 +293,7 @@
// 鍏抽棴寮圭獥
const handleClose = () => {
- show.value = false;
+ popup.value.close()
showUserPicker.value = false;
showDatePicker.value = false;
--
Gitblit v1.9.3