主动报价列表页面修改，模具询价页面修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9661 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -2022,6 +2022,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	}]);
 	
 	app.controller('AddUserInfoCtrl', ['$scope', '$modalInstance', 'customer', 'AccountUser', 'toaster', function($scope, $modalInstance, customer, AccountUser, toaster){
+	    $scope.isChanged = false;
 		$scope.checkboxes = {
 				checked : false
 			};
@@ -2035,6 +2036,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			angular.forEach($scope.userinfos, function(item) {
 				item.distribute = $scope.checkboxes.checked;
 			});
+            $scope.isChanged = true;
 		};
 		// 点击其中一个明细的复选框
 		$scope.checkOne = function(vendor){
@@ -2046,6 +2048,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 			});
 			$scope.checkboxes.checked = result;
+            $scope.isChanged = true;
 		};
 		$scope.close = function(save) {
 			var chooseResult = [];
@@ -12285,7 +12288,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.agree = function(id) {
 			AddPartner.agreeRequest({id: id}, {}, function(data) {
 				toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12295,7 +12299,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.refuse = function(id, reason) {
 			AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
 				toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12477,7 +12482,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.agree = function(id) {
             AddPartner.agreeRequest({id: id}, {}, function(data) {
                 toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
@@ -12491,7 +12497,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.refuse = function(id, reason) {
             AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
                 toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
@@ -12616,7 +12623,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.agree = function(id) {
 			AddPartner.agreeRequest({id: id}, {}, function(data) {
 				toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12626,7 +12634,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.refuse = function(id, reason) {
 			AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
 				toaster.pop('success', '提示', '操作成功');
-                $window.location.reload();
+                $scope.tableParams.reload();
+                // $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});

src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -49,6 +49,6 @@
 	</div>
 </div>
 <div class="modal-footer">
-	<button class="btn btn-primary" ng-click="close(true)">确认</button>
+	<button class="btn btn-primary" ng-click="close(true)" ng-disabled="!isChanged">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -286,7 +286,7 @@ tbody td div.text-mould {
 				<th>模具信息</th>
 				<th></th>
 				<th width="180">价格</th>
-				<th width="0"></th>
+				<th width=""></th>
 				<th width="80">有效日期</th>
 				<th width="0"></th>
 				<th width="180">操作</th>
@@ -354,6 +354,7 @@ tbody td div.text-mould {
 						</span>--> <span class="text-num text-bold" title="{{inquiryMould.date}}" ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span>
 						<span ng-bind="::inquiryMould.enterprise.enName"></span>
 						<span>流水号：<a class="text-num" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"></a></span>
+						币别：<span ng-bind="inquiryMould.currency"></span>
 					</div>
 				</td>
 				<td>
@@ -442,27 +443,11 @@ tbody td div.text-mould {
 				<td class="text-center">
 				</td>
 				<td class="text-center">
-					<!-- <div ng-repeat="items in inquiryMould.inquiryMouldItems">
-						<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-						<span ng-if="inquiryMould.currency == 'USD'">$</span>
-						<input type="text" class="text-right input-price" ng-model="items.price" placeholder="单价(请填数字)"
-							ng-change="verify(items.price)" ng-disabled="!inquiryMould.$editing"/>
-						<div ng-repeat="prod in items.inquiryMouldDetails">
-							<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-							<span ng-if="inquiryMould.currency == 'USD'">$</span>
-							<input type="text" class="text-right input-price" ng-model="prod.price" placeholder="单价(请填数字)"
-								ng-change="verify(prod.price)" ng-disabled="!inquiryMould.$editing"/>
-						</div>
-					</div> -->
 					<div ng-repeat="items in inquiryMould.inquiryMouldItems">
-						<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-						<span ng-if="inquiryMould.currency == 'USD'">$</span>
 						<input type="text" class="text-right input-price input-xs" ng-model="items.price" placeholder="单价(请填数字)" ng-blur="blurPrice(items.price)"
 							ng-change="verifyItems(items.price,items.reply);notZero(inquiryMould)" ng-disabled="!inquiryMould.$editing"/>
 						<!-- <span ng-show="canSave">{{inquiryMould_copy.inquiryMouldItems[$index].price}}</span> -->
 						<div ng-repeat="prod in items.inquiryMouldDetails">
-							<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-							<span ng-if="inquiryMould.currency == 'USD'">$</span>
 							<input type="text" class="text-right input-price input-xs" ng-model="prod.price" placeholder="单价(请填数字)" ng-blur="blurPrice(prod.price)"
 								ng-change="verifyProds(prod.price,prod.reply);notZero(inquiryMould)" ng-disabled="!inquiryMould.$editing"/>
 							<!-- <span ng-show="canSave">{{inquiryMould_copy.inquiryMouldItems[$parent.$index].inquiryMouldDetails[$index].price}}</span> -->

src/main/webapp/resources/tpl/index/sale/inquiry_mould_detail.html

@@ -106,9 +106,9 @@ tbody td .text-waiting {
 				<thead>
 				<tr class="header">
 					<th width="385">模具资料</th>
-					<th width="20"></th>
-					<th width="300">价格</th>
-					<th width="200"></th>
+					<th width="50">币别</th>
+					<th width="250">价格</th>
+					<th width="100"></th>
 				</tr>
 				</thead>
 			</table>
@@ -138,18 +138,15 @@ tbody td .text-waiting {
 								</span>
 							</div> -->
 						</td>
-						<td class="text-center" width="20">
+						<td class="text-center" width="50">
+							<span ng-bind="inquiryMould.currency"></span>
 						</td>
-						<td class="text-center" width="300">
+						<td class="text-center" width="250">
 							<div ng-repeat="items in inquiryMould.inquiryMouldItems">
-								<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-								<span ng-if="inquiryMould.currency == 'USD'">$</span>
 								<input type="text" class="text-right input-price input-xs" ng-model="items.price" placeholder="单价(请填数字)" ng-blur="blurPrice(items.price)"
 									ng-change="verifyItems(items.price,$index);notZero(inquiryMould)" ng-disabled="!inquiryMould.$editing"/>
 								<!-- <span ng-show="canSave">{{inquiryMould_copy.inquiryMouldItems[$index].price}}</span> -->
 								<div ng-repeat="prod in items.inquiryMouldDetails">
-									<span ng-if="inquiryMould.currency == 'RMB'">￥</span>
-									<span ng-if="inquiryMould.currency == 'USD'">$</span>
 									<input type="text" class="text-right input-price input-xs" ng-model="prod.price" placeholder="单价(请填数字)" ng-blur="blurPrice(prod.price)"
 										ng-change="verifyProds(prod.price,$index,$parent.$index);notZero(inquiryMould)" ng-disabled="!inquiryMould.$editing"/>
 									<!-- <span ng-show="canSave">{{inquiryMould_copy.inquiryMouldItems[$parent.$index].inquiryMouldDetails[$index].price}}</span> -->
@@ -183,7 +180,7 @@ tbody td .text-waiting {
 								</div>
 							</div>
 						</td>
-						<td class="text-center" width="200">
+						<td class="text-center" width="100">
 							<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
 								<span class="text-waiting">待报价</span>
 							</div>

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -139,10 +139,10 @@
 		</tr>
 		<tr class="toolbar toolbar-top">
 			<td colspan="6">
-				<div>
+				<!--<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 								  ng-model="selectAll">全选</label>
-				</div> <!-- 分页 -->
+				</div> &lt;!&ndash; 分页 &ndash;&gt;-->
 			</td>
 			<td class="text-center">
 				<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>