延期处理，回访，处理

assets/views/incident/incidentDetail.html

@@ -441,39 +441,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-12 ui-followStatus2">
-                    <div class="row padding-sm no-padding-vr bordered no-border-hr ">
-                        <div class="col-md-12">
-                            <div style="color: #333;">维修记录：</div>
-                            <div class="panel panel-white">
-                                <div class="panel-body">
-                                    <table class="table table-striped table-hover" style="table-layout:fixed">
-                                        <thead>
-                                            <tr>
-                                                <th class="center" style="width:10px">#</th>
-                                                <th class="center" style="width:100px">处理人</th>
-                                                <th class="center" style="width:200px">时间</th>
-                                                <th class="center" style="width:100px">维修方式</th>
-                                                <th class="center" style="width:100px">预估天数</th>
-                                                <th class="center">备注</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            <tr ng-repeat="item in model.handlerLogs">
-                                                <td class="center">{{$index + 1}}</td>
-                                                <td class="center">{{item.userName}}</td>
-                                                <td class="center">{{item.opTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                                                <td class="center">{{item.repairType ? item.repairType.name : ''}}</td>
-                                                <td class="center">{{item.expectedDay}}</td>
-                                                <td class="center" style="white-space: normal;word-break:break-all">{{item.opValue}}</td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
             <div class="panel col-xs-12 col-0 bg-lightgrey margin-top-10 "
                 style="border-bottom-left-radius:0px !important;border-bottom-right-radius:0px !important ">
@@ -526,16 +493,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-4 ui-label">
-                    <div class="form-group">
-                        <div class="padding-top-5">
-                            <label>是否已解决:</label>
-                            <div>
-                                <input class="form-control" ng-value="model.isclose" type="text" disabled="disabled" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="col-xs-12 ui-label">
                     <div class="form-group">
                         <div class="padding-top-5">

assets/views/incident/tpl/callback.tpl.html

@@ -0,0 +1,37 @@
+<!-- 回访-->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">回访
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident"><span class="red">*</span>满意度评价</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:210px" ng-model="postData.degree" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in degreeList | filter:{$:$select.search}">
+                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">回访备注</label>:</div>
+            <div class="pull-right">
+                <textarea rows="3" style="resize: none;width:210px" placeholder="" ng-model="postData.visitRemarks"></textarea>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint" style="cursor: pointer;">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>

assets/views/incident/tpl/doing.tpl.html

@@ -0,0 +1,69 @@
+<!-- 处理-->
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">处理
+        <button type="button" class="close pull-right" ng-click="cancel()">×</button>
+    </div>
+</div>
+<div class="modal-body center">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident"><span class="red">*</span>处理方式</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:220px" ng-model="postData.handleCategory" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in incidentHandleCategoryList | filter:{$:$select.search}">
+                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="model.category.hasSimple != 1">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident"><span class="red">*</span>关闭代码</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:220px" ng-model="postData.closecode" theme="bootstrap">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in incidentClosecodeList | filter:{$:$select.search}">
+                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="model.category.hasSimple != 1">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident"><span class="red">*</span>处理方案</label>:</div>
+            <div class="pull-right">
+                <textarea rows="3" style="resize: none;width:220px" placeholder="" ng-model="postData.handleDescription"></textarea>
+            </div>
+        </div>
+    </div>
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+        <div class=" input-group" style="margin:8px 0 0;">
+            <div class="control-label pull-left margin-top-5 margin-right-5">
+                <label class="demoincident">协同人</label>:</div>
+            <div class="pull-right">
+                <ui-select class="pull-left" style="width:220px;text-align: left;" ng-model="postData.synergetic" theme="bootstrap" multiple>
+                    <ui-select-match placeholder="">
+                        {{$item.name}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in synergeticList | filter:{$:$select.search}" refresh="getSynergeticList($select.search)" refresh-delay="1000">
+                        <div ng-bind-html="item.name | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer modelfooter-hint" style="cursor: pointer;">
+    <div class="hintfooterleft pull-left" ng-click="ok()" style="cursor: pointer;">确定</div>
+    <div class="hintfooterright pull-right" ng-click="cancel()" style="cursor: pointer;">取消</div>
+</div>