Browse Source

输入框非法输入样式,只读输入框样式

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1179 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 10 years ago
parent
commit
f27e66a04f

+ 5 - 0
src/main/webapp/resources/css/index.css

@@ -1931,6 +1931,11 @@ ul>li.item-link>a {
 /*form valid*/
 input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	background-color: #fff8ee;
+	border-color: #CC0033;
+}
+
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+	cursor: pointer;
 }
 
 .form-group {

+ 5 - 0
src/main/webapp/resources/css/register.css

@@ -102,6 +102,11 @@ h1,h2,h3 {
 	padding-bottom: 0px;
 }
 
+input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
+	background-color: #fff8ee;
+	border-color: #CC0033;
+}
+
 /*header*/
 #top {
 	border-top: 4px solid #44b549;

+ 4 - 4
src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -144,12 +144,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"
@@ -160,12 +160,12 @@
 					</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="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-click="openDatePicker($event, condition, '$toOpened')"
 							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"

+ 4 - 4
src/main/webapp/resources/tpl/index/sale/notice.html

@@ -228,12 +228,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"
@@ -244,12 +244,12 @@
 					</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="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-click="openDatePicker($event, condition, '$toOpened')"
 							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"

+ 7 - 5
src/main/webapp/resources/tpl/index/sale/order.html

@@ -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>

+ 4 - 4
src/main/webapp/resources/tpl/index/sale/send.html

@@ -162,12 +162,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"
@@ -178,12 +178,12 @@
 					</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="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
+							ng-click="openDatePicker($event, condition, '$toOpened')"
 							ng-change="onDateCondition()">
 						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"