From 74db1306cde99e5413629f3fdc5f7dfe65131b16 Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Thu, 5 Jun 2025 17:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=96=B0=E8=A6=81=E6=B1=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/processdesign/detail.vue          | 12 ++++++------
 .../pages/moJuSheJiReport/moJuSheJiReport-detail.vue |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
index 91cfbfb..e7fd7b9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
@@ -201,7 +201,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
                <el-col :span="6" >
              <el-button v-if="formData.isOverProcess == null || formData.isOverProcess == 0" style="margin-left: 10%;" type="warning"  @click="openDelay">延期</el-button>
                 </el-col>
-          <el-col :span="12" v-if="delayDialog || formData.isDelay">
+          <el-col :span="12">
              <el-form-item label="延期原因" prop="delayReason">
               <el-input
                 v-model="formData.delayReason"
@@ -209,7 +209,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
                 :disabled="!delayDialog"
                 @blur="(e) => delaySubmit(e)"
                 type="textarea"
-                placeholder="延期原因"
+                placeholder="输入延期原因后，鼠标点击空白区域自动保存。"
               />
               </el-form-item>
              </el-col>
@@ -256,21 +256,21 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
               <el-form ref="processDesignProgressFormRef" :model="formData.processDesignProgressList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.processDesignProgressList" class="hl-table">
                   <el-table-column label="序号" align="center" type="index" width="80" fixed />
-                  <el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="200">
+                  <el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="230">
                                         <template #header>开始时间</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.beginTime`"  class="mb-0px!">
                   <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->                    
-                            <el-date-picker  :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1  || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
+                            <el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1  || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="200">
+                  <el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="230">
                     <template #header>结束时间</template>
                     <template #default="{ row, $index }">
                       <el-form-item :prop="`${$index}.endTime`"  class="mb-0px!">
                   <!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->                    
-                            <el-date-picker  :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1  || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
+                            <el-date-picker class="!w-230px"  :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1  || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
                       </el-form-item>
                     </template>
                   </el-table-column>
diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
index 1c1ab19..e3e5496 100644
--- a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
@@ -260,7 +260,9 @@
 		})
 
 		row.isOver = 1;
+		  popup.value?.close()
 		await submitForm('SAVE', 'OVER');
+		
 		//更新一下这条数据的状态
 	}
 	const handOver = () => {
@@ -585,7 +587,7 @@
 			</view>
 		</template>
 		<view class="loading-text" v-else>加载中..</view>
-		<uni-popup class="popup" ref="popup" :show="showPopup" type="bottom" background-color="#fff">
+		<uni-popup class="popup" ref="popup"  :mask-click="false"  type="bottom" background-color="#fff">
 			<view class="title">
 				<view class="text">填写信息</view>
 				<!-- <view class="close" @click="handleClose">X</view> -->