平台审批流增加复制粘贴功能，增加修改功能；修改代采订单ui，更新数据显示方式，商品增加单个或多个手工录入的功能

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

src/main/java/com/uas/platform/b2b/controller/ApprovalFlowController.java

@@ -42,6 +42,7 @@ public class ApprovalFlowController {
 	@ResponseBody
 	private ModelMap saveAppFlowSet(String json) {
 		ApprovalFlowInfo flowInfo = JSON.parseObject(json, ApprovalFlowInfo.class);
+		System.out.println(JSON.toJSON(flowInfo));
 		return approvalFlowService.saveAppFlowSet(flowInfo);
 	}
 
@@ -153,7 +154,7 @@ public class ApprovalFlowController {
 	 */
 	@RequestMapping(value = "/getNodeByName", method = RequestMethod.GET)
 	@ResponseBody
-	private ApprovalFlow getNodeByName(String name) {
+	private ApprovalFlowInfo getNodeByName(String name) {
 		return approvalFlowService.getNodeByName(name);
 	}
 }

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -198,8 +198,6 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/getProdList", method = RequestMethod.GET)
 	private Page<DeputyOrderItem> getProdList(PageParams params, String keyword) {
-		System.out.println(JSON.toJSON(params));
-		System.out.println(keyword);
 		return null;
 	}
 }

src/main/java/com/uas/platform/b2b/service/ApprovalFlowService.java

@@ -108,5 +108,5 @@ public interface ApprovalFlowService {
 	 * @param name
 	 * @return
 	 */
-	public ApprovalFlow getNodeByName(String name);
+	public ApprovalFlowInfo getNodeByName(String name);
 }

src/main/java/com/uas/platform/b2b/service/impl/ApprovalFlowServiceImpl.java

@@ -56,6 +56,12 @@ public class ApprovalFlowServiceImpl implements ApprovalFlowService {
 	@Override
 	public ModelMap saveAppFlowSet(ApprovalFlowInfo flowInfo) {
 		ModelMap map = new ModelMap();
+		if (flowInfo.getId() != null) {// 如果存在先删除以前的，再进行更新
+			ApprovalFlow old = approvalFlowDao.findOne(flowInfo.getId());
+			if (old != null) {
+				approvalFlowDao.delete(old.getId());
+			}
+		}
 		ApprovalFlow appFlow = new ApprovalFlow();
 		appFlow.setEnname(SystemSession.getUser().getEnterprise().getEnName());
 		appFlow.setEnuu(SystemSession.getUser().getEnterprise().getUu());
@@ -190,8 +196,26 @@ public class ApprovalFlowServiceImpl implements ApprovalFlowService {
 	}
 
 	@Override
-	public ApprovalFlow getNodeByName(String name) {
-		return approvalFlowDao.findByEnuuAndAppname(SystemSession.getUser().getEnterprise().getUu(), name);
+	public ApprovalFlowInfo getNodeByName(String name) {
+		ApprovalFlow flow = approvalFlowDao.findByEnuuAndAppname(SystemSession.getUser().getEnterprise().getUu(), name);
+		ApprovalFlowInfo flowInfo = new ApprovalFlowInfo();
+		List<AppNodes> nodes = new ArrayList<AppNodes>();
+		if (flow != null) {
+			flowInfo.setAppName(flow.getAppname());
+			flowInfo.setId(flow.getId());
+			if (!CollectionUtils.isEmpty(flow.getFlowNodes())) {
+				for (FlowNode flownode : flow.getFlowNodes()) {
+					AppNodes node = new AppNodes();
+					node.setLevel(flownode.getNodelev());
+					node.setPosition(flownode.getPosition());
+					node.setUsername(flownode.getEmname());
+					node.setUseruu(flownode.getEmcode());
+					nodes.add(node);
+				}
+			}
+		}
+		flowInfo.setAppNodes(nodes);
+		return flowInfo;
 	}
 
 }

src/main/webapp/resources/css/deputyOrder/order.css

@@ -37,6 +37,7 @@ body {
     background:url("../../img/deputyOrder/comm_bg01.png") no-repeat center;
     background-color:#f5f5f5;
     background-size: 100%;
+    margin-bottom: -11px;
 }
 .com_head span {
     margin-left:40px;
@@ -312,22 +313,22 @@ body {
     margin:0 auto;
 }
 .purchase_xq dl dd,.purchase_xq dl dt {
-    width:100%;
-    margin:0 auto;
+    width: 100%;
+    margin: 0 auto;
     height: 50px;
     border-bottom: #e8e8e8 1px dotted;
 }
 .purchase_xq dl span {
-    width:13.42%;
+    width: 10.44%;
     font-size: 14px;
     float: left;
     display: inline-block;
-    height:50px;
-    line-height:50px;
+    height: 50px;
+    line-height: 50px;
     text-align: center;
 }
 .purchase_xq dl span.wid01 {
-    width:6% ;
+    width: 6% ;
 }
 .page {
     width:100%;

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

@@ -8737,7 +8737,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		}, function(response) {
 			
 		});
-		
+
 		$scope.NoteSet = function() {
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/approvalFlow/step1.html',
@@ -8851,19 +8851,37 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		}
 	}]);
 	
-	app.controller('NoteStep1Ctrl', ['$scope', 'toaster', '$modalInstance', 'appFlow', 'AppName', '$filter', function($scope, toaster, $modalInstance, appFlow, AppName, $filter) {
+	app.controller('NoteStep1Ctrl', ['$scope', 'toaster', '$modalInstance', 'appFlow', 'AppName', '$filter', '$rootScope', function($scope, toaster, $modalInstance, appFlow, AppName, $filter, $rootScope) {
 		$scope.appName = AppName;// 标题名称
+		$scope.AppFlow = {appName: $scope.appName,
+				appNodes:{}};
+		$scope.AppFlow.appNodes = [];
 		appFlow.getNodeByName({name: AppName}, {}, function(data) {// 通过单据名称查询单个审批流
-			if(data.appname) {
+			if(data.appNodes.length != 0) {
 				$scope.node = data;
+				$scope.AppFlow = data;
 			}
 		}, function() {
 			
 		});
 		
-		$scope.AppFlow = {appName: $scope.appName,
-				AppNodes:{}};
-		$scope.AppFlow.AppNodes = [];
+		$scope.copy = function() {//复制
+			$rootScope.flowcopy = angular.copy($scope.AppFlow);
+			toaster.pop('info', '提示', '复制成功');
+			$modalInstance.dismiss();
+		}
+		
+		$scope.paste = function() {
+			$scope.AppFlow = {appName: $scope.appName, appNodes:{}};
+			$scope.AppFlow.appNodes = $rootScope.flowcopy.appNodes;
+		}
+		
+		$scope.clear = function() {// 清空
+			$scope.AppFlow = {appName: $scope.appName,
+					appNodes:{}};
+			$scope.AppFlow.appNodes = [];
+		}
+		
 		appFlow.getPositions({}, function(data) {// 获取人员信息
 			$scope.users = data;
 		}, function(response) {
@@ -8895,7 +8913,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 //					} 
 //				});
 //			} else {
-				$scope.AppFlow.AppNodes.push(item);
+				$scope.AppFlow.appNodes.push(item);
 //			}
 			
 		}
@@ -8906,18 +8924,18 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 					level: null
 			};
 			item.position = data;
-			$scope.AppFlow.AppNodes.push(item);
+			$scope.AppFlow.appNodes.push(item);
 		}
 		
 		$scope.deleteNode = function(index) {// 删除节点
-			$scope.AppFlow.AppNodes.splice(index, 1);
+			$scope.AppFlow.appNodes.splice(index, 1);
 		};
 		
 		$scope.saveNode = function() { // 保存
-			angular.forEach($scope.AppFlow.AppNodes, function(value, key) {
-				$scope.AppFlow.AppNodes[key].level = key;
+			angular.forEach($scope.AppFlow.appNodes, function(value, key) {
+				$scope.AppFlow.appNodes[key].level = key;
 			});
-			if($scope.AppFlow.AppNodes.length == 0) {
+			if($scope.AppFlow.appNodes.length == 0) {
 				toaster.pop('info', '提示', '您还未设置审批人');
 			} else {
 				$modalInstance.close($scope.AppFlow);
@@ -8937,6 +8955,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 	app.controller('DeputyOrderCtrl', ['$scope', 'toaster', 'getDeOrder', 'ngTableParams', 'BaseService', function($scope, toaster, getDeOrder, ngTableParams, BaseService) {
 		$scope.active = 'all';
 		$scope.currency = Symbol.currency;//将币别转化为对应的符号
+		$scope.total = null;
 		$scope.setActive = function(state) {
 			if($scope.active != state) {
 				$scope.active = state;
@@ -8962,6 +8981,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
+						$scope.total = page.totalElement;
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy(pageParams.keyword);//保存当前取值的关键词
 					}
@@ -8987,7 +9007,41 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				code: 'DC' + $filter('date')(new Date(), 'yyMMddHHmmss_sss'),
 				entrydate: new Date(),
 				status: '在录入',
+				goodspacking: '供应商原厂包装，如外包装完好视为货物完好',
+				pickupdate: '我方自向贵公司支付货款之日起3个自然日内提货完毕',
+				riskmethod: '甲方承担',
+				taxpaymentmethod: '甲方承担',
 					};
+		$scope.deOrder.deputyOrderItems = [];
+		var item = {
+				prodname: null,
+				prodcode: null,
+				prodspec: null,
+				amount: null,
+				unitprice: null,
+				remark: null,
+				orderprice: null,
+		};
+		$scope.deOrder.deputyOrderItems.push(item);
+		//增加商品
+		$scope.add = function(index) {
+			if($scope.deOrder.deputyOrderItems[index].prodcode == null) {
+				toaster.pop('info', '提示', '请先填写商品信息');
+			}else {
+				$scope.deOrder.deputyOrderItems.push(
+						{ 	prodname: null, 
+							prodcode: null, 
+							prodspec: null, 
+							amount: null, 
+							unitprice: null, 
+							remark: null,
+							orderprice: null});
+			}
+		};
+		//删除商品
+		$scope.del = function(index) {
+			$scope.deOrder.deputyOrderItems.splice(index, 1);
+		};
 		$scope.uplodaByBatch = function() {
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/purc/modal/uplodaByBatch.html',
@@ -8998,7 +9052,14 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			});
 			
 			modalInstance.result.then(function(data) {
-				$scope.deOrder.deputyOrderItems = data;
+				angular.forEach(data, function(data) {
+					$scope.deOrder.deputyOrderItems.push(data);
+					for(var i = 0; i < $scope.deOrder.deputyOrderItems.length; i++) {
+						if($scope.deOrder.deputyOrderItems[i].prodname == null) { // 如果没有填写就删除这行数据
+							$scope.deOrder.deputyOrderItems.splice(i, 1);
+						}
+					}
+				})
 				$scope.deOrder.totalamount = 0;
 				angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
 					$scope.deOrder.totalamount += item.amount * item.unitprice;
@@ -9010,8 +9071,8 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		
 		$scope.save = function() {
 			DeputyOrder.saveDeOrder({deOrder: $scope.deOrder}, {}, function(data) {
-				if(data.success) {
-					toaster.pop('success', '提示', '保存成功');
+				if(data.id) {
+					window.location.hash = "#/purc/deputy/"+data.id;
 				}
 				if(data.error) {
 					toaster.pop('error', '提示', '保存失败');

src/main/webapp/resources/tpl/index/approvalFlow/step1.html

@@ -21,23 +21,31 @@
             <span class="sp02"><input type="radio" name="radio01">分条件设置审批人<a href="#">设置审批条件</a></span>
         </div>
         <div class="box01_02" ng-if="node==null">
-        	<span ng-if="AppFlow.AppNodes.length==0">
+        	<span ng-if="AppFlow.appNodes.length==0">
         		<a href="#" class="btn btn-set"><img src="resources/img/approvalFlow/add_user.png" alt=""></a>
             	<em>增加审批人</em>
             </span>
-            <span ng-class="{'active': !$first}" ng-if="AppFlow.AppNodes.length!=0" ng-repeat="flow in AppFlow.AppNodes">
+            <span ng-class="{'active': !$first}" ng-if="AppFlow.appNodes.length!=0" ng-repeat="flow in AppFlow.appNodes">
         		<a href="#"><img src="resources/img/approvalFlow/add_user01.png" alt=""></a>
             	<em><span ng-bind="flow.username ? flow.username : flow.role"></span></em>
             </span>
+             <div id="caozuo">
+                <a ng-click="paste()">粘贴</a>
+                <a ng-click="clear()" class="over">清空</a>
+           	 </div>
         </div>
         <div class="box01_02" ng-if="node!=null">
-            <span ng-class="{'active': !$first}" ng-repeat="flow in node.flowNodes">
+            <span ng-class="{'active': !$first}" ng-repeat="flow in node.appNodes">
         		<a href="#"><img src="resources/img/approvalFlow/add_user01.png" alt=""></a>
-            	<em><span ng-bind="flow.emname ? flow.emname : flow.position"></span></em>
+            	<em><span ng-bind="flow.username ? flow.username : flow.role"></span></em>
             </span>
+             <div id="caozuo">
+            	<a class="btn-set">设置</a>
+                <a ng-click="copy()">拷贝</a>
+           	 </div>
         </div>
         <div class="box01_03">
-        	<a class="btn01" ng-click="saveNode()">保存</a><a class="btn02" ng-click="cancel()">取消</a>
+        	<a class="btn01" ng-click="saveNode()" disabled="disabled">保存</a><a class="btn02" ng-click="cancel()">取消</a>
         </div>
     </div>
 </div>
@@ -50,11 +58,11 @@
                 <h4>{{appName}}-已选审批节点</h4>
                 <div class="box_list">
                     <dl >
-                        <dd ng-repeat="flow in AppFlow.AppNodes" class="caozuo01"  ng-click="deleteNode($index)">
+                        <dd ng-repeat="flow in AppFlow.appNodes" class="caozuo01"  ng-click="deleteNode($index)">
                             <a href="#" ng-bind="flow.username ? flow.username : flow.position" ng-class="{'jiantou': !$first}"></a>
                         </dd>
                     </dl>
-                    <h5 ng-if="AppFlow.AppNodes.length==0">请从右侧选择审批节点</h5>
+                    <h5 ng-if="AppFlow.appNodes.length==0">请从右侧选择审批节点</h5>
                 </div>
                 <a href="#" class="dot02" ></a>
             </div>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -408,7 +408,7 @@
 						<th width="160px">编号</th>
 						<th width="160px">名称</th>
 						<th>规格</th>
-						<th width="80px">单位11->{{prodSet}}</th>
+						<th width="80px">单位</th>
 						<th width="50px">选择</th>
 					</tr>
 				</thead>

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -1,245 +1,204 @@
 <style>
-.condition .more.open {
-	margin-top: 10px;
-	height: 36px;
-	opacity: 1;
-}
-
-.condition .more .form-group {
-	margin-bottom: 10px;
-}
-
-.order-table .header>th {
-	height: 38px;
-	text-align: center;
-	background: #f5f5f5;
-	border-top: 1px solid #e8e8e8;
-	border-bottom: 1px solid #e8e8e8;
-}
-
-.order-table .sep-row {
-	height: 10px;
-}
-
-.order-table .selector {
-	vertical-align: middle;
-	margin: 0 0 2px 0;
-}
-
-.toolbar label {
-	margin-right: 10px;
-	margin-bottom: 0;
-}
-
-.toolbar .select_all {
-	margin: 0 6px 0 10px;
-	line-height: 20px;
-}
-
-.toolbar .btn {
-	-moz-border-radius: 2px;
-	margin-right: 5px;
-	border: 1px solid #dcdcdc;
-	border-radius: 2px;
-	-webkit-border-radius: 2px;
-}
-
-.order-table .order-hd {
-	background: #f5f5f5;
-	height: 40px;
-	line-height: 40px;
-}
-
-.order-table .order-hd td.first {
-	padding-left: 20px;
-}
-
-.order-table .order-hd .order-main span {
-	margin-right: 8px;
-}
-
-.order-table .order-hd .order-code {
-	font-style: normal;
-	font-family: verdana;
-}
-
-.order-table .order-hd .order-sum {
-	padding: 0 5px;
-}
-
-.order-table>tbody {
-	border: 1px solid transparent;
-}
-
-.order-table>tbody:hover {
-	border-color: #56a022;
-	border-width: 2px;
-}
-
-.order-table .operates {
-	display: none;
-}
-
-.order-table .operates i {
-	padding: 0 2px;
-}
-
-.order-table>tbody:hover .operates {
-	display: block;
-}
-.order-table>tbody:hover .operates-status {
-	display: none;
-}
-
-
-.order-table .order-bd {
-	border-bottom: 1px solid #e6e6e6;
-}
-
-.order-table .order-bd>td {
-	padding: 10px 5px;
-	vertical-align: top;
-	position: relative;
-}
-
-.order-table .order-bd .product {
-	padding-left: 20px;
-}
-
-.order-table .order-bd .order-number {
-	position: absolute;
-	top: -1px;
-	left: -1px;
-	width: 20px;
-	height: 20px;
-	line-height: 20px;
-	text-align: center;
-	background: #f5f5f5;
-	font-weight: 500;
-	border: solid 1px #d5d5d5;
-	border-radius: 0 0 10px 0;
-}
-
-.order-table .order-bd .order-number.key {
-	background: #56a022;
-	color: #ffffff;
-}
-
-.unPrinted {
-	color: #56a022;
-}
-
-.info-container .info:hover {
-	color: #CC3333;
-}
-
-#newOrder button{
-	border-radius: 0px;
-	width: 106px;
-	height: 42px;
-	color: #327ebe;
-}
-
-#search input{
-	border-radius: 0px;
-	width: 262px;
-	height: 38px;
-	border: #3578ba 1px solid;
-}
-#search .btn {
-	border-radius: 0px;
-	width: 87px;
-	height: 38px;
-	background-color: #3578ba;
-	color: #fff;
-}
+    /* 顶部搜索框 */
+    .top-nav {
+        margin-bottom: 10px;
+    }
+    .top-nav #search_input {
+        height: 36px;
+        font-size: 16px;
+        font-family: '微软雅黑';
+        border: 1px solid #327EBE;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        text-align: center;
+    }
+
+    .top-nav #search_btn {
+        height: 36px;
+        padding-top: 0;
+        padding-bottom: 0;
+        font-size: 16px;
+        background: #327EBE;
+        border: 1px solid #327EBE;
+        color: #fff;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+    }
+
+    /* 主内容区 */
+    .main-content {
+        font-size: 14px;
+    }
+
+    /* 选项菜单 招标单按钮*/
+    .div-menu .text-num {
+        color: rgb(211,37,38);
+        padding: 0 5px;
+    }
+
+    .btn-tender {
+        border-radius: 0;
+        width: 100%;
+        height: 40px;
+        font-size: 14px;
+    }
+
+    /* 选项按钮 */
+    /* 当前激活 */
+    .div-menu .menu-status .btn-selected {
+        background-color: #fff;
+        color: #D32526;
+        border: none;
+        border-bottom: 2px solid #D32526;
+        border-radius: 0;
+
+    }
+
+    .div-menu .menu-status .btn-selected:hover {
+        background-color: #f5f5f5;
+    }
+
+    .div-menu .btn-select {
+        background-color: #fff;
+        color: #000000;
+        border: none;
+        border-radius: 0;
+        height: 40px;
+        font-weight: 600;
+        font-family: "Microsoft Yahei Regular";
+        padding: 0 20px 0 20px;
+        border-bottom: 2px solid #fff;
+    }
+
+    .div-menu {
+        border-bottom: 16px solid #f5f5f5;
+        height: 56px;
+    }
+
+    .div-menu .btn-select:hover {
+         border-bottom: 2px solid #D32526;
+    }
+    .div-menu .btn-select:focus {
+        border-bottom: 2px solid #D32526;
+    }
+    .div-menu .btn-select:first-child {
+        margin-left: 10px;
+     }
+
+    .div-menu>div:first-child .btn {
+        font-size: 16px;
+    }
+
+    /* 列表内容 */
+    .tender-table {
+        text-align: center;
+    }
+    .tender-table .header {
+        height: 50px;
+        background-color: #fff;
+        color: rgb(50,50,50);
+        font-family: "Microsoft Yahei Regular";
+        border-bottom: 1px solid #e8e8e8;
+    }
+    .tender-table .header>th {
+        text-align: center;
+    }
+    .tender-table>tbody {
+        font-family: "Microsoft Yahei Regular";
+        font-size: 14px;
+        color: #323232;
+        border: 1px solid transparent;
+    }
+    .tender-table>tbody>tr:nth-child(odd) {
+        height: 100px;
+    }
+    .tender-table tbody>tr:nth-child(odd):hover {
+        border: 2px solid #D32526;
+
+    }
+    .tender-table tbody tr td a {
+        font-family: "Microsoft Yahei Regular";
+        color: #327ebe;
+    }
+	.tender-table tbody>tr{
+		border-bottom: 1px solid #e8e8e8;
+	}
 </style>
-<div class="block">
-<div class="loading in" ng-class="{'in': loading}">
-	<i></i>
+<div>
+    <!-- 顶部导航及搜索框 -->
+    <div class="top-nav">
+        <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
+            <span style="font-family: 'Microsoft Yahei Regular'; font-weight: 600; color: rgb(0,0,0);">服务>采购模块></span><span style="color: #327EBE;">代采订单</span>
+        </div>
+        <div class="input-group search-group col-xs-4">
+            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入订单号、公司名、姓名查询" />
+            <span class="input-group-btn">
+            <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
+        </span>
+        </div>
+    </div>
+    <div class="block main-content">
+        <div class="loading in" ng-class="{'in': loading}">
+        <i></i>
+        </div>
+        <!-- 选项菜单和新增按钮 -->
+        <div class="block">
+            <div class="row div-menu">
+                <div class="col-xs-8" style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
+                    <div class="btn-group menu-status">
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-select"
+                                    ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部</button>
+                        </div>
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-select"
+                                    ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待审核</button>
+                        </div>
+                    </div>
+                    <div class="col-xs-1 pull-right" style="padding-top: 5px;">
+            		            共<span class="text-num">{{total}}</span>
+                    </div>
+                </div>
+                <div class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
+                    <a ui-sref="purc.newdeputy" type="button" title="新增代采订单" class="btn btn-tender">
+                        <img src="resources/img/deputyOrder/caigou.png">
+                        <span class="f16" style="color: #327EBE;">代采订单</span>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <table class="tender-table block" ng-table="tableParams">
+            <thead>
+                <tr class="header">
+                    <th width="313">订单信息</th>
+                    <th width="237">我方付款信息</th>
+                    <th width="237">终端供应商付款信息</th>
+                    <th width="143">业务状态</th>
+                </tr>
+            </thead>
+			<tbody ng-if="tableParams.total() == 0">
+			</tbody>
+			<tbody ng-repeat="order in $data">
+                <tr>
+                	<td >
+                		<div>流水号：<a ng-bind="order.code" ui-sref="purc.deputydetail({id:order.id})"></a></div>
+                		<div>下单日期：<span ng-bind="order.entrydate| date: 'yyyy-MM-dd'"></span></div>
+                		<div>终端供应商：<span ng-bind="order.tervendor"></span></div>
+                		<div>订单金额:<span ng-bind="order.totalamount"></span></div>
+                	</td>
+                	<td>
+                		<div>最新付款日期：<span ng-bind="order.paydate| date: 'yyyy-MM-dd'"></span></div>
+                		<div>累计付款金额：<span ng-bind="order.totalamount"></span></div>
+                	</td>
+                	<td>
+                		<div>最新付款日期：<span ng-bind="order.deliverydate| date: 'yyyy-MM-dd'"></span></div>
+                		<div>累计付款金额：<span ng-bind="order.usdpayment"></span></div>
+                	</td>
+                	<td>
+                		<img alt="" src="resources/img/deputyOrder/pay_ok.png">
+                	</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 </div>
-<div class="condition block">
-		<div class="row">
-			<div class="col-xs-7"></div>
-			<div class="search" id="search">
-				<div class="input-group">
-					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入订单号，联系人、企业搜索" />
-					<a class="btn input-group-addon" ng-click="search(keyword)">搜索</a>
-				</div>
-			</div>
-			<div class="col-xs-5">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待回复</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-5"></div>
-			<div class="col-xs-2">
-				<div class="btn-group btn-group-sm" id="newOrder">
-					<button type="button" class="btn btn-default btn-line" ui-sref="purc.newdeputy"><img alt="" src="resources/img/deputyOrder/caigou.png"> 代采订单</button>
-				</div>
-			</div>
-		</div>
-	</div>
-<table class="order-table block" ng-table="tableParams">
-	<thead>
-		<tr class="header">
-			<th width="313">订单信息</th>
-			<th width="237">我方付款信息</th>
-			<th width="237">终端供应商付款信息</th>
-			<th width="132">业务状态</th>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="5"></td>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
-		</tr>
-	</thead>
-	<tbody ng-repeat="order in $data track by order.id">
-		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first">
-				<div class="order-main">
-						<span>订单号：<a
-						class="text-num" ng-bind="::order.code" ui-sref="purc.deputydetail({id:order.id})" target="_self"></a></span>
-				</div>
-				<div>
-				下单日期：<span class="text-num text-bold"
-						ng-bind="::order.entrydate | date:'yyyy-MM-dd'"></span>
-				</div>
-				<div>
-				终端供应商：<span ng-bind="::order.tervendor"></span>
-				</div>
-				<div>
-				订单金额： <span class="text-num" ng-bind="::order.totalamount"></span>
-				</div>
-			</td>
-			<td >
-				<div>
-					最新付款日期：<span ng-bind="::order.paydate| date:'yyyy-MM-dd'"></span>
-				</div>
-				<div>
-					累计付款金额：<span ng-bind="::order.usdpayment"></span>(USD)
-				</div>
-			</td>
-			<td >
-				<div>
-					最新付款日期:<span ng-bind=""></span>
-				</div>
-				<div>
-					累计付款金额：<span ng-bind=""></span>(USD)
-				</div>
-			</td>
-			<td >
-				<img alt="" src="resources/img/deputyOrder/pay_ok.png">
-			</td>
-		</tr>
-	</tbody>
-</table>
-</div>

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -184,7 +184,7 @@ width:135px;
                         </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细</span> </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为USD)</span> </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -194,6 +194,7 @@ width:135px;
                             <span>产品规格</span>
                             <span>数量</span>
                             <span>单价</span>
+                            <span>订单单价</span>
                             <span>采购总额</span>
                             <span>备注</span>
                         </dt>
@@ -204,17 +205,11 @@ width:135px;
                             <span>{{item.prodspec}}</span>
                             <span>{{item.amount}}</span>
                             <span>{{item.unitprice}}</span>
+                            <span>{{item.unitprice}}</span>
                             <span>{{item.unitprice * item.amount}}</span>
                             <span>{{item.remark}}</span>
                         </dd>
                     </dl>
-                    <div class="page fl">
-                        <ul>
-                            <li><a href="#">上一页</a> </li>
-                            <li>第<input type="text" placeholder="3">页&nbsp;共6页</li>
-                            <li><a href="#">下一页</a> </li>
-                        </ul>
-                    </div>
                 </div>
                 <!--采购订单-->
                 <div class="com_title01"><span>采购订单</span></div>
@@ -223,7 +218,7 @@ width:135px;
                         <li>
                             <div class="fl">
                                 <em>总价款：</em>
-                                <span >￥{{deOrder.totalamount}}</span>
+                                <span >${{deOrder.totalamount}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款提货时间：</em>
@@ -235,7 +230,7 @@ width:135px;
                         <li>
                             <div class="fl">
                                 <em>我方付款金额：</em>
-                                <span>￥{{deOrder.totalpayament}}</span>
+                                <span>${{deOrder.totalpayament}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期：</em>

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -95,6 +95,18 @@ width:135px;
 .purchase_form01 ul li .dropdown-menu span i{
 	color: white;
 }
+
+.purchase_xq dd input{
+ 	border: none;
+	border-bottom: 1px solid #333;
+	height: 35px;
+	width: 80px;
+	font-size: 14px;
+}
+
+.purchase_xq dd input:focus {
+	border-bottom: 1px solid blue;
+}
 </style>
 <div class="warp">
     <div class=" purchase">
@@ -123,7 +135,7 @@ width:135px;
                             </div>
                             <div class="fr">
                                 <em>业务状态：</em>
-                                <span><input type="text" class="input01" ng-model="deOrder.prostatus"></span>
+                                <span ng-bind="deOrder.prostatus"></span>
                             </div>
                         </li>
                         <li>
@@ -135,7 +147,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.madealdate.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.madealdate.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$madealdate')">
@@ -173,7 +185,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$shipdate')">
@@ -191,7 +203,7 @@ width:135px;
                             <div class="fr">
                                 <em>供应商交货方式：</em>
                                 <span>
-                                    <select class="select" ng-model="deOrder.deliverymethod">
+                                    <select class="select" ng-model="deOrder.deliverymethod" ng-init="deOrder.deliverymethod = '1'">
                                         <option value="1">交货方式01</option>
                                         <option value="2">交货方式02</option>
                                         <option value="3">交货方式03</option>
@@ -203,27 +215,33 @@ width:135px;
                             <div class="fl">
                                 <em>我方提货方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.pickupmethod">
-                                        <option value="1">交货方式01</option>
-                                        <option value="2">交货方式02</option>
-                                        <option value="3">交货方式03</option>
+                                    <select name="" class="select" ng-model="deOrder.pickupmethod" ng-init="deOrder.pickupmethod = '自提'">
+                                        <option value="自提">自提</option>
+                                        <option value="委托第三方提货">委托第三方提货</option>
+                                        <option value="贵公司送货">贵公司送货</option>
+                                        <option value="其他">其他</option>
                                     </select>
                                 </span>
                             </div>
                             <div class="fr">
                                 <em>我方付款方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymentmethod">
-                                        <option value="1">月结30天</option>
-                                        <option value="2">交货方式02</option>
-                                        <option value="3">交货方式03</option>
+                                    <select name="" class="select" ng-model="deOrder.paymentmethod" ng-init="deOrder.paymentmethod = 'T'">
+                                        <option value="T">T</option>
+                                        <option value="T支付">T支付</option>
                                     </select>
                                 </span>
                             </div>
                         </li>
+                        <li>
+                         	<div class="fr">
+                                <em>我方提货时间：</em>
+                               <span><input type="text" class="input01" ng-model="deOrder.pickupdate"></span>
+                            </div>
+                        </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细</span><a ng-click="uplodaByBatch()">批量导入</a> </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为USD)</span><a ng-click="uplodaByBatch()">批量导入</a>  </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -233,27 +251,31 @@ width:135px;
                             <span>产品规格</span>
                             <span>数量</span>
                             <span>单价</span>
+                            <span>订单单价</span>
                             <span>采购总额</span>
                             <span>备注</span>
+                            <span>操作</span>
                         </dt>
                         <dd ng-repeat="item in deOrder.deputyOrderItems">
                             <span class="wid01">{{$index+1}}</span>
-                            <span>{{item.prodname}}</span>
-                            <span>{{item.prodcode}}</span>
-                            <span>{{item.prodspec}}</span>
-                            <span>{{item.amount}}</span>
-                            <span>{{item.unitprice}}</span>
-                            <span>{{item.unitprice * item.amount}}</span>
-                            <span>{{item.remark}}</span>
+                            <span><input type="text" class="text-center" ng-model="item.prodname"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodcode"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodspec"></span>
+                            <span><input type="text" class="text-center" ng-model="item.amount"></span>
+                            <span><input type="text" class="text-center" ng-model="item.unitprice"></span>
+                            <span></span>
+                            <span>{{item.unitprice * item.amount | number: 2}}</span>
+                            <span><input type="text" class="text-center" ng-model="item.remark"></span>
+                            <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>
                         </dd>
                     </dl>
-                    <div class="page fl">
+                 <!--    <div class="page fl">
                         <ul>
                             <li><a href="#">上一页</a> </li>
                             <li>第<input type="text" placeholder="3">页&nbsp;共6页</li>
                             <li><a href="#">下一页</a> </li>
                         </ul>
-                    </div>
+                    </div> -->
                 </div>
                 <!--采购订单-->
                 <div class="com_title01"><span>采购订单</span></div>
@@ -262,9 +284,15 @@ width:135px;
                         <li>
                             <div class="fl">
                                 <em>总价款：</em>
-                                <span >￥{{deOrder.totalamount}}</span>
+                                <span >${{deOrder.totalamount}}</span>
                             </div>
                             <div class="fr">
+                            	 <em>订单总价款：</em>
+                                <span >${{deOrder.orderamount}}</span>
+                            </div>
+                        </li>
+                        <li>
+                        	<div class="fl">
                                 <em>我方付款提货时间：</em>
                                  <div class="input-group">
 									<input ng-model="deOrder.paydeldate" type="text" class="form-control" 
@@ -272,7 +300,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$paydeldate')">
@@ -285,7 +313,7 @@ width:135px;
                         <li>
                             <div class="fl">
                                 <em>我方付款金额：</em>
-                                <span ng-bind="deOrder.totalpayament">￥2356.23</span>
+                                <span >${{deOrder.totalpayament}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期：</em>
@@ -329,7 +357,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$requirepaydate')">
@@ -387,23 +415,23 @@ width:135px;
                     <ul>
                         <li>
                             <div class="fl">
-                                <em>我方法定代表人： </em>
+                                <em>供应商方法定代表人： </em>
                                 <span><input type="text" class="input01" ng-model="deOrder.legalrepresent"></span>
                             </div>
                             <div class="fr">
-                                <em>我方电话：</em>
+                                <em>供应商方电话：</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.usertel"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl wid100">
-                                <em>我方地址：</em>
+                                <em>供应商方地址：</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.enaddress"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>我方传真： </em>
+                                <em>供应商方传真： </em>
                                 <span><input type="text" class="input01" ng-model="deOrder.enfax"></span>
                             </div>
                             <div class="fr">
@@ -415,7 +443,7 @@ width:135px;
                             <div class="fl">
                                 <em>货款支付方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymethod">
+                                    <select name="" class="select" ng-model="deOrder.paymethod" ng-init="deOrder.paymethod = '1'">
                                         <option value="1">月结30天</option>
                                         <option value="2">交货方式02</option>
                                         <option value="3">交货方式03</option>
@@ -430,7 +458,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$paydate')">
@@ -449,7 +477,7 @@ width:135px;
 										min-date="getMinDate()" ng-required="true"
 										current-text="今天" clear-text="清除" close-text="关闭"
 										datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-										ng-focus="openDatePicker($event, deOrder.$dateOpen)">
+										ng-focus="openDatePicker($event, deOrder.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
 											ng-click="openDatePicker($event, deOrder, '$deliverydate')">