From 4971f20f73adae7cb83dc787585a22d4869cf5b8 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 29 Apr 2025 14:10:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                             |   4 +-
 src/pages/comprehensiveQuery/index.vue        | 129 +++++++++++++-----
 .../components/addAndEditForm.vue             |  46 ++++++-
 .../components/addAndEditForm.vue             |  51 ++++++-
 .../components/addAndEditForm.vue             |  61 ++++++++-
 .../components/addAndEditForm.vue             |  50 ++++++-
 .../components/addAndEditForm.vue             |  69 ++++++++--
 7 files changed, 350 insertions(+), 60 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index c06820f..bfb24fd 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,8 +1,8 @@
 {
     "name" : "项目全过程影像管理工具",
     "appid" : "__UNI__F75AFA9",
-    "description" : "",
-    "versionName" : "1.0.0",
+    "description" : "项目全过程影像管理工具",
+    "versionName" : "1.0.1",
     "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/src/pages/comprehensiveQuery/index.vue b/src/pages/comprehensiveQuery/index.vue
index 2fe5cc3..4ab860d 100644
--- a/src/pages/comprehensiveQuery/index.vue
+++ b/src/pages/comprehensiveQuery/index.vue
@@ -64,40 +64,62 @@
                         <up-input placeholder="请输入" v-model="innerKeyWord" clearable />
                     </up-form-item>
                     <up-form-item prop="startTime" label="开始日期">
-                        <up-input placeholder="请选择" v-model="queryParams.startTime" readonly>
+                        <up-input
+                            readonly
+                            class="time-input"
+                            placeholder="请选择"
+                            style="position: relative"
+                            v-model="queryParams.startTime"
+                        >
                             <template #prefix>
-                                <up-icon name="calendar" size="16" @tap="onSelectDate(1)" />
-                            </template>
-                            <template #suffix v-if="queryParams.startTime">
-                                <up-icon
-                                    name="close-circle-fill"
-                                    style="margin-right: 12rpx"
-                                    color="#c6c7cb"
-                                    @tap="
-                                        () => {
-                                            queryParams.startTime = ''
-                                        }
-                                    "
-                                />
+                                <view class="handle-box" style="padding-left: 18rpx">
+                                    <up-icon name="calendar" size="16" @tap="onSelectDate(1)" />
+                                    <view @tap="onSelectDate(1)" class="select-project-area">
+                                        1
+                                    </view>
+                                    <template #suffix v-if="queryParams.startTime">
+                                        <up-icon
+                                            name="close-circle-fill"
+                                            style="margin-right: 12rpx"
+                                            color="#c6c7cb"
+                                            @tap="
+                                                () => {
+                                                    queryParams.startTime = ''
+                                                }
+                                            "
+                                        />
+                                    </template>
+                                </view>
                             </template>
                         </up-input>
                     </up-form-item>
                     <up-form-item prop="endTime" label="结束日期">
-                        <up-input placeholder="请选择" v-model="queryParams.endTime" readonly>
+                        <up-input
+                            readonly
+                            class="time-input"
+                            placeholder="请选择"
+                            style="position: relative"
+                            v-model="queryParams.endTime"
+                        >
                             <template #prefix>
-                                <up-icon size="16" name="calendar" @tap="onSelectDate(2)" />
-                            </template>
-                            <template #suffix v-if="queryParams.endTime">
-                                <up-icon
-                                    name="close-circle-fill"
-                                    style="margin-right: 12rpx"
-                                    color="#c6c7cb"
-                                    @tap="
-                                        () => {
-                                            queryParams.endTime = ''
-                                        }
-                                    "
-                                />
+                                <view class="handle-box" style="padding-left: 18rpx">
+                                    <up-icon size="16" name="calendar" @tap="onSelectDate(2)" />
+                                    <view @tap="onSelectDate(2)" class="select-project-area">
+                                        1
+                                    </view>
+                                    <template #suffix v-if="queryParams.endTime">
+                                        <up-icon
+                                            name="close-circle-fill"
+                                            style="margin-right: 12rpx"
+                                            color="#c6c7cb"
+                                            @tap="
+                                                () => {
+                                                    queryParams.endTime = ''
+                                                }
+                                            "
+                                        />
+                                    </template>
+                                </view>
                             </template>
                         </up-input>
                     </up-form-item>
@@ -107,9 +129,13 @@
                             clearable
                             placeholder="请选择工程名称"
                             v-model="queryParams.proName"
+                            style="position: relative"
                         >
                             <template #suffix>
-                                <view style="display: flex">
+                                <view class="handle-box">
+                                    <view @tap="onSelectProject" class="select-project-area">
+                                        1
+                                    </view>
                                     <up-icon
                                         name="close-circle-fill"
                                         style="margin-right: 12rpx"
@@ -133,9 +159,11 @@
                             clearable
                             placeholder="请选择专业"
                             v-model="queryParams.majorName"
+                            style="position: relative"
                         >
                             <template #suffix>
-                                <view style="display: flex">
+                                <view class="handle-box">
+                                    <view @tap="onSelectMajor" class="select-project-area">1</view>
                                     <up-icon
                                         name="close-circle-fill"
                                         style="margin-right: 12rpx"
@@ -159,9 +187,13 @@
                             clearable
                             placeholder="请选择工序"
                             v-model="queryParams.gxName"
+                            style="position: relative"
                         >
                             <template #suffix>
-                                <view style="display: flex">
+                                <view class="handle-box">
+                                    <view @tap="onSelectProcedure" class="select-project-area">
+                                        1
+                                    </view>
                                     <up-icon
                                         name="close-circle-fill"
                                         style="margin-right: 12rpx"
@@ -264,35 +296,43 @@
     <up-datetime-picker
         mode="date"
         :show="dateShow"
+        closeOnClickOverlay
         v-model="dateValue"
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <!-- 工程选择器 -->
     <up-picker
         keyName="name"
+        closeOnClickOverlay
         :show="projectShow"
         :columns="projectList"
         @confirm="onConfirmProject"
         @cancel="projectShow = !projectShow"
+        @close="projectShow = !projectShow"
     />
     <!-- 专业选择器 -->
     <up-picker
         keyName="name"
         :show="majorShow"
         :columns="majorList"
+        closeOnClickOverlay
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
         :show="procedureShow"
         :columns="procedureList"
+        closeOnClickOverlay
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
 </template>
 
@@ -801,4 +841,31 @@ onMounted(async () => {
     padding: 32rpx 0;
     letter-spacing: 1rpx;
 }
+
+.handle-box {
+    position: absolute;
+    right: 5%;
+    top: 50%;
+    transform: translateY(-50%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: 7%;
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>
diff --git a/src/pages/coordinatePhotos/components/addAndEditForm.vue b/src/pages/coordinatePhotos/components/addAndEditForm.vue
index 209dfe9..04f7086 100644
--- a/src/pages/coordinatePhotos/components/addAndEditForm.vue
+++ b/src/pages/coordinatePhotos/components/addAndEditForm.vue
@@ -15,11 +15,13 @@
             <up-input
                 readonly
                 border="none"
+                style="position: relative"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
                 v-model="addAndEditModel.proName"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProject" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -49,11 +51,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.majorName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectMajor" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -77,11 +81,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.gxName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProcedure" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -231,27 +237,33 @@
     <!-- 专业选择器 -->
     <up-picker
         keyName="name"
+        closeOnClickOverlay
         :show="majorShow"
         :columns="majorList"
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
+        closeOnClickOverlay
         :show="procedureShow"
         :columns="procedureList"
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
     <!-- 年月日选择器 -->
     <up-datetime-picker
         mode="date"
         :show="dateShow"
+        closeOnClickOverlay
         v-model="dateValue"
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <up-loading-page
@@ -1084,4 +1096,32 @@ onMounted(async () => {
         overflow: hidden;
     }
 }
+
+.handle-box {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-40%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: -10%;
+
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>
diff --git a/src/pages/importantMatters/components/addAndEditForm.vue b/src/pages/importantMatters/components/addAndEditForm.vue
index fc23b29..489b77f 100644
--- a/src/pages/importantMatters/components/addAndEditForm.vue
+++ b/src/pages/importantMatters/components/addAndEditForm.vue
@@ -14,11 +14,13 @@
             <up-input
                 readonly
                 border="none"
+                style="position: relative"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
                 v-model="addAndEditModel.proName"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProject" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -40,11 +42,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.majorName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectMajor" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -68,11 +72,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.gxName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProcedure" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -96,12 +102,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.time"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -206,25 +215,31 @@
         keyName="name"
         :show="majorShow"
         :columns="majorList"
+        closeOnClickOverlay
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
+        closeOnClickOverlay
         :show="procedureShow"
         :columns="procedureList"
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
     <!-- 年月日选择器 -->
     <up-datetime-picker
         mode="date"
         :show="dateShow"
+        closeOnClickOverlay
         v-model="dateValue"
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <up-loading-page
@@ -911,4 +926,32 @@ onMounted(async () => {
         }
     }
 }
+
+.handle-box {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-40%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: -10%;
+
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>
diff --git a/src/pages/qualityInspection/components/addAndEditForm.vue b/src/pages/qualityInspection/components/addAndEditForm.vue
index a49a8bd..7e6d493 100644
--- a/src/pages/qualityInspection/components/addAndEditForm.vue
+++ b/src/pages/qualityInspection/components/addAndEditForm.vue
@@ -14,11 +14,13 @@
             <up-input
                 readonly
                 border="none"
+                style="position: relative"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
                 v-model="addAndEditModel.proName"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProject" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -40,11 +42,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.majorName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectMajor" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -68,11 +72,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.gxName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProcedure" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -105,12 +111,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.vioDate"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择检查日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(1)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -131,12 +140,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.rectDate"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改期限'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(2)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -205,12 +217,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.rectTime"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(3)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -302,25 +317,31 @@
         keyName="name"
         :show="majorShow"
         :columns="majorList"
+        closeOnClickOverlay
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
         :show="procedureShow"
         :columns="procedureList"
+        closeOnClickOverlay
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
     <!-- 年月日选择器 -->
     <up-datetime-picker
         mode="date"
         :show="dateShow"
         v-model="dateValue"
+        closeOnClickOverlay
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <up-loading-page
@@ -1175,4 +1196,32 @@ watch(
         overflow: hidden;
     }
 }
+
+.handle-box {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-40%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: -10%;
+
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>
diff --git a/src/pages/safetyMeasure/components/addAndEditForm.vue b/src/pages/safetyMeasure/components/addAndEditForm.vue
index c7a1a82..e2a5952 100644
--- a/src/pages/safetyMeasure/components/addAndEditForm.vue
+++ b/src/pages/safetyMeasure/components/addAndEditForm.vue
@@ -14,11 +14,13 @@
             <up-input
                 readonly
                 border="none"
+                style="position: relative"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
                 v-model="addAndEditModel.proName"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProject" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -40,11 +42,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.majorName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectMajor" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -68,11 +72,13 @@
             <up-input
                 border="none"
                 readonly
+                style="position: relative"
                 v-model="addAndEditModel.gxName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProcedure" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -104,12 +110,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.checkDate"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择检查日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(1)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -212,25 +221,31 @@
         keyName="name"
         :show="majorShow"
         :columns="majorList"
+        closeOnClickOverlay
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
+        closeOnClickOverlay
         :show="procedureShow"
         :columns="procedureList"
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
     <!-- 年月日选择器 -->
     <up-datetime-picker
         mode="date"
         :show="dateShow"
         v-model="dateValue"
+        closeOnClickOverlay
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <up-loading-page
@@ -910,4 +925,31 @@ onMounted(async () => {
         overflow: hidden;
     }
 }
+.handle-box {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-40%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: -10%;
+
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>
diff --git a/src/pages/safetyViolations/components/addAndEditForm.vue b/src/pages/safetyViolations/components/addAndEditForm.vue
index c300085..99c7d7d 100644
--- a/src/pages/safetyViolations/components/addAndEditForm.vue
+++ b/src/pages/safetyViolations/components/addAndEditForm.vue
@@ -14,11 +14,13 @@
             <up-input
                 readonly
                 border="none"
-                :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
                 v-model="addAndEditModel.proName"
+                :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择项目'"
+                style="position: relative"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProject" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -38,13 +40,15 @@
         </up-form-item>
         <up-form-item prop="majorName" label="专业">
             <up-input
-                border="none"
                 readonly
+                border="none"
+                style="position: relative"
                 v-model="addAndEditModel.majorName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择专业'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectMajor" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -66,13 +70,15 @@
         </up-form-item>
         <up-form-item prop="gxName" label="工序">
             <up-input
-                border="none"
                 readonly
+                border="none"
+                style="position: relative"
                 v-model="addAndEditModel.gxName"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择工序'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectProcedure" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -105,12 +111,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.vioDate"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择违章日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(1)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -132,11 +141,14 @@
                 readonly
                 border="none"
                 inputAlign="right"
+                class="time-input"
+                style="position: relative"
                 v-model="addAndEditModel.rectDate"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改期限'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(2)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -155,8 +167,8 @@
         </up-form-item>
         <up-form-item prop="vioPlace" label="违章地点" required>
             <up-input
-                border="none"
                 clearable
+                border="none"
                 v-model="addAndEditModel.vioPlace"
                 :readonly="props.addAndEditFormType == 3"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '请输入违章地点'"
@@ -206,12 +218,15 @@
             <up-input
                 readonly
                 border="none"
+                class="time-input"
                 inputAlign="right"
+                style="position: relative"
                 v-model="addAndEditModel.rectTime"
                 :placeholder="props.addAndEditFormType == 3 ? '' : '点击选择整改日期'"
             >
                 <template #suffix v-if="props.addAndEditFormType != 3">
-                    <view style="display: flex">
+                    <view class="handle-box">
+                        <view @tap="onSelectDate(3)" class="select-project-area">1</view>
                         <up-icon
                             name="close-circle-fill"
                             style="margin-right: 12rpx"
@@ -304,25 +319,31 @@
         keyName="name"
         :show="majorShow"
         :columns="majorList"
+        closeOnClickOverlay
         @confirm="onConfirmMajor"
         @cancel="majorShow = !majorShow"
+        @close="majorShow = !majorShow"
     />
     <!-- 工序选择器 -->
     <up-picker
         keyName="name"
         :show="procedureShow"
+        closeOnClickOverlay
         :columns="procedureList"
         @confirm="onConfirmProcedure"
         @cancel="procedureShow = !procedureShow"
+        @close="procedureShow = !procedureShow"
     />
     <!-- 年月日选择器 -->
     <up-datetime-picker
         mode="date"
         :show="dateShow"
+        closeOnClickOverlay
         v-model="dateValue"
         :formatter="formatter"
         @confirm="onConfirmDate"
         @cancel="dateShow = !dateShow"
+        @close="dateShow = !dateShow"
     />
 
     <up-loading-page
@@ -1259,4 +1280,32 @@ onMounted(async () => {
 ::v-deep .hide-cursor .u-input__input {
     caret-color: transparent;
 }
+
+.handle-box {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-40%);
+    left: 0;
+    // bottom: 0;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+
+    .select-project-area {
+        flex: 1;
+        color: transparent;
+    }
+}
+
+::v-deep .time-input .uni-input-placeholder {
+    position: absolute !important;
+    left: -10%;
+
+    z-index: 100;
+}
+
+::v-deep .time-input .uni-input-input {
+    right: 20%;
+}
 </style>