Browse Source

修改app.js,之前有冲突

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7317 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 9 years ago
parent
commit
f8befe2f09

+ 0 - 4
src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -91,7 +91,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
 
     @Override
     public ModelMap addTenderAttaches(PurchaseTender purchaseTender, FileUpload uploadItem) {
-        System.out.println("enter addtenderattachs impl");
         ModelMap map = new ModelMap();
         Set<Attach> attaches = new HashSet<>();
         if (uploadItem.getFile() != null) {// 附件存在
@@ -114,7 +113,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
             map.put("id", tender.getId());
             map.put("success", "招标附件上传成功");
         }
-        System.out.println("return addtenderattachs impl" + JSON.toJSONString(map));
         return map;
     }
 
@@ -138,7 +136,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         for (PurchaseTenderItem tenderItem: tenderItems) {
             if (tenderItem.getEnterpriseBaseInfo().getUu().intValue() == SystemSession.getUser().getEnterprise().getUu().intValue()) {
                 purchaseTenderItem = purchaseTenderItemDao.findOne(tenderItem.getId());
-                System.out.println("找到了匹配的项");
             }
         }
         purchaseTenderItem.setBidAttaches(attaches);
@@ -148,7 +145,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         purchaseTenderItem = purchaseTenderItemDao.save(purchaseTenderItem);
         map.put("id", purchaseTenderItem.getId());
         map.put("success", "投标附件上传成功");
-        System.out.println("return addtenderItemattachs impl" + JSON.toJSONString(map));
         return map;
     }
 

+ 2 - 2
src/main/webapp/WEB-INF/views/normal/index.html

@@ -70,7 +70,7 @@
 								</div>
 								<div class="col-xs-10">
 									<ul class="nav nav-pills" >
-										<li><a href="" title="采购招标">采购招标</a></li>
+										<li><a href="#/purc/tender" title="采购招标">采购招标</a></li>
 										<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
 										<li><a href="" title="采购询价">采购询价</a></li>
 									</ul>
@@ -110,7 +110,7 @@
 				</ul>
 				<div id="home-headerBtns">
 					<i class="fa fa-mobile-phone fa-lg"></i>
-					<i class="fa fa-comments-o fa-lg"></i>
+					<a href=""><i class="fa fa-comments-o fa-lg"></i></a>
 					<a href="#/approvalFlow"><i class="fa fa-cog fa-lg"></i></a>
 					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
 				</div>

+ 2 - 2
src/main/webapp/resources/js/index/app.js

@@ -538,7 +538,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					templateUrl: "static/tpl/index/search/search_result.html",
 					controller: 'TopSearchCtrl'
 				}
-			},
+			}
 		}).state('approvalflow', { //审批流
 			url: "/approvalFlow",
 			views : {
@@ -549,7 +549,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					templateUrl: "static/tpl/index/approvalFlow/home.html",
 					controller: 'approvalFlowCtrl'
 				}
-			},
+			}
 		});
         $urlRouterProvider.otherwise('/index');
 	}]);

+ 188 - 0
src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -0,0 +1,188 @@
+<style>
+    .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>tbody:hover .operates {
+        display: block;
+    }
+
+    .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;
+    }
+
+    .input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
+    {
+        height: 26px;
+        padding: 0 5px;
+        font-size: 12px;
+        line-height: 1.5;
+        border-radius: 3px;
+    }
+
+    .input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+    }
+
+    .modal-dialog {
+        margin-top: 110px;
+    }
+
+    .file {
+        color: #336699;
+        text-decoration: underline;
+    }
+
+</style>
+<div class="block">
+    <div class="loading in" ng-class="{'in': loading}">
+        <i></i>
+    </div>
+    <div class="condition block">
+        <div class="row">
+            <div class="col-xs-10">
+                <div class="search">
+                    <div class="form-group form-group-sm has-feedback">
+                        <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称、认定单号、送样单号或认定结果搜索" /><span
+                            class="form-control-feedback text-simple"><i
+                            class="fa fa-search"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-2">
+                <div class="text-default f14 total">
+                    共 <span ng-bind="tableParams.total()" class="text-num"></span>
+                </div>
+            </div>
+        </div>
+        <table class="order-table block " ng-table="tableParams">
+            <thead>
+            <tr class="header">
+                <th width="120">物料名称</th>
+                <th width="120">物料编码</th>
+                <th width="240">物料规格</th>
+                <th width="140">品牌</th>
+                <th width="70">标准料号</th>
+                <th width="120">原厂型号</th>
+                <th width="70">单位</th>
+                <th width ="100">操作</th>
+            </tr>
+            <tr class="sep-row">
+                <td colspan="5"></td>
+            </tr>
+            <tr class="toolbar toolbar-top">
+                <td colspan="6">
+                </td>
+                <td class="text-center">
+                    <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+                </td>
+                <td colspan="1" class="text-center">
+                    <a ui-sref="baseInfo.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
+                </td>
+            </tr>
+            <tr class="sep-row">
+                <td colspan="5"></td>
+            </tr>
+            </thead>
+            <tbody ng-repeat="product in $data">
+            <tr class="order-hd">
+                <td class="first text-center" width="120">
+                    <div class="order-main">
+                        <a ng-bind="::product.title" ui-sref="baseInfo.productDetail({id:product.id})" target="_self"></a>
+                    </div>
+                </td>
+                <td width="120" class="text-center"><span title="{{product.code}}" ng-bind="::product.code"></span></td>
+                <td width="240" class="order-sum text-center">
+                    <span title="{{product.spec}}" ng-bind="::product.spec"></span>
+                </td>
+                <td width="140" class="text-center">
+                    <span title="{{product.brand}}" ng-bind="::product.brand"></span>
+                </td>
+                <td width="70" class="text-center"><span title="标准料号" ng-bind="::product.cmpUuId"></span></td>
+                <td width="120" class="text-center"><span title="原厂型号" ng-bind="::product.cmpCode"></span></td>
+                <td width="70" class="text-center"><span title="单位" ng-bind="::product.unit"></span></td>
+                <td width="100" class="text-center"><a ui-sref="baseInfo.productDetail({id:product.id})" target="_self"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"><i class="fa fa-lg fa-trash"></i></a></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+

+ 16 - 15
src/main/webapp/resources/tpl/index/home/left.html

@@ -64,36 +64,37 @@
 			</ul>
 		</div>
 	</div>
-	<div class="pane service">
+	<div class="pane service" ng-controller="TenderCtrl">
 		<div class="pane-header">
-			<i class="fa fa-legal"></i> 认证供应商招标<a href="serve" class="pull-right text-muted"></a>(3)
+			<i class="fa fa-legal"></i> 认证供应商招标<a href="serve" class="pull-right text-muted"></a>
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
-				<li >华商龙最新招标信息</li>
-				<li >华商龙最新招标信息</li>
-				<li >华商龙最新招标信息</li>
+				<li ng-repeat="tender in tenders">
+					<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
+				</li>
 			</ul>
 		</div>
 	</div>
-	<div class="pane service">
+	<div class="pane service" ng-controller="TenderCtrl">
 		<div class="pane-header">
-			<i class="fa fa-legal"></i> 公开招标<a class="pull-right text-muted"></a>(3)
+			<i class="fa fa-legal"></i> 公开招标<a class="pull-right text-muted"></a>
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
-				<li >华商龙最新招标信息</li>
-				<li >华商龙最新招标信息</li>
-				<li >华商龙最新招标信息</li>
+				<li ng-repeat="tender in openTenders">
+					<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
+				</li>
 			</ul>
 		</div>
 	</div>
 	</div>
 </div>
 <!-- 常用操作 End -->
-<div class="pane tender" ng-controller="TenderCtrl">
+<!--
+<div class="pane service" ng-controller="TenderCtrl">
 	<div class="pane-header">
-		客户指定招标:
+		<i class="fa fa-legal"></i> 客户指定招标:
 	</div>
 	<div class="pane-body">
 		<ul class="list-unstyled detail">
@@ -103,9 +104,9 @@
 		</ul>
 	</div>
 </div>
-<div class="pane tender" ng-controller="TenderCtrl">
+<div class="pane service" ng-controller="TenderCtrl">
 	<div class="pane-header">
-		平台公开招标:
+		<i class="fa fa-legal"></i> 平台公开招标:
 	</div>
 	<div class="pane-body">
 		<ul class="list-unstyled detail">
@@ -114,4 +115,4 @@
 			</li>
 		</ul>
 	</div>
-</div>
+</div>-->