Browse Source

关联事件名称修改为最近报修,故障地址改为区域地点详细地址,增加工单状态

seimin 3 years ago
parent
commit
451d01cc71
2 changed files with 10 additions and 7 deletions
  1. 4 3
      assets/css/styles.css
  2. 6 4
      assets/views/customform/tpl/ui-repeatIncident.html

+ 4 - 3
assets/css/styles.css

@@ -6592,12 +6592,13 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
6592
     border-bottom: 1px solid #c8c7cc !important;
6592
     border-bottom: 1px solid #c8c7cc !important;
6593
     width: 545px;
6593
     width: 545px;
6594
     max-height: 500px;
6594
     max-height: 500px;
6595
-    z-index: 99999;
6595
+    /* z-index: 99999; */
6596
     box-sizing: border-box;
6596
     box-sizing: border-box;
6597
     padding-bottom: 33px;
6597
     padding-bottom: 33px;
6598
 }
6598
 }
6599
 
6599
 
6600
 .seachknowledge.active {
6600
 .seachknowledge.active {
6601
+    z-index: 99999;
6601
     right: 0;
6602
     right: 0;
6602
 }
6603
 }
6603
 
6604
 
@@ -6609,7 +6610,7 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
6609
     /* width: 43px; */
6610
     /* width: 43px; */
6610
     padding: 4px 9px;
6611
     padding: 4px 9px;
6611
     position: absolute;
6612
     position: absolute;
6612
-    top: 31px;
6613
+    top: 9px;
6613
     border-top-right-radius: 0;
6614
     border-top-right-radius: 0;
6614
     border-bottom-right-radius: 0;
6615
     border-bottom-right-radius: 0;
6615
 }
6616
 }
@@ -6721,7 +6722,7 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
6721
     border-right: none;
6722
     border-right: none;
6722
     background: #ffffff;
6723
     background: #ffffff;
6723
     border-color: #c8c7cc !important;
6724
     border-color: #c8c7cc !important;
6724
-    z-index: 99999999;
6725
+    /* z-index: 99999999; */
6725
 }
6726
 }
6726
 
6727
 
6727
 .repeatIncident.panel .panel-heading {
6728
 .repeatIncident.panel .panel-heading {

+ 6 - 4
assets/views/customform/tpl/ui-repeatIncident.html

@@ -1,12 +1,12 @@
1
 <!-- start: SETTINGS -->
1
 <!-- start: SETTINGS -->
2
-<button ct-toggle="toggle" tooltip="选择关联事件" tooltip-placement="left" target="repeatIncident" parent-active-class="active"
2
+<button ct-toggle="toggle" tooltip="最近报修" tooltip-placement="left" target="repeatIncident" parent-active-class="active"
3
     class="btn btn-info">
3
     class="btn btn-info">
4
     <i class="iconfont icon-guancangzhongfu"></i>
4
     <i class="iconfont icon-guancangzhongfu"></i>
5
 </button>
5
 </button>
6
 <div class="container" style="padding:0;border-top: 1px solid #c8c7cc;">
6
 <div class="container" style="padding:0;border-top: 1px solid #c8c7cc;">
7
 
7
 
8
     <div class="ng-scope headersize">
8
     <div class="ng-scope headersize">
9
-        选择关联事件
9
+        最近报修
10
     </div>
10
     </div>
11
     <div id="theGrid" class="mainlist repeatList">
11
     <div id="theGrid" class="mainlist repeatList">
12
         <div class="grid">
12
         <div class="grid">
@@ -16,9 +16,11 @@
16
                         <!-- <input name="incident" type="radio" ng-model="selection.id" ng-value={{item.id}} class="repeatRadio fl" /> -->
16
                         <!-- <input name="incident" type="radio" ng-model="selection.id" ng-value={{item.id}} class="repeatRadio fl" /> -->
17
                         <p>事件分类:{{item.category.category}}</p>
17
                         <p>事件分类:{{item.category.category}}</p>
18
                         <!-- <p>事件主题:{{item.title}}</p> -->
18
                         <!-- <p>事件主题:{{item.title}}</p> -->
19
-                        <p>故障地点:{{item.houseNumber}}</p>
19
+                        <p>区域:{{item.place?item.place.area.area:''}}</p>
20
+                        <p>地点:{{item.place?item.place.place:''}}</p>
21
+                        <p>详细地址:{{item.houseNumber}}</p>
20
                         <p>创建时间:{{item.acceptDate}}</p>
22
                         <p>创建时间:{{item.acceptDate}}</p>
21
-                        <p>报修科室:{{item.department.dept}}</p>
23
+                        <p>工单状态:{{item.state.name}}</p>
22
                         <p>处理人:{{item.handlingPersonnelUser.name}}</p>
24
                         <p>处理人:{{item.handlingPersonnelUser.name}}</p>
23
                     </div>
25
                     </div>
24
                 </div>
26
                 </div>