Forráskód Böngészése

公共询价添加、客户询价去掉一行字段、客户资料分页处理。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8055 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 éve
szülő
commit
935d2fb209

BIN
src/main/webapp/resources/img/icon/inquiry.png


+ 5 - 9
src/main/webapp/resources/js/index/app.js

@@ -1480,11 +1480,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					if(changed) {
 						if(checked)
 							$scope.newUser.roles = checked;
-						else 
+						else
 							loadUsers();
 					}
 				});
-				
+
 			} else {
 				toaster.pop('error', '您不是管理员,无权限分配用户!');
 			}
@@ -1497,10 +1497,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			}
 		}
 		$scope.customerParams = new ngTableParams({
-			page : 1, 
+			page : 1,
 			count : 10
 		}, {
-			total : 0, 
+			total : 0,
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
@@ -11047,7 +11047,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             date: new Date(),
             unit: 'PCS',
             currency: 'RMB',
-            ifOpen: 1,
+            ifOpen: 0,
             ifTax: 1,
             invoiceType: 2,
             tenderAttachs:[{}]
@@ -11423,8 +11423,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             // minDate = minDate.setDate(minDate.getDate() + 1);
             if ($scope.tender.endDate instanceof Date) {
                 var minDate = new Date($scope.tender.endDate.getTime() + 24*60*60*1000 + 1); // 不能选相同一天
-            } else {
-                var minDate = new Date($scope.tender.endDate + 24*60*60*1000 + 1); // 不能选相同一天
             }
             return $scope.tender.endDate ? $filter('date')(minDate, 'yyyy-MM-dd'):$filter('date')(new Date(), 'yyyy-MM-dd');
         };
@@ -11434,8 +11432,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             // maxDate = maxDate.setDate(maxDate.getDate() - 1);
             if ($scope.tender.publishDate instanceof Date) {
                 var maxDate = new Date($scope.tender.publishDate.getTime() - 1); // 不能选同一天
-            } else {
-                var maxDate = new Date($scope.tender.publishDate - 1); // 不能选同一天
             }
             return $scope.tender.publishDate ? $filter('date')(maxDate, 'yyyy-MM-dd'):"";
         };

+ 0 - 37
src/main/webapp/resources/tpl/index/sale/customer.html

@@ -142,43 +142,6 @@
 					</tr>
 			</tbody>
 		</table>
-		<div ng-show="userInfoResult" style="padding-bottom: 20px; border-top:15px #f5f5f5 solid ;">
-			<div class="pane-header">
-				客户分配用户资料 (共<span ng-bind="custInfos.length || 0"></span>个)<span class="f16" style="margin-left: 120px;"ng-bind="custInfo.myEnterprise.enName"></span>
-			</div>
-				<table class="table table-hover" style="border-bottom:#e8e8e8 1px solid;">
-					<thead>
-						<tr class="header">
-							<th class="text-center" width="90">用户UU</th>
-							<th class="text-center" width="180">用户名称</th>
-							<th class="text-center" width="200">邮箱</th>
-							<th class="text-center" width="100">联系人电话</th>
-							<th class="text-center" width="50">操作</th>
-						</tr>
-					</thead>
-					<tbody ng-repeat="userinfo in userdata.content">
-						<tr>
-							<td class="text-center" ng-bind="::userinfo.userUU"></td>
-							<td class="text-center" ng-bind="::userinfo.user.userName"></td>
-							<td class="text-center" ng-bind="::userinfo.user.userEmail"></td>
-							<td class="text-center" ng-bind="::userinfo.user.userTel"></td>
-							<td class="text-center"><a style="color: red;" title="删除"><i class="fa fa-user-times fa-lg"></i></a></td>
-						</tr>
-					</tbody>
-				</table>
-				<div class="row mb-20" ng-show="userdata.content">
-					<div class="col-md-8 col-md-offset-1 col-sm-10 col-sm-offset-0 col-xs-12 col-xs-offset-0">
-						<a ng-disabled="userdata.first"
-							class="btn btn-default col-md-2 col-sm-3 col-xs-4"
-							ng-click="first()">上一页</a>
-						<div class="col-md-8 col-sm-6 col-xs-4 text-center f14"
-							style="line-height: 34px;">{{userdata.page}}/{{userdata.totalPage}}页</div>
-						<a ng-disabled="userdata.last"
-							class="btn btn-default col-md-2 col-sm-3 col-xs-4"
-							ng-click="last()">下一页</a>
-					</div>
-				</div>
-			</div>
 		</div>
 	</div>
 </div>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/customer_detail.html

@@ -100,7 +100,7 @@
                     <dd ng-if="userdata.content.length == 0">
                         <span style="width: 100%; color: #999;">当前客户还未分配人员!</span>
                     </dd>
-                    <dd>
+                    <dd ng-if="custInfos.length > 5">
                        <div class="col-md-8 col-md-offset-1 col-sm-10 col-sm-offset-0 col-xs-12 col-xs-offset-0" style="margin-top: 10px;">
 						<a ng-disabled="userdata.first"
 							class="btn btn-default col-md-2 col-sm-3 col-xs-4"

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -36,7 +36,7 @@
 				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
 			</div>
 		</div>
-		<div class="row row-sm item">
+		<!--<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">审核人:</span>
 				<div class="content" ng-bind="::inquiry.auditor"></div>
@@ -49,7 +49,7 @@
 				<span class="title">价格种类:</span>
 				<div class="content" ng-bind="::inquiry.priceType"></div>
 			</div>
-		</div>
+		</div>-->
 		<div class="row row-sm item">
 			<div class="col-xs-6">
 				<span class="title">备注:</span>

+ 233 - 0
src/main/webapp/resources/tpl/index/sale/inquiry_list.html

@@ -0,0 +1,233 @@
+<!--  公共询价  -->
+<link rel="stylesheet" href="static/css/add.css "/>
+<style>
+
+/*新增样式 2017-04-19*/
+#tender-list{
+    width: 1170px;
+    margin-left: -240px;
+}
+#tender-list .tender-label{
+    height: auto;
+}
+#tender-list #resultTop{
+    margin-top: -10px;
+    border-radius: 0px 20px 0px 0px;
+    box-shadow: 0 0 3px #ccc;
+    background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+    height: 40px;
+    font-size: 14px;
+    line-height: 40px;
+    padding: 0;
+}
+#tender-list #resultTop strong{
+    line-height: 40px;
+    font-weight: bold;
+    font-size: 14px;
+    padding-left: 15px;
+}
+.tender-list-content{
+    width: 100%;
+    background: #fff;
+    margin: 0 auto;
+}
+    .tender-list-content .filter{
+        margin-top: 20px;
+    }
+    .tender-list-content .filter span{
+        width: 50px;
+        float: left;
+        text-align: center;
+        display: inline-block;
+        font-size: 14px;
+        color: #000;
+        height: 40px;
+        line-height: 30px;
+        font-weight: 600;
+        margin-right: 20px;
+    }
+    .tender-list-content .filter div{
+        float: left;
+    }
+    .tender-list-content .filter div a{
+        padding: 1.5px 10px;
+        display: inline-block;
+        line-height: 30px;
+        font-size: 14px;
+        text-align: center;
+        float: left;
+        margin-right: 15px;
+    }
+    .tender-list-content .filter div a.active,.tender-list-content .filter div a:hover{
+        background: #5078cb;
+        color: #fff;
+    }
+    .tender-list-content .filter div.form-group{
+        position: relative;
+    }
+    .tender-list-content .filter div.form-group .input-group-addon{
+        position: absolute;
+        right: 0;
+        top: 0;
+        background: #5078cb;
+        color: #fff;
+        height: 35px;
+        width: 55px;
+        border: none;
+        font-size: 18px;
+        text-align: center;
+        line-height: 20px;
+    }
+    .tender-list-content .filter div.form-group .input-group-addon:hover{
+        background: #3a89d1;
+    }
+    .tender-list-content .filter div.form-group input{
+        border-radius: 0;
+        height: 35px;
+        line-height: 35px;
+        border: #5078cb 1px solid;
+    }
+    .tender-list-tab{
+        border-top: #dbe7ff 1px solid;
+    }
+.inquiry-table{
+    width: 100%;
+}
+.inquiry-table tr{
+    height: 60px;
+}
+.inquiry-table tbody tr td,.inquiry-table thead tr th{
+    border-bottom: #dbe7ff 1px dashed !important;
+    font-size: 14px;
+    vertical-align: middle;
+    border-top: none !important;
+    font-weight: inherit;
+    position: relative;
+    text-align: center;
+}
+.inquiry-table tbody tr td em{
+    padding: 1px 5px;
+    display: inline-block;
+    background: #eb676c;
+    font-size: 14px;
+    color: #fff;
+    text-align: center;
+    line-height: 23px;
+    margin-right: 10px;
+}
+.inquiry-table tbody tr td img{
+    margin-left: 20px;
+    margin-right: 8px;
+}
+.inquiry-table tbody tr td:first-child{
+    text-align: left;
+}
+.text-trans{
+    opacity: 1;
+    top: 12px;
+    right: 50px;
+ }
+.overdue{
+    color: #f47a86;
+    border: #f47a86 1px solid;
+    background: transparent;
+}
+</style>
+
+<div class="ng-scope">
+    <!--<form name="tenderForm">-->
+        <div class="purc-tender" id="tender-list" ng-controller="SaleOpenTenderCtrl">
+            <div class="tender-label list-unstyled">
+                <div class="condition block" id="resultTop">
+                    <strong>|&nbsp;&nbsp;&nbsp;公共招标</strong>
+                </div>
+                <div class="tender-list-content">
+                    <div class="container">
+                       <div class="filter row">
+                           <span>时间</span>
+                           <div>
+                               <a ng-click="changeDateZone(-1)" title="" ng-class="{'active':condition.dateZone=='-1'}">最新</a>
+                               <a ng-click="changeDateZone(7)" title="" ng-class="{'active':condition.dateZone=='7'}">一个星期内</a>
+                               <a ng-click="changeDateZone(1)" title="" ng-class="{'active':condition.dateZone=='1'}">一个月内</a>
+                               <a ng-click="changeDateZone(3)" title="" ng-class="{'active':condition.dateZone=='3'}">三个月内</a>
+                               <a ng-click="changeDateZone(6)" title="" ng-class="{'active':condition.dateZone=='6'}">半年内</a>
+                               <a ng-click="changeDateZone()" title="" ng-class="{'active':condition.dateZone== null}">一年内</a>
+                           </div>
+                       </div>
+                        <div class="filter row">
+                            <span>查询</span>
+                            <div class="form-group" style="width: 310px;">
+                                <input type="search" class="form-control" ng-model="keyword" ng-search="onSearch()" />
+                                <div class="input-group-addon">
+                                    <i class="fa fa-search" ng-click="onSearch()"></i>
+                                </div>
+                            </div>
+                            <div style="padding-left: 50px; font-size: 14px; line-height: 35px;">
+                            	    共{{tableParams.total()}}条
+                            </div>
+                        </div>
+                        <div class="tender-list-tab">
+                           <table class="table inquiry-table">
+                               <thead>
+                                    <tr>
+                                        <th>企业名称</th>
+                                        <th width="200">产品型号</th>
+                                        <th width="200">报价截止日期</th>
+                                        <th width="200">发布日期</th>
+                                        <th width="60"></th>
+                                    </tr>
+                               </thead>
+                               <tbody>
+                                    <tr>
+                                        <td><img src="resources/img/icon/inquiry.png" /><em>询价信息</em><a href="#">深圳市优软科技有限公司询价信息</a></td>
+                                        <td>ALGAKGAG</td>
+                                        <td>2017-04-27</td>
+                                        <td>2017-04-30</td>
+                                        <td><span class="text-trans overdue">已过期</span></td>
+                                    </tr>
+                                    <tr>
+                                        <td><img src="resources/img/icon/inquiry.png" /><em>询价信息</em><a href="#">深圳市优软科技有限公司询价信息</a></td>
+                                        <td>ALGAKGAG</td>
+                                        <td>2017-04-27</td>
+                                        <td>2017-04-30</td>
+                                        <td><span class="text-trans overdue">已过期</span></td>
+                                    </tr>
+                                    <tr>
+                                        <td><img src="resources/img/icon/inquiry.png" /><em>询价信息</em><a href="#">深圳市优软科技有限公司询价信息</a></td>
+                                        <td>ALGAKGAG</td>
+                                        <td>2017-04-27</td>
+                                        <td>2017-04-30</td>
+                                        <td><span class="text-trans overdue">已过期</span></td>
+                                    </tr>
+                               </tbody>
+                           </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    <!--</form>-->
+</div>
+<script src="static/lib/jquery/jquery.min.js"></script>
+<script>
+    $(function(){
+        var size10= $(".tender-list02 dl dd").size();
+        if(size10 > 10){
+            $(".scroll-y").addClass("active");
+        }else{
+            $(".scroll-y").removeClass("active");
+        }
+
+        //新增收货地址
+        $(".tender-content .base-info .add-address").click(function(){
+            document.getElementById('shipAddress').reset();
+            $(".bomb-box").show();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+            $(".bomb-box").hide();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+            $(".bomb-box").hide();
+        })
+    })
+</script>

+ 1 - 2
src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -100,7 +100,6 @@
         height: 60px;
         font-size: 14px;
         line-height: 60px;
-        color: #999;
         border-bottom: #dbe7ff 1px dashed;
     }
     .tender-list-tab table thead span,.tender-list-tab table tbody span{
@@ -207,7 +206,7 @@
                                     <i class="fa fa-search" ng-click="onSearch()"></i>
                                 </div>
                             </div>
-                            <div style="padding-left: 50px;">
+                            <div style="padding-left: 50px; font-size: 14px; line-height: 35px;">
                             	    共{{tableParams.total()}}条
                             </div>
                         </div>