|
|
@@ -156,12 +156,12 @@
|
|
|
</div>
|
|
|
<div class="form-group input-group input-group-xs input-trigger">
|
|
|
<input type="text" ng-model="condition.dateFrom"
|
|
|
- class="form-control" placeholder="从"
|
|
|
+ class="form-control" placeholder="点击选择起始日期" readonly="readonly"
|
|
|
datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
|
|
|
ng-required="true" max-date="condition.dateTo"
|
|
|
current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
- ng-focus="openDatePicker($event, condition, '$fromOpened')"
|
|
|
+ ng-click="openDatePicker($event, condition, '$fromOpened')"
|
|
|
ng-change="onDateCondition()">
|
|
|
<span class="input-group-btn">
|
|
|
<button type="button" class="btn btn-default"
|
|
|
@@ -172,7 +172,7 @@
|
|
|
</div>
|
|
|
<div class="form-group input-group input-group-xs input-trigger">
|
|
|
<input type="text" ng-model="condition.dateTo"
|
|
|
- class="form-control" placeholder="到"
|
|
|
+ class="form-control" placeholder="点击选择截止日期" readonly="readonly"
|
|
|
datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
|
|
|
ng-required="true" min-date="condition.dateFrom"
|
|
|
current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
@@ -357,13 +357,15 @@
|
|
|
</div>
|
|
|
</td>
|
|
|
<td class="text-center br-l">
|
|
|
- <div ng-if="item.replyQty>=item.qty" class="block">
|
|
|
+ <div ng-if="item.replyQty>=item.qty && !item.$editing" class="block">
|
|
|
<span class="text-trans success">已回复</span>
|
|
|
</div>
|
|
|
<div ng-if="item.end" class="block">
|
|
|
<span class="text-trans warning">已结案</span>
|
|
|
</div>
|
|
|
- <div ng-if="(!item.replyQty || item.replyQty<item.qty) && !item.end">
|
|
|
+ <div ng-if="(!item.replyQty || item.replyQty<=item.qty) && !item.end">
|
|
|
+ <br ng-if="item.replyQty>=item.qty">
|
|
|
+ <br ng-if="item.replyQty>=item.qty">
|
|
|
<div ng-show="!item.$editing">
|
|
|
<a ng-click="item.$editing=true">回复</a>
|
|
|
</div>
|