1、产品导入、物料信息、采购物料统一加入标准 非标的标志。

2、有新的合作伙伴未同意时加红点标识。
3、代采订单—错误日志页面调整。

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

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

@@ -3400,4 +3400,24 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 #myquest-public .customer-tab .customer-hd .checkbox span{
 	margin-top: 5px;
-}
+}
+
+/*加入标准与非标标志*/
+.order-hd td.hover-show{
+	position: relative;
+	padding: 0 !important;
+}
+.hover-show a{
+	width: 100%;
+	padding: 0;
+	padding-right: 30px;
+	display: inline-block;
+}
+.hover-show.bg01{
+	background: url(../img/icon/standard.png) no-repeat top right;
+	background-position-y: -1px;
+}
+.hover-show.bg02{
+	background: url(../img/icon/no-standard.png) no-repeat top right;
+	background-position-y: -1px;
+}

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

@@ -172,10 +172,9 @@
             <thead>
             <tr class="header">
                 <th width="140">产品编号</th>
-                <th>产品名称</th>
-                <th width="220">产品规格</th>
-                <th width="110">品牌</th>
-                <th width="110">原厂型号</th>
+                <th>产品名称(类目)</th>
+                <th width="160">产品型号</th>
+                <th width="140">品牌</th>
                 <th width="70">单位</th>
                 <th width ="150">操作</th>
             </tr>
@@ -188,9 +187,8 @@
                         <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情"></a>
                     </div>
                 </td>
-                <td class="order-sum text-center"  title="{{product.spec}}" ng-bind="::product.spec"></td>
+                <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}"><a href="#" title="产品型号" ng-bind="::product.cmpCode"></a></td>
                 <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand"></td>
-                <td class="text-center" title="原厂型号" ng-bind="::product.cmpCode"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
                 <td class="text-center">
              	      <span class="checkbox" style="width: 100%;"> 销售

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

@@ -281,6 +281,9 @@
 .order-table .order-hd .text-center p{
 	margin: 0;
 }
+.new-dot{
+	top: 15px;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
 <div class="loading in" ng-class="{'in': loading}">
@@ -334,7 +337,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<tbody ng-repeat="request in $data" class="company-list">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td colspan="4"><span ng-bind="request.vendName" class="margin-left20"></span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+			<td colspan="4" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
 			<td width="200" class="text-center">
 				<!--<span class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</span>-->
 				<span class="grey01" ng-if="request.statusCode==313">已通过</span>

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

@@ -128,24 +128,6 @@
 .order-hd td a{
     margin: 0 8px;
 }
-    .order-hd td.hover-show{
-        position: relative;
-        padding: 0 !important;
-    }
-    .hover-show a{
-        width: 100%;
-        padding: 0;
-        padding-right: 30px;
-        display: inline-block;
-    }
-    .hover-show.bg01{
-        background: url(static/img/icon/standard.png) no-repeat top right;
-        background-position-y: -1px;
-    }
-    .hover-show.bg02{
-        background: url(static/img/icon/no-standard.png) no-repeat top right;
-        background-position-y: -1px;
-    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -185,7 +167,7 @@
                 <th width="140">产品编号</th>
                 <th>产品名称(类目)</th>
                 <th width="160">产品型号</th>
-                <th width="110">品牌</th>
+                <th width="140">品牌</th>
                 <th width="70">单位</th>
                 <th width ="90">操作</th>
             </tr>
@@ -204,7 +186,7 @@
                         <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情"></a>
                     </div>
                 </td>
-                <td class="hover-show bg01" style="text-align: right;"><a href="#" title="产品型号" ng-bind="::product.cmpCode"></a></td>
+                <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}"><a href="#" title="产品型号" ng-bind="::product.cmpCode"></a></td>
                 <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
                 <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>

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

@@ -152,6 +152,23 @@
         line-height: 25px;
         padding: 10px 20px;
     }
+    .deputy-btn{
+        float: right;
+        width: 225px;
+        padding-right: 0;
+    }
+    .deputy-btn a{
+        padding: 0;
+        line-height: 40px;
+        margin-right: 20px;
+    }
+    .deputy-btn a i{
+        color: #5078cb;
+        font-size: 14px;
+    }
+    .deputy-btn a:hover{
+        text-decoration: none;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div id="public">
@@ -163,7 +180,7 @@
         <!-- 选项菜单和新增按钮 -->
         <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="col-xs-8" style="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"
@@ -182,15 +199,13 @@
             		            共<span class="text-num">{{total}}</span>
                     </div>-->
                 </div>
-                <div class="col-xs-2 pull-right" style="width: 140px;">
-                    <a ui-sref="purc.newdeputy" type="button" title="新增代采订单" class="btn btn-tender">
+                <div class="deputy-btn col-xs-3">
+                    <a ui-sref="purc.newdeputy" type="button" title="新增代采订单">
                         <img src="static/img/icon/add.png">
                         <span class="f14" style="color: #5078cb;line-height: 25px;">代采订单</span>
                     </a>
-                </div>
-                 <div class="col-xs-2 pull-right" style="width: 140px;">
-                    <a ui-sref="purc.deputylog" type="button" title="新增代采订单" class="btn btn-tender">
-                        <i class="fa fa-file-text fa-lg"></i>
+                    <a ui-sref="purc.deputylog" type="button" title="新增代采订单">
+                        <i class="fa fa-file-text"></i>
                         <span class="f14" style="color: #5078cb;line-height: 25px;">错误日志</span>
                     </a>
                 </div>

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

@@ -1,12 +1,32 @@
+<style>
+.log-table .header th{
+	text-align: center;
+}
+.log-table tbody tr{
+	height: 60px;
+}
+.log-table tbody tr td{
+	border-bottom: 1px solid #e8e8e8;
+	font-size: 14px;
+	vertical-align: middle;
+}
+.log-table tbody tr td a{
+	color: #327ebe;
+}
+.log-table.table>thead>tr>th{
+	border-bottom: none;
+	font-size: 14px;
+}
+</style>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info" style="max-height: 500px;overflow: auto;">
-	<div class="pane-header">
-		代采订单错误日志
+<div class="pane base-info">
+	<div class="pub-com_head">
+		<span>代采订单错误日志</span>
 	</div>
 	<div class="pane-body">
-		<table class="block table table-default table-striped"
+		<table class="log-table block table"
 			ng-table="tableParams">
 			<thead>
 				<tr class="header">
@@ -16,8 +36,8 @@
 					<th width="120">详情</th>
 				</tr>
 			</thead>
-			<tbody>
-				<tr ng-repeat="log in $data">
+			<tbody  ng-repeat="log in $data">
+				<tr>
 					<td class="text-center" ng-bind="::log.date | date:'yyyy-MM-dd HH:mm'"></td>
 					<td class="text-center" ng-bind="::log.code"></td>
 					<td class="text-center" ng-bind="::log.message"></td>

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

@@ -165,13 +165,12 @@
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
-                <th width="140">产品编号</th>
-                <th>产品名称</th>
-                <th width="220">产品规格</th>
-                <th width="110">品牌</th>
-                <th width="110">原厂型号</th>
+                <th width="140">物料编号</th>
+                <th>物料名称(类目)</th>
+                <th width="160">物料型号</th>
+                <th width="140">品牌</th>
                 <th width="70">单位</th>
-                <!-- <th width ="90">操作</th> -->
+                 <th width ="90">操作</th>
             </tr>
             <!--<tr class="sep-row">
                 <td colspan="5"></td>
@@ -188,11 +187,10 @@
                         <a ng-bind="::product.title" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情"></a>
                     </div>
                 </td>
-                <td class="order-sum text-center"  title="{{product.spec}}" ng-bind="::product.spec"></td>
+                <td class="hover-show text-center" ng-class="{'bg01' : product.cmpUuId != null && product.cmpCode != null , 'bg02' : product.cmpUuId == null && product.cmpCode != null , '': product.cmpCode == null}"><a href="#" title="物料型号" ng-bind="::product.cmpCode"></a></td>
                 <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand"></td>
-                <td class="text-center" title="原厂型号" ng-bind="::product.cmpCode"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
-               <!--  <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td> -->
+                 <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>
             </tbody>
         </table>