From 50cf3a826d52a1ce4f51a357aa2a40e61ea27373 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 31 May 2023 17:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=84=E5=86=8C=E8=BE=93=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=97=A5=E6=9C=9F=E5=AE=9E=E8=AE=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/cmdPlugin/OperationHandler.js     | 22 ++++-----
 .../terminals/equipmentConstructionTable.vue  | 27 ++++++++---
 .../newMap/display/terminals/registerBook.vue | 47 +++++++++++++------
 3 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 6a393dfc2..d6f5b18ae 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -4389,11 +4389,11 @@ export const OperationEvent = {
             },
             moonDay: {
                 operation: 'b101',
-                domId: '_Tips-TicketOrRegister-RegisterInput-MoonDay'
+                domId: '_Tips-TicketOrRegister-RegisterInput-MoonDay{BOTTOM}'
             },
             hourMinute: {
                 operation: 'b102',
-                domId: '_Tips-TicketOrRegister-RegisterInput-HourMinute'
+                domId: '_Tips-TicketOrRegister-RegisterInput-HourMinute{BOTTOM}'
             },
             result: {
                 operation: 'b103',
@@ -4401,11 +4401,11 @@ export const OperationEvent = {
             },
             noticeTimeMoonDay: {
                 operation: 'b104',
-                domId: '_Tips-TicketOrRegister-RegisterInput-NoticeTimeMoonDay'
+                domId: '_Tips-TicketOrRegister-RegisterInput-NoticeTimeMoonDay{BOTTOM}'
             },
             noticeTimeHourMinute: {
                 operation: 'b105',
-                domId: '_Tips-TicketOrRegister-RegisterInput-NoticeTimeHourMinute'
+                domId: '_Tips-TicketOrRegister-RegisterInput-NoticeTimeHourMinute{BOTTOM}'
             },
             noticeTimeInfo: {
                 operation: 'b106',
@@ -4413,11 +4413,11 @@ export const OperationEvent = {
             },
             arriveTimeMoonDay: {
                 operation: 'b107',
-                domId: '_Tips-TicketOrRegister-RegisterInput-ArriveTimeMoonDay'
+                domId: '_Tips-TicketOrRegister-RegisterInput-ArriveTimeMoonDay{BOTTOM}'
             },
             arriveTimeHourMinute: {
                 operation: 'b108',
-                domId: '_Tips-TicketOrRegister-RegisterInput-ArriveTimeHourMinute'
+                domId: '_Tips-TicketOrRegister-RegisterInput-ArriveTimeHourMinute{BOTTOM}'
             },
             arriveTimeInfo: {
                 operation: 'b109',
@@ -4425,11 +4425,11 @@ export const OperationEvent = {
             },
             endTimeMoonDay: {
                 operation: 'b110',
-                domId: '_Tips-TicketOrRegister-RegisterInput-EndTimeMoonDay'
+                domId: '_Tips-TicketOrRegister-RegisterInput-EndTimeMoonDay{BOTTOM}'
             },
             endTimeHourMinute: {
                 operation: 'b111',
-                domId: '_Tips-TicketOrRegister-RegisterInput-EndTimeHourMinute'
+                domId: '_Tips-TicketOrRegister-RegisterInput-EndTimeHourMinute{BOTTOM}'
             },
             endTimeInfo: {
                 operation: 'b112',
@@ -5027,7 +5027,7 @@ export const OperationEvent = {
             },
             requestDate:{
                 operation: '120a',
-                domId: '_Tips-Rail-equipmentConstructionFill-requestDate'
+                domId: '_Tips-Rail-equipmentConstructionFill-requestDate{BOTTOM}'
             },
             requestDetails:{
                 operation: '120b',
@@ -5035,7 +5035,7 @@ export const OperationEvent = {
             },
             planSpendTime:{
                 operation: '120c',
-                domId: '_Tips-Rail-equipmentConstructionFill-planSpendTime'
+                domId: '_Tips-Rail-equipmentConstructionFill-planSpendTime{BOTTOM}'
             },
             acceptDetail:{
                 operation: '120d',
@@ -5043,7 +5043,7 @@ export const OperationEvent = {
             },
             confirmReviewDate:{
                 operation: '120e',
-                domId: '_Tips-Rail-equipmentConstructionFill-confirmReviewDate'
+                domId: '_Tips-Rail-equipmentConstructionFill-confirmReviewDate{BOTTOM}'
             },
             confirmReviewDetail:{
                 operation: '120f',
diff --git a/src/views/newMap/display/terminals/equipmentConstructionTable.vue b/src/views/newMap/display/terminals/equipmentConstructionTable.vue
index 9a8ed93a7..d3844d6f7 100644
--- a/src/views/newMap/display/terminals/equipmentConstructionTable.vue
+++ b/src/views/newMap/display/terminals/equipmentConstructionTable.vue
@@ -21,9 +21,10 @@
             <span v-else>{{ scope.row.projectName }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="requestDate" :label="'月日\n时分'" width="80">
+        <el-table-column prop="requestDate" :label="'月日\n时分'" width="160">
           <template slot-scope="scope">
-            <el-input v-if="dataIndex === scope.$index" :id="constructionFill.requestDate.domId" v-model="scope.row.requestDate" @blur="requestDateChange(scope.row.requestDate)" />
+            <!-- <el-input v-if="dataIndex === scope.$index" :id="constructionFill.requestDate.domId" v-model="scope.row.requestDate" @blur="requestDateChange(scope.row.requestDate)" /> -->
+            <el-date-picker v-if="dataIndex === scope.$index" :id="constructionFill.requestDate.domId" v-model="scope.row.requestDate" format="M月d日 HH:mm" value-format="M月d日 HH:mm" class="dateClass" :clearable="false" type="datetime" @change="requestDateChange(scope.row.requestDate)" />
             <span v-else>{{ scope.row.requestDate }}</span>
           </template>
         </el-table-column>
@@ -33,9 +34,10 @@
             <span v-else>{{ scope.row.requestDetails }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="planSpendTime" :label="'所需\n时分'" width="80">
+        <el-table-column prop="planSpendTime" :label="'所需\n时分'" width="100">
           <template slot-scope="scope">
-            <el-input v-if="dataIndex === scope.$index" :id="constructionFill.planSpendTime.domId" v-model="scope.row.planSpendTime" @blur="planSpendTimeChange(scope.row.planSpendTime)" />
+            <!-- <el-input v-if="dataIndex === scope.$index" :id="constructionFill.planSpendTime.domId" v-model="scope.row.planSpendTime" @blur="planSpendTimeChange(scope.row.planSpendTime)" /> -->
+            <el-time-picker v-if="dataIndex === scope.$index" :id="constructionFill.planSpendTime.domId" v-model="scope.row.planSpendTime" :picker-options="{format:'HH:mm'}" format="HH:mm" value-format="HH:mm" class="timeClass" :clearable="false" @change="planSpendTimeChange(scope.row.planSpendTime)" />
             <span v-else>{{ scope.row.planSpendTime }}</span>
           </template>
         </el-table-column>
@@ -49,9 +51,10 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="施工后开通检查确认、销记">
-        <el-table-column prop="confirmReviewDate" :label="'月日\n时分'" width="80">
+        <el-table-column prop="confirmReviewDate" :label="'月日\n时分'" width="160">
           <template slot-scope="scope">
-            <el-input v-if="dataIndex === scope.$index" :id="constructionFill.confirmReviewDate.domId" v-model="scope.row.confirmReviewDate" @blur="confirmReviewDateChange(scope.row.confirmReviewDate)" />
+            <!-- <el-input v-if="dataIndex === scope.$index" :id="constructionFill.confirmReviewDate.domId" v-model="scope.row.confirmReviewDate" @blur="confirmReviewDateChange(scope.row.confirmReviewDate)" /> -->
+            <el-date-picker v-if="dataIndex === scope.$index" :id="constructionFill.confirmReviewDate.domId" v-model="scope.row.confirmReviewDate" format="M月d日 HH:mm" value-format="M月d日 HH:mm" class="dateClass" :clearable="false" type="datetime" @change="confirmReviewDateChange(scope.row.confirmReviewDate)" />
             <span v-else>{{ scope.row.confirmReviewDate }}</span>
           </template>
         </el-table-column>
@@ -253,7 +256,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .equipmentConstructionTable{
-  width:91%;margin-left:15px
+  width: 100%;
 }
 .el-table .cell {
   white-space: pre-line;
@@ -262,4 +265,14 @@ export default {
   margin-right: 20px;
   margin-bottom: 10px;
 }
+.dateClass {
+	width: 139px;
+}
+.timeClass {
+	width: 79px;
+}
+/deep/ .el-input--suffix .el-input__inner {
+	padding-right: 10px;
+	padding-left: 28px;
+}
 </style>
diff --git a/src/views/newMap/display/terminals/registerBook.vue b/src/views/newMap/display/terminals/registerBook.vue
index 83ba28554..b7b8b125f 100644
--- a/src/views/newMap/display/terminals/registerBook.vue
+++ b/src/views/newMap/display/terminals/registerBook.vue
@@ -11,15 +11,17 @@
           style="width: 100%"
           :height="tableHeight"
         >
-          <el-table-column prop="date" label="月 日" width="95">
+          <el-table-column prop="date" label="月 日" width="120">
             <template slot-scope="scope">
-              <el-input v-if="dataIndex === scope.$index" :id="registerInput.moonDay.domId" v-model="scope.row.moonDay" @blur="moonDayChange(scope.row.moonDay)" />
+              <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.moonDay.domId" v-model="scope.row.moonDay" @blur="moonDayChange(scope.row.moonDay)" /> -->
+              <el-date-picker v-if="dataIndex === scope.$index" :id="registerInput.moonDay.domId" v-model="scope.row.moonDay" format="M月d日" value-format="M月d日" class="dateClass" :clearable="false" type="date" @change="moonDayChange(scope.row.moonDay)" />
               <span v-else>{{ scope.row.moonDay }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="time" label="时 分" width="95">
+          <el-table-column prop="time" label="时 分" width="100">
             <template slot-scope="scope">
-              <el-input v-if="dataIndex === scope.$index" :id="registerInput.hourMinute.domId" v-model="scope.row.hourMinute" @blur="hourMinuteChange(scope.row.hourMinute)" />
+              <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.hourMinute.domId" v-model="scope.row.hourMinute" @blur="hourMinuteChange(scope.row.hourMinute)" /> -->
+              <el-time-picker v-if="dataIndex === scope.$index" :id="registerInput.hourMinute.domId" v-model="scope.row.hourMinute" :picker-options="{format:'HH:mm'}" format="HH:mm" value-format="HH:mm" class="timeClass" :clearable="false" @change="hourMinuteChange(scope.row.hourMinute)" />
               <span v-else>{{ scope.row.hourMinute }}</span>
             </template>
           </el-table-column>
@@ -30,15 +32,17 @@
             </template>
           </el-table-column>
           <el-table-column label="通 知 时 间">
-            <el-table-column prop="noticeDate" label="月 日" width="100">
+            <el-table-column prop="noticeDate" label="月 日" width="120">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeMoonDay.domId" v-model="scope.row.noticeTime.moonDay" @blur="noticeTimeMoonDayChange(scope.row.noticeTime.moonDay)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeMoonDay.domId" v-model="scope.row.noticeTime.moonDay" @blur="noticeTimeMoonDayChange(scope.row.noticeTime.moonDay)" /> -->
+                <el-date-picker v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeMoonDay.domId" v-model="scope.row.noticeTime.moonDay" format="M月d日" value-format="M月d日" class="dateClass" :clearable="false" type="date" @change="noticeTimeMoonDayChange(scope.row.noticeTime.moonDay)" />
                 <span v-else>{{ scope.row.noticeTime.moonDay }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="noticeTime" label="时 分" width="100">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeHourMinute.domId" v-model="scope.row.noticeTime.hourMinute" @blur="noticeTimeHourMinuteChange(scope.row.noticeTime.hourMinute)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeHourMinute.domId" v-model="scope.row.noticeTime.hourMinute" @blur="noticeTimeHourMinuteChange(scope.row.noticeTime.hourMinute)" /> -->
+                <el-time-picker v-if="dataIndex === scope.$index" :id="registerInput.noticeTimeHourMinute.domId" v-model="scope.row.noticeTime.hourMinute" :picker-options="{format:'HH:mm'}" format="HH:mm" value-format="HH:mm" class="timeClass" :clearable="false" @change="noticeTimeHourMinuteChange(scope.row.noticeTime.hourMinute)" />
                 <span v-else>{{ scope.row.noticeTime.hourMinute }}</span>
               </template>
             </el-table-column>
@@ -50,15 +54,17 @@
             </el-table-column>
           </el-table-column>
           <el-table-column label="到 达 时 间">
-            <el-table-column prop="arriveDate" label="月 日" width="100">
+            <el-table-column prop="arriveDate" label="月 日" width="120">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeMoonDay.domId" v-model="scope.row.arriveTime.moonDay" @blur="arriveTimeMoonDayChange(scope.row.arriveTime.moonDay)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeMoonDay.domId" v-model="scope.row.arriveTime.moonDay" @blur="arriveTimeMoonDayChange(scope.row.arriveTime.moonDay)" /> -->
+                <el-date-picker v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeMoonDay.domId" v-model="scope.row.arriveTime.moonDay" format="M月d日" value-format="M月d日" class="dateClass" :clearable="false" type="date" @change="arriveTimeMoonDayChange(scope.row.arriveTime.moonDay)" />
                 <span v-else>{{ scope.row.arriveTime.moonDay }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="arriveTime" label="时 分" width="100">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeHourMinute.domId" v-model="scope.row.arriveTime.hourMinute" @blur="arriveTimeHourMinuteChange(scope.row.arriveTime.hourMinute)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeHourMinute.domId" v-model="scope.row.arriveTime.hourMinute" @blur="arriveTimeHourMinuteChange(scope.row.arriveTime.hourMinute)" /> -->
+                <el-time-picker v-if="dataIndex === scope.$index" :id="registerInput.arriveTimeHourMinute.domId" v-model="scope.row.arriveTime.hourMinute" :picker-options="{format:'HH:mm'}" format="HH:mm" value-format="HH:mm" class="timeClass" :clearable="false" @change="arriveTimeHourMinuteChange(scope.row.arriveTime.hourMinute)" />
                 <span v-else>{{ scope.row.arriveTime.hourMinute }}</span>
               </template>
             </el-table-column>
@@ -70,15 +76,17 @@
             </el-table-column>
           </el-table-column>
           <el-table-column label="销除不良及破损的时分及盖章">
-            <el-table-column prop="repairDate" label="月 日" width="100">
+            <el-table-column prop="repairDate" label="月 日" width="120">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.endTimeMoonDay.domId" v-model="scope.row.endTime.moonDay" @blur="endTimeMoonDayChange(scope.row.endTime.moonDay)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.endTimeMoonDay.domId" v-model="scope.row.endTime.moonDay" @blur="endTimeMoonDayChange(scope.row.endTime.moonDay)" /> -->
+                <el-date-picker v-if="dataIndex === scope.$index" :id="registerInput.endTimeMoonDay.domId" v-model="scope.row.endTime.moonDay" format="M月d日" value-format="M月d日" class="dateClass" :clearable="false" type="date" @change="endTimeMoonDayChange(scope.row.endTime.moonDay)" />
                 <span v-else>{{ scope.row.endTime.moonDay }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="repairTime" label="时 分" width="100">
               <template slot-scope="scope">
-                <el-input v-if="dataIndex === scope.$index" :id="registerInput.endTimeHourMinute.domId" v-model="scope.row.endTime.hourMinute" @blur="endTimeHourMinuteChange(scope.row.endTime.hourMinute)" />
+                <!-- <el-input v-if="dataIndex === scope.$index" :id="registerInput.endTimeHourMinute.domId" v-model="scope.row.endTime.hourMinute" @blur="endTimeHourMinuteChange(scope.row.endTime.hourMinute)" /> -->
+                <el-time-picker v-if="dataIndex === scope.$index" :id="registerInput.endTimeHourMinute.domId" v-model="scope.row.endTime.hourMinute" :picker-options="{format:'HH:mm'}" format="HH:mm" value-format="HH:mm" class="timeClass" :clearable="false" @change="endTimeHourMinuteChange(scope.row.endTime.hourMinute)" />
                 <span v-else>{{ scope.row.endTime.hourMinute }}</span>
               </template>
             </el-table-column>
@@ -304,6 +312,15 @@ export default {
 };
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.dateClass {
+	width: 99px;
+}
+.timeClass {
+	width: 79px;
+}
+/deep/ .el-input--suffix .el-input__inner {
+	padding-right: 10px;
+	padding-left: 28px;
+}
 </style>