From 03e2fa531a3dc0921671a57f27448bdcd498bc09 Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Thu, 13 Aug 2026 15:12:17 +0800
Subject: [PATCH] =?UTF-8?q?8/13=EF=BC=8C=20=E4=BF=AE=E6=94=B9=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=BA=E5=88=A0=E9=99=A4=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |  4 ++--
 src/components/Holder/index.vue           | 10 ++++------
 src/views/community/AddCommunity.vue      |  8 +++++++-
 src/views/system/Activity/addActivity.vue | 16 ++++++++++++++--
 src/views/system/storeroom/index.vue      |  2 +-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.env.development b/.env.development
index cd182d8..2bd86fc 100644
--- a/.env.development
+++ b/.env.development
@@ -9,9 +9,9 @@ VITE_APP_ENV='development'
 # 开发环境
 VITE_APP_BASE_API='/dev-api'
 # # 开发环境  接口代理地址
-#VITE_APP_PROXY_API='http://192.168.1.222:8080'
+VITE_APP_PROXY_API='http://192.168.1.222:8080'
 # 开发环境  接口代理地址
-VITE_APP_PROXY_API='http://192.168.1.6:8080'
+#VITE_APP_PROXY_API='http://192.168.1.6:8080'
 # 图片基础地址
 VITE_IMG_URL='http://192.168.1.222:8080'
 
diff --git a/src/components/Holder/index.vue b/src/components/Holder/index.vue
index e2fee56..3c5e39e 100644
--- a/src/components/Holder/index.vue
+++ b/src/components/Holder/index.vue
@@ -12,14 +12,14 @@
   </div>
 
   <el-dialog @close="conback" append-to-body v-model="dialog.dialogVisible" :title="dialog.dialogTitle" width="1050">
-    <nav class="flex flex-items-center mb-8">
-      <div class="flex flex-items-center mr-5 flex-1">
+    <nav class="flex flex-items-center mb-8" style="margin-bottom: 20px">
+      <div class="flex flex-items-center flex-1" style="max-width: 200px">
         <div style="width: 120px">住户类型</div>
         <el-select v-model="queryParams.ownerRelationship" placeholder="请选择" clearable>
           <el-option v-for="dict in com_resident_relationship" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </div>
-      <div class="mr-5 flex-1">
+      <div class="mr-5 flex-1" style="margin: 0 20px">
         <el-input maxlength="30" clearable v-model="queryParams.name" placeholder="请输入住户姓名" />
       </div>
       <div>
@@ -47,7 +47,7 @@
           <dict-tag :options="com_certification_status" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="证件号码" align="center" prop="idCard" />
+      <el-table-column label="证件号码" width="165" align="center" prop="idCard" />
       <el-table-column label="手机号码" align="center" prop="phone" />
       <el-table-column label="房间" show-overflow-tooltip align="center">
         <template #default="{ row }">
@@ -116,8 +116,6 @@ const props = defineProps<{
 const isMultiple = computed(() => props.isMultiple ?? false);
 const returnvalue = computed(() => props.returnvalue ?? '*'); // 👈 默认 userId
 
-const { userid } = toRefs(props);
-
 const dialog = ref({
   dialogVisible: false,
   dialogTitle: '选择住户'
diff --git a/src/views/community/AddCommunity.vue b/src/views/community/AddCommunity.vue
index ad44790..8c1d377 100644
--- a/src/views/community/AddCommunity.vue
+++ b/src/views/community/AddCommunity.vue
@@ -355,6 +355,7 @@ async function handleUploadChange(file: UploadFile) {
     ElMessage.error(isUpload.type);
     return;
   } else if (typeof isUpload === 'boolean' && isUpload === true) {
+    console.log(file);
     villageImg.value.push(file.raw);
   }
 }
@@ -364,7 +365,12 @@ function handleExceed() {
 }
 /** 移除钩子 */
 const handleRemove = (file: UploadFile) => {
-  villageImg.value = villageImg.value.filter((item) => item.uid !== file.uid);
+  const fileToRemoveIndex = villageImg.value.findIndex((item) => item.uid === file.uid);
+  if (fileToRemoveIndex === -1) {
+    return;
+  }
+  uploadRef.value.handleRemove(villageImg.value[fileToRemoveIndex]);
+  villageImg.value.splice(fileToRemoveIndex, 1);
 };
 
 // 改变时间
diff --git a/src/views/system/Activity/addActivity.vue b/src/views/system/Activity/addActivity.vue
index f117b9b..252aa11 100644
--- a/src/views/system/Activity/addActivity.vue
+++ b/src/views/system/Activity/addActivity.vue
@@ -54,11 +54,12 @@
               </el-row>
               <el-row>
                 <el-col :span="11">
-                  <el-form-item label="报名截止日期" prop="deadline">
+                  <el-form-item label="报名截止日期" prop="applyDeadline">
                     <el-date-picker
                       format="YYYY-MM-DD HH:mm:ss"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       v-model="deadline"
+                      :disabled-date="disabledDate"
                       @update:model-value="
                         (data) => {
                           if (data) {
@@ -312,6 +313,18 @@ const rules = {
   coverImage: [{ required: true, message: '请上传活动封面', trigger: 'blur' }],
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 };
+
+// 禁用 form.value.taskTime.split(' - ') 范围外的所有日期，包括边界日期（开始和结束当天）
+const disabledDate = (time: Date) => {
+  const startDate = new Date();
+  startDate.setHours(0, 0, 0, 0);
+  // 获取当前选择日期的零点时间戳
+  const selectDate = new Date(time);
+  selectDate.setHours(0, 0, 0, 0);
+  // 禁用早于开始日期 或 晚于结束日期的日期
+  // 注意：这里使用 < 和 >，意味着等于开始或结束日期时返回 false（不禁用/可选）
+  return selectDate.getTime() < startDate.getTime();
+};
 const userid = ref();
 // 报名截止日期
 const deadline = ref([]);
@@ -525,7 +538,6 @@ function init() {
   });
 }
 
-// ! 提交========================================
 // 提交
 const submitForm = () => {
   console.log(form.value);
diff --git a/src/views/system/storeroom/index.vue b/src/views/system/storeroom/index.vue
index eca281d..e8a3b7b 100644
--- a/src/views/system/storeroom/index.vue
+++ b/src/views/system/storeroom/index.vue
@@ -36,7 +36,7 @@
       <el-table class="tablebody" v-loading="loading" border :data="storeroomList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="楼栋名" align="center" prop="buildingName" />
-        <el-table-column label="单元号" show-overflow-tooltip  align="center" prop="unitName" />
+        <el-table-column label="单元号" show-overflow-tooltip align="center" prop="unitName" />
         <el-table-column label="储藏室号" align="center" prop="storeroomNo" />
         <el-table-column label="建筑面积(㎡)" align="center" prop="houseArea" />
         <el-table-column label="公摊面积(㎡)" align="center" prop="shareArea" />