From 0f68bec2ffad038d70b092ea2d29dde0c0b71aff Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 28 Mar 2025 12:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ownerRepairDetail/ownerRepairDetail.html  |  71 ++--
 .../ownerRepairDetail/ownerRepairDetail.js    |   3 +
 .../ownerRepairManage/ownerRepairManage.html  | 307 +++++++++---------
 .../repairPoolManage/repairPoolManage.html    |  16 +-
 .../repairPoolManage/repairPoolManage.js      |  73 +----
 .../pages/work/adminRepair/adminRepair.html   |  16 +-
 6 files changed, 237 insertions(+), 249 deletions(-)

diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
index b5cb5c68c..8b3291571 100644
--- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
+++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
@@ -16,7 +16,7 @@
         </div>
         <div class="ibox-content">
             <div class="row">
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="工单编码：" namespace="ownerRepairDetail"></vc:i18n>
@@ -24,7 +24,7 @@
                         <label class="">{{ownerRepairDetailInfo.repairId}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="报修类型：" namespace="ownerRepairDetail"></vc:i18n>
@@ -32,7 +32,7 @@
                         <label class="">{{ownerRepairDetailInfo.repairTypeName}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="报修人：" namespace="ownerRepairDetail"></vc:i18n>
@@ -40,9 +40,8 @@
                         <label class="">{{ownerRepairDetailInfo.repairName}}</label>
                     </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-4">
+        
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="联系方式：" namespace="ownerRepairDetail"></vc:i18n>
@@ -50,7 +49,7 @@
                         <label class="">{{ownerRepairDetailInfo.tel}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="位置：" namespace="ownerRepairDetail"></vc:i18n>
@@ -58,17 +57,39 @@
                         <label class="">{{ownerRepairDetailInfo.repairObjName}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
-                            <vc:i18n name="预约时间：" namespace="ownerRepairDetail"></vc:i18n>
+                            <vc:i18n name="预约开始时间：" namespace="ownerRepairDetail"></vc:i18n>
                         </label>
                         <label class="">{{ownerRepairDetailInfo.appointmentTime}}</label>
                     </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-4">
+                <div class="col-sm-3">
+                    <div class="form-group">
+                        <label class="col-form-label">
+                            <vc:i18n name="预约结束时间：" namespace="ownerRepairDetail"></vc:i18n>
+                        </label>
+                        <label class="">{{ownerRepairDetailInfo.timeout}}</label>
+                    </div>
+                </div>
+                <div class="col-sm-3">
+                    <div class="form-group">
+                        <label class="col-form-label">
+                            <vc:i18n name="提单时长：" namespace="ownerRepairDetail"></vc:i18n>
+                        </label>
+                        <label class="">{{ownerRepairDetailInfo.submitHours|| '0'}}</label>
+                    </div>
+                </div>
+                <div class="col-sm-3">
+                    <div class="form-group">
+                        <label class="col-form-label">
+                            <vc:i18n name="完成时间：" namespace="ownerRepairDetail"></vc:i18n>
+                        </label>
+                        <label class="">{{ownerRepairDetailInfo.finishTime || '-'}}</label>
+                    </div>
+                </div>
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="状态：" namespace="ownerRepairDetail"></vc:i18n>
@@ -76,7 +97,7 @@
                         <label class="">{{ownerRepairDetailInfo.stateName}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="报修内容：" namespace="ownerRepairDetail"></vc:i18n>
@@ -84,7 +105,7 @@
                         <label class="">{{ownerRepairDetailInfo.context}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label"
                             v-if="ownerRepairDetailInfo.maintenanceType != null && ownerRepairDetailInfo.maintenanceType != ''">
@@ -104,9 +125,8 @@
                         </label>
                     </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-4"
+
+                <div class="col-sm-3"
                     v-if="ownerRepairDetailInfo.maintenanceType == '1001' || ownerRepairDetailInfo.maintenanceType == '1003'">
                     <div class="form-group">
                         <label class="col-form-label">
@@ -115,7 +135,7 @@
                         <label class="">{{ownerRepairDetailInfo.repairMaterials}}</label>
                     </div>
                 </div>
-                <div class="col-sm-4" v-if="ownerRepairDetailInfo.maintenanceType == '1001'">
+                <div class="col-sm-3" v-if="ownerRepairDetailInfo.maintenanceType == '1001'">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="费用明细：" namespace="ownerRepairDetail"></vc:i18n>
@@ -127,7 +147,7 @@
                         </label>
                     </div>
                 </div>
-                <div class="col-sm-4" v-if="ownerRepairDetailInfo.appraiseScore != '0'">
+                <div class="col-sm-3" v-if="ownerRepairDetailInfo.appraiseScore != '0'">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="综合评价得分：" namespace="ownerRepairDetail"></vc:i18n>
@@ -139,9 +159,8 @@
                         </label>
                     </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-4" v-if="ownerRepairDetailInfo.doorSpeedScore != '0'">
+
+                <div class="col-sm-3" v-if="ownerRepairDetailInfo.doorSpeedScore != '0'">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="上门速度评分：" namespace="ownerRepairDetail"></vc:i18n>
@@ -153,7 +172,7 @@
                         </label>
                     </div>
                 </div>
-                <div class="col-sm-4" v-if="ownerRepairDetailInfo.repairmanServiceScore != '0'">
+                <div class="col-sm-3" v-if="ownerRepairDetailInfo.repairmanServiceScore != '0'">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="维修员服务评分：" namespace="ownerRepairDetail"></vc:i18n>
@@ -165,7 +184,7 @@
                         </label>
                     </div>
                 </div>
-                <div class="col-sm-4" v-if="ownerRepairDetailInfo.average != '0.0'">
+                <div class="col-sm-3" v-if="ownerRepairDetailInfo.average != '0.0'">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="平均分：" namespace="ownerRepairDetail"></vc:i18n>
@@ -177,7 +196,7 @@
                 </div>
             </div>
             <div class="row" v-if="ownerRepairDetailInfo.visitType">
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="回访满意度：" namespace="ownerRepairDetail"></vc:i18n>
@@ -185,7 +204,7 @@
                         <label class="">{{ownerRepairDetailInfo.visitType=='1001'?'满意':'不满意'}}</label>
                     </div>
                 </div>
-                <div class="col-sm-8">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label class="col-form-label">
                             <vc:i18n name="回访内容：" namespace="ownerRepairDetail"></vc:i18n>
diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
index 47f726b8a..c2050d70a 100644
--- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
+++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
@@ -11,6 +11,9 @@
                 roomName: '',
                 repairObjName: '',
                 appointmentTime: '',
+                submitHours:'',
+                timeout:'',
+                finishTime:'',
                 context: '',
                 stateName: '',
                 userId: '',
diff --git a/public/pages/property/ownerRepairManage/ownerRepairManage.html b/public/pages/property/ownerRepairManage/ownerRepairManage.html
index d6758bcd1..8fbbe122b 100644
--- a/public/pages/property/ownerRepairManage/ownerRepairManage.html
+++ b/public/pages/property/ownerRepairManage/ownerRepairManage.html
@@ -1,173 +1,164 @@
 <div class="animated fadeInRight ecommerce">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>
-                        <vc:i18n name="查询条件" namespace="ownerRepairManage"></vc:i18n>
-                    </h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!--<button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+
+    <div class="ibox ">
+        <div class="ibox-title">
+            <h5>
+                <vc:i18n name="查询条件" namespace="ownerRepairManage"></vc:i18n>
+            </h5>
+            <div class="ibox-tools" style="top:10px;">
+                <!--<button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
                                 v-on:click="_moreCondition()">{{ownerRepairManageInfo.moreCondition == true?'隐藏':'更多'}}
                         </button>-->
+            </div>
+        </div>
+        <div class="ibox-content">
+            <div class="row">
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <input type="text" :placeholder="vc.i18n('请输入工单编号','ownerRepairManage')"
+                            v-model.trim="ownerRepairManageInfo.conditions.repairId" class=" form-control">
                     </div>
                 </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入工单编号','ownerRepairManage')"
-                                       v-model.trim="ownerRepairManageInfo.conditions.repairId" class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-2">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入报修人','ownerRepairManage')"
-                                       v-model.trim="ownerRepairManageInfo.conditions.repairName" class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-2">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入报修电话','ownerRepairManage')"
-                                       v-model.trim="ownerRepairManageInfo.conditions.tel" class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-2">
-                            <select class="custom-select" v-model="ownerRepairManageInfo.conditions.repairType">
-                                <option selected value="">{{vc.i18n('请选择报修类型','ownerRepairManage')}}</option>
-                                <option v-for="(item,index) in ownerRepairManageInfo.repairTypes" :key="index"
-                                        :value="item.repairType">{{item.repairTypeName}}
-                                </option>
-                            </select>
-                        </div>
-                        <div class="col-sm-2">
-                            <select class="custom-select" v-model="ownerRepairManageInfo.conditions.state">
-                                <option selected value="">{{vc.i18n('请选择报修状态','ownerRepairManage')}}</option>
-                                <option v-for="(item,index) in ownerRepairManageInfo.states" :value="item.statusCd">
-                                    {{item.name}}
-                                </option>
-                            </select>
-                        </div>
-                        <div class="col-sm-2" style="margin-top: 5px;">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerRepairMethod()">
-                                <i class="fa fa-search"></i>
-                                <vc:i18n name="查询" namespace="ownerRepairManage"></vc:i18n>
-                            </button>
-                            <button type="button" class="btn btn-info btn-sm" v-on:click="_resetOwnerRepairMethod()"
-                                    style="margin-left: 20px;">
-                                <i class="fa fa-repeat"></i>
-                                <vc:i18n name="重置" namespace="ownerRepairManage"></vc:i18n>
-                            </button>
-                        </div>
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <input type="text" :placeholder="vc.i18n('请输入报修人','ownerRepairManage')"
+                            v-model.trim="ownerRepairManageInfo.conditions.repairName" class=" form-control">
                     </div>
                 </div>
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <input type="text" :placeholder="vc.i18n('请输入报修电话','ownerRepairManage')"
+                            v-model.trim="ownerRepairManageInfo.conditions.tel" class=" form-control">
+                    </div>
+                </div>
+                <div class="col-sm-2">
+                    <select class="custom-select" v-model="ownerRepairManageInfo.conditions.repairType">
+                        <option selected value="">{{vc.i18n('请选择报修类型','ownerRepairManage')}}</option>
+                        <option v-for="(item,index) in ownerRepairManageInfo.repairTypes" :key="index"
+                            :value="item.repairType">{{item.repairTypeName}}
+                        </option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="custom-select" v-model="ownerRepairManageInfo.conditions.state">
+                        <option selected value="">{{vc.i18n('请选择报修状态','ownerRepairManage')}}</option>
+                        <option v-for="(item,index) in ownerRepairManageInfo.states" :value="item.statusCd">
+                            {{item.name}}
+                        </option>
+                    </select>
+                </div>
+                <div class="col-sm-2" style="margin-top: 5px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerRepairMethod()">
+                        <i class="fa fa-search"></i>
+                        <vc:i18n name="查询" namespace="ownerRepairManage"></vc:i18n>
+                    </button>
+                    <button type="button" class="btn btn-info btn-sm" v-on:click="_resetOwnerRepairMethod()"
+                        style="margin-left: 20px;">
+                        <i class="fa fa-repeat"></i>
+                        <vc:i18n name="重置" namespace="ownerRepairManage"></vc:i18n>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>
-                        <vc:i18n name="电话报修" namespace="ownerRepairManage"></vc:i18n>
-                    </h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <!-- v-if="ownerRepairManageInfo.conditions.roomId != ''"-->
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerRepairModal()">
-                            <i class="fa fa-plus"></i>
-                            <vc:i18n name="登记" namespace="ownerRepairManage"></vc:i18n>
-                        </button>
+
+    <div class="ibox">
+        <div class="ibox-title">
+            <h5>
+                <vc:i18n name="电话报修" namespace="ownerRepairManage"></vc:i18n>
+            </h5>
+            <div class="ibox-tools" style="top:10px;">
+                <!-- v-if="ownerRepairManageInfo.conditions.roomId != ''"-->
+                <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerRepairModal()">
+                    <i class="fa fa-plus"></i>
+                    <vc:i18n name="登记" namespace="ownerRepairManage"></vc:i18n>
+                </button>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                <thead>
+                    <tr>
+                        <th class="text-center">
+                            <vc:i18n name="工单编号" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="位置" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="报修类型" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="报修人" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="联系方式" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="预约时间" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="超时时间" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="提交时间" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="状态" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name="操作" namespace="ownerRepairManage"></vc:i18n>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="ownerRepair in ownerRepairManageInfo.ownerRepairs">
+                        <td class="text-center">{{ownerRepair.repairId}}</td>
+                        <td class="text-center">{{ownerRepair.repairObjName}}</td>
+                        <td class="text-center">{{ownerRepair.repairTypeName}}</td>
+                        <td class="text-center">{{ownerRepair.repairName}}</td>
+                        <td class="text-center">{{ownerRepair.tel}}</td>
+                        <td class="text-center">{{ownerRepair.appointmentTime}}</td>
+                        <td class="text-center">{{ownerRepair.timeout}}</td>
+                        <td class="text-center">{{ownerRepair.createTime}}</td>
+                        <td class="text-center"
+                            v-if="ownerRepair.state == '1800' && (ownerRepair.returnVisitFlag == '001' || ownerRepair.returnVisitFlag == '002')">
+                            {{ownerRepair.stateName}}(定时任务处理)
+                        </td>
+                        <td class="text-center" v-else>
+                            {{ownerRepair.stateName}}
+                        </td>
+                        <td class="text-center">
+                            <div class="btn-group"
+                                v-if="vc.hasPrivilege('502021012067300023') && (ownerRepair.state == '1000' || ownerRepair.state == '1200')">
+                                <button class="btn-white btn btn-xs"
+                                    v-on:click="_openEditOwnerRepairModel(ownerRepair)">
+                                    <vc:i18n name="修改" namespace="ownerRepairManage"></vc:i18n>
+                                </button>
+                            </div>
+                            <div class="btn-group"
+                                v-if="vc.hasPrivilege('502021012051410024') && (ownerRepair.state == '1000' || ownerRepair.state == '1200')">
+                                <button class="btn-white btn btn-xs"
+                                    v-on:click="_openDeleteOwnerRepairModel(ownerRepair)">
+                                    <vc:i18n name="删除" namespace="ownerRepairManage"></vc:i18n>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <!-- 分页 -->
+            <div class="row margin-top-xs">
+                <div class="col-sm-9">
+                    <div>
+                        注意：此功能使用前 请先到 报修管理；
+                    </div>
+                    <div>
+                        一般业主房屋报修 我们必须要添加一个非公共区域的类型才能正常报修
                     </div>
                 </div>
-                <div class="ibox-content">
-                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                        <thead>
-                        <tr>
-                            <th class="text-center">
-                                <vc:i18n name="工单编号" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="位置" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="报修类型" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="报修人" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="联系方式" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="预约时间" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="提交时间" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="状态" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name="操作" namespace="ownerRepairManage"></vc:i18n>
-                            </th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="ownerRepair in ownerRepairManageInfo.ownerRepairs">
-                            <td class="text-center">{{ownerRepair.repairId}}</td>
-                            <td class="text-center">{{ownerRepair.repairObjName}}</td>
-                            <td class="text-center">{{ownerRepair.repairTypeName}}</td>
-                            <td class="text-center">{{ownerRepair.repairName}}</td>
-                            <td class="text-center">{{ownerRepair.tel}}</td>
-                            <td class="text-center">{{ownerRepair.appointmentTime}}</td>
-                            <td class="text-center">{{ownerRepair.createTime}}</td>
-                            <td class="text-center"
-                                v-if="ownerRepair.state == '1800' && (ownerRepair.returnVisitFlag == '001' || ownerRepair.returnVisitFlag == '002')">
-                                {{ownerRepair.stateName}}(定时任务处理)
-                            </td>
-                            <td class="text-center" v-else>
-                                {{ownerRepair.stateName}}
-                            </td>
-                            <td class="text-center">
-                                <div class="btn-group"
-                                     v-if="vc.hasPrivilege('502021012067300023') && (ownerRepair.state == '1000' || ownerRepair.state == '1200')">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditOwnerRepairModel(ownerRepair)">
-                                        <vc:i18n name="修改" namespace="ownerRepairManage"></vc:i18n>
-                                    </button>
-                                </div>
-                                <div class="btn-group"
-                                     v-if="vc.hasPrivilege('502021012051410024') && (ownerRepair.state == '1000' || ownerRepair.state == '1200')">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteOwnerRepairModel(ownerRepair)">
-                                        <vc:i18n name="删除" namespace="ownerRepairManage"></vc:i18n>
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="10">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <div class="row margin-top-xs">
-                        <div class="col-sm-9">
-                            <div>
-                                注意：此功能使用前 请先到 报修管理；
-                            </div>
-                            <div>
-                                一般业主房屋报修 我们必须要添加一个非公共区域的类型才能正常报修
-                            </div>
-                        </div>
-                        <div class="col-sm-3 float-right">
-                            <vc:create path="frame/pagination"></vc:create>
-                        </div>
-                    </div>
+                <div class="col-sm-3 float-right">
+                    <vc:create path="frame/pagination"></vc:create>
                 </div>
             </div>
         </div>
diff --git a/public/pages/property/repairPoolManage/repairPoolManage.html b/public/pages/property/repairPoolManage/repairPoolManage.html
index dd1fce668..4b12d5941 100644
--- a/public/pages/property/repairPoolManage/repairPoolManage.html
+++ b/public/pages/property/repairPoolManage/repairPoolManage.html
@@ -132,11 +132,18 @@
                                     <vc:i18n name="联系方式" namespace="repairPoolManage"></vc:i18n>
                                 </th>
                                 <th class="text-center">
-                                    <vc:i18n name="预约时间" namespace="repairPoolManage"></vc:i18n>
+                                    <div>预约</div>
+                                    <div>开始/结束时间</div>
                                 </th>
                                 <th class="text-center">
                                     <vc:i18n name="提交时间" namespace="repairPoolManage"></vc:i18n>
                                 </th>
+                                <th class="text-center">
+                                    <vc:i18n name="提单时长" namespace="repairPoolManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="完成时间" namespace="repairPoolManage"></vc:i18n>
+                                </th>
                                 <th class="text-center">
                                     <vc:i18n name="状态" namespace="repairPoolManage"></vc:i18n>
                                 </th>
@@ -157,8 +164,13 @@
                                 </td>
                                 <td class="text-center">{{repairPool.repairName}}</td>
                                 <td class="text-center">{{repairPool.tel}}</td>
-                                <td class="text-center">{{repairPool.appointmentTime}}</td>
+                                <td class="text-center">
+                                    <div>{{repairPool.appointmentTime}}</div>
+                                    <div>~{{repairPool.timeout}}</div>
+                                </td>
                                 <td class="text-center">{{repairPool.createTime}}</td>
+                                <td class="text-center">{{repairPool.submitHours || '0'}}</td>
+                                <td class="text-center">{{repairPool.finishTime || '-'}}</td>
                                 <td class="text-center"
                                     v-if="repairPool.state == '1800' && (repairPool.returnVisitFlag == '001' || repairPool.returnVisitFlag == '002')">
                                     {{repairPool.stateName}}(定时任务处理)
diff --git a/public/pages/property/repairPoolManage/repairPoolManage.js b/public/pages/property/repairPoolManage/repairPoolManage.js
index 0e0bd963c..7b7e3c022 100644
--- a/public/pages/property/repairPoolManage/repairPoolManage.js
+++ b/public/pages/property/repairPoolManage/repairPoolManage.js
@@ -34,13 +34,16 @@
             }
         },
         _initMethod: function () {
-            $that._initRepairPoolInfo();
             $that._listRepairSettings(DEFAULT_PAGE, 50);
             vc.getDict('r_repair_pool', "state", function (_data) {
                 $that.repairPoolManageInfo.states = [{
                     statusCd: '',
                     name: '全部'
-                }]
+                },
+                {
+                    statusCd: 'TIMEOUT',
+                    name: '超时工单'
+                }];
                 _data.forEach(item => {
                     $that.repairPoolManageInfo.states.push(item);
                 });
@@ -68,71 +71,19 @@
             });
         },
         methods: {
-            _initRepairPoolInfo: function () {
-                $('.repairStartTime').datetimepicker({
-                    minView: "month",
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.repairStartTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".editStartTime").val();
-                        $that.repairPoolManageInfo.conditions.startTime = value;
-                    });
-                $('.repairEndTime').datetimepicker({
-                    minView: "month",
-                    language: 'zh-CN',
-                    fontAwesome: 'fa',
-                    format: 'yyyy-mm-dd',
-                    initTime: true,
-                    initialDate: new Date(),
-                    autoClose: 1,
-                    todayBtn: true
-                });
-                $('.repairEndTime').datetimepicker()
-                    .on('changeDate', function (ev) {
-                        var value = $(".repairEndTime").val();
-                        var start = Date.parse(new Date($that.repairPoolManageInfo.conditions.startTime))
-                        var end = Date.parse(new Date(value))
-                        if (start - end >= 0) {
-                            vc.toast("结束时间必须大于开始时间")
-                            $(".repairEndTime").val('')
-                        } else {
-                            $that.repairPoolManageInfo.conditions.endTime = value;
-                        }
-                    });
-                //防止多次点击时间插件失去焦点
-                document.getElementsByClassName(' form-control repairStartTime')[0].addEventListener('click', myfunc)
-
-                function myfunc(e) {
-                    e.currentTarget.blur();
-                }
-
-                document.getElementsByClassName(" form-control repairEndTime")[0].addEventListener('click', myfunc)
-
-                function myfunc(e) {
-                    e.currentTarget.blur();
-                }
-            },
+           
             //查询方法
             _listRepairPools: function (_page, _rows) {
                 $that.repairPoolManageInfo.conditions.page = _page;
                 $that.repairPoolManageInfo.conditions.row = _rows;
                 $that.repairPoolManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
-                var param = {
-                    params: $that.repairPoolManageInfo.conditions
+                let param = {
+                    params: JSON.parse(JSON.stringify($that.repairPoolManageInfo.conditions))
                 };
-                //报修人查询框去空
-                param.params.repairName = param.params.repairName.trim();
-                //报修ID查询框去空
-                param.params.repairId = param.params.repairId.trim();
-                //报修电话查询框去空
-                param.params.tel = param.params.tel.trim();
+                if(param.params.state == 'TIMEOUT'){
+                    param.params.state = '';
+                    param.params.timeoutFlag = 'Y'
+                }
                 //发送get请求
                 vc.http.apiGet('/ownerRepair.listOwnerRepairs',
                     param,
diff --git a/public/pages/work/adminRepair/adminRepair.html b/public/pages/work/adminRepair/adminRepair.html
index 830bfb117..1a466687b 100644
--- a/public/pages/work/adminRepair/adminRepair.html
+++ b/public/pages/work/adminRepair/adminRepair.html
@@ -73,11 +73,18 @@
                                         <vc:i18n name="联系方式" namespace="adminRepair"></vc:i18n>
                                     </th>
                                     <th class="text-center">
-                                        <vc:i18n name="预约时间" namespace="adminRepair"></vc:i18n>
+                                        <div>预约</div>
+                                        <div>开始/结束时间</div>
                                     </th>
                                     <th class="text-center">
                                         <vc:i18n name="提交时间" namespace="adminRepair"></vc:i18n>
                                     </th>
+                                    <th class="text-center">
+                                        <vc:i18n name="提单时长" namespace="adminRepair"></vc:i18n>
+                                    </th>
+                                    <th class="text-center">
+                                        <vc:i18n name="完成时间" namespace="adminRepair"></vc:i18n>
+                                    </th>
                                     <th class="text-center">
                                         <vc:i18n name="状态" namespace="adminRepair"></vc:i18n>
                                     </th>
@@ -99,8 +106,13 @@
                                     </td>
                                     <td class="text-center">{{repairPool.repairName}}</td>
                                     <td class="text-center">{{repairPool.tel}}</td>
-                                    <td class="text-center">{{repairPool.appointmentTime}}</td>
+                                    <td class="text-center">
+                                        <div>{{repairPool.appointmentTime}}</div>
+                                        <div>~{{repairPool.timeout}}</div>
+                                    </td>
                                     <td class="text-center">{{repairPool.createTime}}</td>
+                                    <td class="text-center">{{repairPool.submitHours || '0'}}</td>
+                                    <td class="text-center">{{repairPool.finishTime || '-'}}</td>
                                     <td class="text-center"
                                         v-if="repairPool.state == '1800' && (repairPool.returnVisitFlag == '001' || repairPool.returnVisitFlag == '002')">
                                         {{repairPool.stateName}}(定时任务处理)