Merge remote-tracking branch 'origin/release-201807-suntg' into release-201807-suntg

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

@@ -190,19 +190,19 @@
 	<!-- body End -->
 
  <!--金控广告 -->
-<div ng-controller="AdController">
-	<div class="jinkong_bottom" ng-show="bannerShow" ng-class="{'jinkong_animation': jingKongAnmiation}"></div>
-	<div class="jinkong" ng-if="imgShow" ng-class="{'jinkong_animation': jingKongAnmiation}">
-		<div class="container">
-			<div class="img" ng-class="{'img_stater': imgAnmiation}">
-				<span class="qcrode_close close" ng-click="closeClick()">×</span>
-				<span class="close time" ng-if="!imgAnmiation">{{count}}s</span>
-				<img src="static/img/jinkong/xiaoren.png" ng-class="{'animation_xr': imgAnmiation}">
-				<img src="static/img/jinkong/qrcode.png">
-			</div>
-		</div>
-	</div>
-</div>
+<!--<div ng-controller="AdController">-->
+	<!--<div class="jinkong_bottom" ng-show="bannerShow" ng-class="{'jinkong_animation': jingKongAnmiation}"></div>-->
+	<!--<div class="jinkong" ng-if="imgShow" ng-class="{'jinkong_animation': jingKongAnmiation}">-->
+		<!--<div class="container">-->
+			<!--<div class="img" ng-class="{'img_stater': imgAnmiation}">-->
+				<!--<span class="qcrode_close close" ng-click="closeClick()">×</span>-->
+				<!--<span class="close time" ng-if="!imgAnmiation">{{count}}s</span>-->
+				<!--<img src="static/img/jinkong/xiaoren.png" ng-class="{'animation_xr': imgAnmiation}">-->
+				<!--<img src="static/img/jinkong/qrcode.png">-->
+			<!--</div>-->
+		<!--</div>-->
+	<!--</div>-->
+<!--</div>-->
  <!-- -金控广告 -->
 
 <!-- footer Start -->

src/main/webapp/resources/css/add.css

@@ -84,7 +84,7 @@ body {
 }
 
 .content {
-    width: 930px;
+    width: 973px;
     margin: 0 auto;
 }
 
@@ -1707,7 +1707,9 @@ option {
 .oder-change dl dd:hover b.wid02 a {
     display: inline-block;
 }
-
+.oder-change dl.delect-hover dd:hover b.wid02 a{
+    display: none;
+}
 .oder-change dl dd b {
     height: 100px;
     line-height: 50px;

src/main/webapp/resources/css/index.css

@@ -1259,6 +1259,7 @@ img.new-animate{
 	float: left;
 	font-size: 12px;
 	min-height: 90vh;
+	background: #fff;
 }
 .body .container .right .sale-view{
 	box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
@@ -1266,7 +1267,7 @@ img.new-animate{
 	-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 	-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 	border-radius: 5px;
-	min-height: 1065px;
+	min-height: 1066px;
 	background: #fff;
 }
 @media ( max-height : 768px) {
@@ -1652,13 +1653,23 @@ img.new-animate{
 	-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 	border-radius: 5px;
 }
+/*.left .feed-wrap .service {*/
+	/*box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*border-radius: 5px;*/
+/*}*/
+/*.left .feed-wrap .service{*/
+	/*background-color: #fff;*/
+	/*border-radius: 5px;*/
+/*}*/
 .left .feed-wrap .notice:first-child {
 	margin-top: 0;
 }
 .pane {
 	/*margin-top: 20px;*/
 	margin-bottom: 15px;
-	background-color: #fff;
 }
 
 .pane .pane-header {
@@ -1677,7 +1688,13 @@ img.new-animate{
 .pane .pane-header .pull-right {
 	font-weight: normal;
 }
-
+.pane .pane-header .pull-right i{
+	font-size: 22px;
+	color: #fff;
+}
+.notice .pane-header .pull-right i{
+	margin-top: 5px;
+}
 .pane .pane-header .pull-right>a {
 	margin-left: 3px;
 }
@@ -1764,15 +1781,19 @@ img.new-animate{
 
 .pane {
 	margin-bottom: 15px;
-	background-color: #fff;
 }
 
 .pane .pane-header .pull-right>a {
 	margin-left: 3px;
 }
-.feed-wrap .pane:first-child ,.feed-wrap .pane:nth-child(2){
+.feed-wrap .service{
 	height: 275px;
 }
+.feed-wrap .notice{
+	height: auto;
+	background: #fff;
+	border-radius: 5px;
+ }
 .pane .pane-body {
 	padding: 10px;
 }
@@ -1780,6 +1801,19 @@ img.new-animate{
 	overflow-y: auto;
 	overflow-x: hidden;
 }
+.feed-wrap .pane:first-child, .feed-wrap .pane:nth-child(2) {
+	height: 275px;
+}
+.feed-wrap .notice .pane-body{
+	width: 202px;
+	/*background: #fff;*/
+	/*box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);*/
+	/*border-bottom-left-radius: 5px;*/
+	/*border-bottom-right-radius: 5px;*/
+}
 .pane.addon {
 	height: 185px;
 	text-align: center;
@@ -1797,22 +1831,15 @@ img.new-animate{
 
 .notice {
 	height: 154px;
-	box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-	-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-	-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-	border-radius: 5px;
 }
-
-.notice .detail>li {
+.feed-wrap .detail>li{
 	clear: both;
 	display: block;
-	padding: 0 10px 8px 15px;
+	padding: 0 10px 8px 0;
 	position: relative;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-
 }
 .notice .detail>li a{
 	font-size: 14px;
@@ -1855,6 +1882,20 @@ img.new-animate{
 	left: 0;
 	top: 5px;
 }
+.feed-wrap .pane .pane-body li a em{
+	font-size: 14px;
+}
+/*非当日公共询价*/
+.feed-wrap .pane .pane-body li.nonday a em{
+	max-width: 140px;
+}
+/*当日公共询价已读、未读**/
+.feed-wrap .pane .pane-body li.day-read a em{
+	max-width: 120px;
+}
+i.fa{
+	font-size: 16px;
+}
 
 .service {
 	height: 154px;
@@ -3439,51 +3480,58 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 #order-detail-list .content{
 	color: #323232;
 }
+#order-detail-list .order-kh{
+	white-space: nowrap;
+	word-wrap: break-word;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 85%;
+}
 #order-detail-list .table-default .header {
-	border: none;
-	background: none;
+border: none;
+background: none;
 }
 #order-detail-list .table-default .header th{
-	border-bottom: none;
-	font-weight: normal;
-	color: #999;
+border-bottom: none;
+font-weight: normal;
+color: #999;
 }
 #order-detail-list .table-default tbody tr{
-	background: none;
+background: none;
 }
 #order-detail-list .table-default tbody tr td{
-	vertical-align: middle;
-	color: #323232;
+vertical-align: middle;
+color: #323232;
 }
 #order-detail-list .table-default th,#order-detail-list .table-default td{
-	border-top: #ddd 1px dotted;
+border-top: #ddd 1px dotted;
 }
 .scoroll{
-	max-height: 800px;
-	overflow-y: scroll;
-	overflow-x: hidden;
-	display: inline-block;
-	position: relative;
+max-height: 800px;
+overflow-y: scroll;
+overflow-x: hidden;
+display: inline-block;
+position: relative;
 }
 #order-detail-list .content-hide{
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	width: 560px;
+white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
+width: 560px;
 }
 
 .title-div .end {
-	position: absolute;
-	top: 10px;
-	right: 0;
-	line-height: 24px;
-	padding-left: 15px;
-	background: #fff;
-	z-index: 2;
+position: absolute;
+top: 10px;
+right: 0;
+line-height: 24px;
+padding-left: 15px;
+background: #fff;
+z-index: 2;
 }
 /*#order-detail-list .text-inverse{
-	width: 100%;
-	display: inline-block;
+width: 100%;
+display: inline-block;
 }*/
 /*弹框搜索*/
 #window-search .form-control{

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

@@ -514,7 +514,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }).state('baseInfo', {//基础资料
             url: "/baseInfo",
             views: {
-                "left-view": {},
+                "left-view": {
+                    templateUrl: "static/tpl/index/common/leftAll.html"
+                },
                 "right-view": {
                     templateUrl: "static/tpl/index/baseInfo/right.html"
                 }
@@ -2019,6 +2021,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.dateTime = new Date();
         $scope.time = new Date().getTime();
+        /**
+         * 收起展开公告
+         */
+        $scope.show = false;
+        $scope.showGongGao = function () {
+            $scope.show = !$scope.show
+        }
     }]);
 
     app.controller('TenderCtrl', ['$scope', 'SnapshotService', function ($scope, SnapshotService) {
@@ -24516,18 +24525,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 ]},
 
             { "roleName" : "买家中心(采购)", "roleId" : "role2", 'path': 'purc', level: 0, collapsed: true, "children" : [
-                    { "roleName" : "采购管理", "roleId" : "role2-1", collapsed: true, "children" : [
-                            { "roleName" : "供应商资料", "roleId" : "role2-1-1", 'link' : '#/purc/vendor', "children" : [] },
-                            { "roleName" : "供应商服务", "roleId" : "role2-1-2", 'link' : '#/purc/vendor/serve', "children" : [] },
-                            { "roleName" : "采购物料", "roleId" : "role2-1-3", 'link' : '#/purc/product', "children" : [] },
-                            { "roleName" : "采购招标", "roleId" : "role2-1-4", 'link' : '#/purc/tender', "children" : [] },
-                            { "roleName" : "采购询价", "roleId" : "role2-1-5", 'link' : '#/purc/purchaseinquiry', "children" : [] },
-                            { "roleName" : "公共询价", "roleId" : "role2-1-6", 'link' : '#/purc/publicInquiry', "children" : [] },
-                            { "roleName" : "采购订单", "roleId" : "role2-1-7", 'link' : '#/purc/order', "children" : [] },
-                            { "roleName" : "采购变更单", "roleId" : "role2-1-8", 'link' : '#/purc/change', "children" : [] },
-                            { "roleName" : "代采订单", "roleId" : "role2-1-9", 'link' : '#/purc/deputy', "children" : [] },
-                            { "roleName" : "委外订单", "roleId" : "role2-1-10", 'link' : '#/purc/makeoutorder', "children" : [] }
-                        ] }
+                    { "roleName" : "供应商资料", "roleId" : "role2-1-1", 'link' : '#/purc/vendor', "children" : [] },
+                    { "roleName" : "供应商服务", "roleId" : "role2-1-2", 'link' : '#/purc/vendor/serve', "children" : [] },
+                    { "roleName" : "采购物料", "roleId" : "role2-1-3", 'link' : '#/purc/product', "children" : [] },
+                    { "roleName" : "采购招标", "roleId" : "role2-1-4", 'link' : '#/purc/tender', "children" : [] },
+                    { "roleName" : "采购询价", "roleId" : "role2-1-5", 'link' : '#/purc/purchaseinquiry', "children" : [] },
+                    { "roleName" : "公共询价", "roleId" : "role2-1-6", 'link' : '#/purc/publicInquiry', "children" : [] },
+                    { "roleName" : "采购订单", "roleId" : "role2-1-7", 'link' : '#/purc/order', "children" : [] },
+                    { "roleName" : "采购变更单", "roleId" : "role2-1-8", 'link' : '#/purc/change', "children" : [] },
+                    { "roleName" : "代采订单", "roleId" : "role2-1-9", 'link' : '#/purc/deputy', "children" : [] },
+                    { "roleName" : "委外订单", "roleId" : "role2-1-10", 'link' : '#/purc/makeoutorder', "children" : [] }
                 ]},
 
             { "roleName" : "财务", "roleId" : "role3", 'path': 'fa', level: 0, collapsed: true, "children" : [
@@ -24539,18 +24546,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             { "roleName" : "应付对账单", "roleId" : "role3-2-1", 'link' : '#/fa/arCheck', "children" : [] }
                         ]}
                 ]},
-            { "roleName" : "企业圈", "roleId" : "role4", 'link' : '#/baseInfo/enterpriseList', level: 0, "children" : [
+            { "roleName" : "企业圈", "roleId" : "role4", 'link' : '#/baseInfo/myRequest', level: 0, "children" : [
                 ]},
             { "roleName" : "基础设置", "roleId" : "role5", 'path': 'approvalFlow', collapsed: true, level: 0, "children" : [
-                    { "roleName" : "企业设置", "roleId" : "role5-1", collapsed: true, "children" : [
-                            { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },
-                            { "roleName" : "物料信息", "roleId" : "role5-1-2", 'link' : '#/approvalFlow/product', "children" : [] },
-                            { "roleName" : "我的产品库", "roleId" : "role5-1-3", 'link' : '#/approvalFlow/userProduct', "children" : [] },
-                            { "roleName" : "人员信息", "roleId" : "role5-1-4", 'link' : '#/approvalFlow/user', "children" : [] },
-                            { "roleName" : "角色权限", "roleId" : "role5-1-5", 'link' : '#/approvalFlow/role', "children" : [] },
-                            { "roleName" : "审批流", "roleId" : "role5-1-6", 'link' : '#/approvalFlow/flow', "children" : [] },
-                            { "roleName" : "操作日志", "roleId" : "role5-1-7", 'link' : '#/approvalFlow/log', "children" : [] }
-                        ]}
+                    { "roleName" : "企业信息", "roleId" : "role5-1-1", 'link' : '#/approvalFlow/enterprise', "children" : [] },
+                    { "roleName" : "物料信息", "roleId" : "role5-1-2", 'link' : '#/approvalFlow/product', "children" : [] },
+                    { "roleName" : "我的产品库", "roleId" : "role5-1-3", 'link' : '#/approvalFlow/userProduct', "children" : [] },
+                    { "roleName" : "人员信息", "roleId" : "role5-1-4", 'link' : '#/approvalFlow/user', "children" : [] },
+                    { "roleName" : "角色权限", "roleId" : "role5-1-5", 'link' : '#/approvalFlow/role', "children" : [] },
+                    { "roleName" : "审批流", "roleId" : "role5-1-6", 'link' : '#/approvalFlow/flow', "children" : [] },
+                    { "roleName" : "操作日志", "roleId" : "role5-1-7", 'link' : '#/approvalFlow/log', "children" : [] }
                 ]}
         ];
         $scope.currentObj = {};

src/main/webapp/resources/lib/treeview/css/angular.treeview.css

@@ -26,6 +26,18 @@ div[data-tree-model] li {
   width: 202px;
   /*padding: 0 0 0 15px;*/
 }
+div[data-tree-model] li b i{
+  font-size: 22px;
+  float: right;
+  padding-right: 10px;
+  margin-top: 5px;
+}
+div.treeView>ul>li>div>ul>li>div>ul>li b i{
+  display: none;
+}
+div.treeView>ul>li:nth-child(2)>div>ul>li>b i,div.treeView>ul>li:nth-child(5)>div>ul>li>b i{
+  display: none;
+}
 div.treeView>ul>li:first-child>.expanded{
   background: url("../img/icon_02.png") no-repeat 0 center;
 }
@@ -51,6 +63,9 @@ div.treeView>ul>li:nth-child(4)>.collapsed{
   background: url("../img/icon_05.png") no-repeat 0 center;
 }
 div.treeView>ul>li:nth-child(4)>.normal{
+  display: inline-block;
+  width: 24px;
+  height: 18px;
   background: url("../img/icon_05.png") no-repeat 0 center;
 }
 div.treeView>ul>li:nth-child(5)>.expanded{
@@ -70,6 +85,9 @@ div.treeView>ul>li>div>ul>li>span{
   font-weight: bold;
   color: #666;
 }
+div.treeView>ul>li:nth-child(2)>div>ul>li>span,div.treeView>ul>li:nth-child(5)>div>ul>li>span{
+  font-weight: normal;
+}
 div.treeView>ul>li>div>ul>li>div>ul>li>span{
   font-size: 14px;
   color: #666;
@@ -98,15 +116,21 @@ div[data-tree-model] li>span {
 }
 
 div[data-tree-model] li .expanded {
+  display: inline-block;
   padding: 1px 12px;
   /*background-image: url("../img/icon_02.png");*/
   /*background-repeat: no-repeat;*/
+  width: 24px;
+  height: 18px;
 }
 
 div[data-tree-model] li .collapsed {
+  display: inline-block;
   padding: 1px 12px;
   /*background-image: url("static/img/left/icon_02.png");*/
   /*background-repeat: no-repeat;*/
+  width: 24px;
+  height: 18px;
 }
 
 div[data-tree-model] li .normal {

src/main/webapp/resources/lib/treeview/js/angular.treeview.js

@@ -52,6 +52,7 @@
 							'<i class="expanded" data-ng-show="node.' + nodeChildren + '.length && !node.collapsed" data-ng-click="' + treeId + '.selectNodeHead(node)"></i>' +
 							'<i class="normal" data-ng-hide="node.' + nodeChildren + '.length"></i> ' +
 							'<span data-ng-class="node.selected" data-ng-click="' + treeId + '.selectNodeLabel(node)">{{node.' + nodeLabel + '}}</span>' +
+							'<b><i class="fa fa-angle-right"></i></b>' +
 							'<div data-ng-hide="node.collapsed" data-tree-id="' + treeId + '" data-tree-model="node.' + nodeChildren + '" data-node-id=' + nodeId + ' data-node-label=' + nodeLabel + ' data-node-children=' + nodeChildren + '></div>' +
 						'</li>' +
 					'</ul>';

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

@@ -843,7 +843,7 @@
 	<div class="com_title01"><span>已开通服务</span></div>
 	<div class="pane-body">
 		<div class="row">
-			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/index" class="bule" title="B2B商务平台">B2B商务平台</a></div>
+			<div class="col-xs-4"><a href="http://uas.ubtob.com/#/sale/pubinquiry" class="bule" title="B2B商务平台">B2B商务平台</a></div>
 			<div class="col-xs-4"><a href="http://www.usoftmall.com/" class="bule" target="_blank" title="优软商城">优软商城</a></div>
 			<div class="col-xs-4"><a href="http://v2.usoftchina.com/uu" class="bule" target="_blank" title="UU互联">UU互联</a></div>
 		</div>

src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -257,7 +257,7 @@
 	position: relative;
 }
 </style>
-<div class="block" style="width: 1170px;">
+<div class="block">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>

src/main/webapp/resources/tpl/index/common/leftAll.html

@@ -10,6 +10,33 @@
 		data-node-children="children" class="treeView">
 	</div>
 </div>
+<!--公共询价-->
+<!--<div class="feed-wrap">-->
+	<!--<div class="pane service" ng-controller="InquiryMessageListCtrl">-->
+		<!--<div class="pane-header">-->
+			<!--<img src="static/img/left/xunjia.png" style="height: 18px;margin-top: -4px;"> 公共询价<a class="pull-right text-muted"></a>-->
+			<!--<span class="pull-right"><a ui-sref="baseInfo.inquiryList" class="text-light"><i class="fa fa-angle-right"></i></a></span>-->
+		<!--</div>-->
+		<!--<div class="pane-body">-->
+			<!--<ul class="list-unstyled detail">-->
+				<!--<li ng-repeat="msg in message | orderBy : '- inid'" class="day-unread" ng-class="!msg.lastest ? 'nonday' : 'day-read'">-->
+					<!--&lt;!&ndash;<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>&ndash;&gt;-->
+					<!--<a ng-if="msg.quteId == null" ng-click="setReadStatus(msg)" ui-sref="baseInfo.inquiryListDetail({id:msg.inid})" class="text-light">-->
+						<!--<em style="font-style: normal;">{{msg.pordName}}</em>-->
+						<!--<img src="static/img/home/new.png" ng-if="msg.lastest"/>-->
+					<!--</a>-->
+					<!--<a ng-if="msg.quteId != null" ng-click="setReadStatus(msg)" ui-sref="sale.pubinquiry_detail({id:msg.quteId})" class="text-light">-->
+						<!--<em style="font-style: normal;">{{msg.pordName}}</em>-->
+						<!--<img src="static/img/home/new.png" ng-if="msg.lastest"/>-->
+					<!--</a>-->
+				<!--</li>-->
+				<!--<li ng-show="message == null || message == ''" class="grey">-->
+					<!--暂无询价信息！-->
+				<!--</li>-->
+			<!--</ul>-->
+		<!--</div>-->
+	<!--</div>-->
+<!--</div>-->
 <!--公告-->
 <div class="feed-wrap">
 	<div class="pane notice" ng-controller="NoticeCtrl">

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

@@ -163,7 +163,7 @@
 					<span>产品信息</span> <a ng-click="uplodaByBatch()">批量导入</a>
 				</div>
 				<!--产品信息-->
-				<dl ng-if="order.orderItems.length > 0">
+				<dl ng-if="order.orderItems.length > 0" class="delect-hover">
 					<dt>
 						<b>序号</b> <b class="wid01">产品信息</b> <b>单位</b> <b>数量</b> <b>单价</b>
 						<b>税率(%)</b> <b>交货日期</b> <b>备注</b> <b class="wid02">&nbsp;</b>

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

@@ -13,7 +13,7 @@
         width: 100%;
         height: 40px;
         line-height: 42px;
-        background: url(static/img/comm_bg01.png) no-repeat center;
+        /*background: url(static/img/comm_bg01.png) no-repeat center;*/
         background-size: 100%;
     }
     /* 主体 */

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

@@ -67,7 +67,7 @@
 			</div>
 			<div class="col-xs-9">
 				<span class="title">备注：</span>
-				<div class="content" ng-bind="::order.remark" style="white-space: normal;word-break: break-word;word-wrap: break-word;margin-left: 75px;margin-top: -25px;line-height: 25px;">1</div>
+				<div class="content order-kh" ng-bind="::order.remark">1</div>
 			</div>
 			<!-- <div class="col-xs-6">
 				<span class="title">审批人：</span>