Domů Procházet Nápověda
Registrovat se Přihlásit se
usoft
/
platform-b2c
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

erp对接页面调整

yangc před 8 roky
rodič
1ef85b8667
revize
50b0ed030c
6 změnil soubory, kde provedl 48 přidání a 30 odebrání
Jednotné zobrazení Ukázat statistiku rozdílových dat
  1. 1 0
      src/main/webapp/WEB-INF/views/normal/erp/user_center.html
  2. 1 0
      src/main/webapp/WEB-INF/views/normal/erp/vendor_center.html
  3. 3 0
      src/main/webapp/resources/css/erp/align.css
  4. 5 1
      src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js
  5. 27 18
      src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html
  6. 11 11
      src/main/webapp/resources/view/vendor/forstore/pay_center.html

+ 1 - 0
src/main/webapp/WEB-INF/views/normal/erp/user_center.html
Zobrazit soubor 

@@ -20,6 +20,7 @@
 
 <link rel="stylesheet" href="static/css/user/base.css" />
 
 <link rel="stylesheet" href="static/css/user/base.css" />
 
 <link rel="stylesheet" href="static/css/user/user.css" />
 
 <link rel="stylesheet" href="static/css/user/user.css" />
 
 <link rel="stylesheet" href="static/lib/calendar/calendar.css">
 
 <link rel="stylesheet" href="static/lib/calendar/calendar.css">
 
+<link rel="stylesheet" href="static/css/erp/align.css">
 
 </head>
 
 </head>
 
 <body>
 
 <body>

+ 1 - 0
src/main/webapp/WEB-INF/views/normal/erp/vendor_center.html
Zobrazit soubor 

@@ -18,6 +18,7 @@
 
 <link rel="stylesheet" href="static/css/vendor/base.css" />
 
 <link rel="stylesheet" href="static/css/vendor/base.css" />
 
 <link rel="stylesheet" href="static/lib/calendar/calendar.css">
 
 <link rel="stylesheet" href="static/lib/calendar/calendar.css">
 
 <link rel="stylesheet" href="static/lib/angular/ng-table.css">
 
 <link rel="stylesheet" href="static/lib/angular/ng-table.css">
 
+<link rel="stylesheet" href="static/css/erp/align.css">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 	<!-- 消息提示框  Start-->
 
 	<!-- 消息提示框  Start-->

+ 3 - 0
src/main/webapp/resources/css/erp/align.css
Zobrazit soubor 

@@ -0,0 +1,3 @@
 
+.user_content .user_right {
 
+    margin-right: 90px;
 
+}

+ 5 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js
Zobrazit soubor 

@@ -474,8 +474,12 @@ define([ 'app/app' ], function(app) {
 
 			Material.getAll($scope.param, function (data) {
 
 			Material.getAll($scope.param, function (data) {
 
 				$scope.materialAll = data;
 
 				$scope.materialAll = data;
 
 				$scope.currenctMaterial = data.content;
 
 				$scope.currenctMaterial = data.content;
 
-				angular.forEach($scope.currenctMaterial, function (material) {
 
+				angular.forEach($scope.currenctMaterial, function (material, index) {
 
 					material.isChoosed = false;
 
 					material.isChoosed = false;
 
+					//第一个自动展开
 
+					if (index == 0) {
 
+						material.selected = true;
 
+					}
 
 				});
 
 				});
 
 				$scope.param.currentPage = data.number;
 
 				$scope.param.currentPage = data.number;
 
 				$scope.acculatePages(data.number, data.totalPages);
 
 				$scope.acculatePages(data.number, data.totalPages);

+ 27 - 18
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html
Zobrazit soubor 

@@ -327,7 +327,7 @@
 
 	}
 
 	}
 
 	.edit-content div.content,.edit-content div.img{
 
 	.edit-content div.content,.edit-content div.img{
 
 		float: left;
 
 		float: left;
 
-		margin: 0 5px;
 
+		margin-right: 5px;
 
 	}
 
 	}
 
 	.edit-content .wid36{
 
 	.edit-content .wid36{
 
 		width: 36px;
 
 		width: 36px;
 
@@ -423,6 +423,9 @@
 
 	.pro_management .table tr td div span.switch button.active{
 
 	.pro_management .table tr td div span.switch button.active{
 
 		background: url("static/img/icon/check-ok.png") no-repeat center;
 
 		background: url("static/img/icon/check-ok.png") no-repeat center;
 
 	}
 
 	}
 
+	.com_tab ul li.active a {
 
+		color: #1687ff;
 
+	}
 
 </style>
 
 </style>
 
 <div class="user_right fr">
 
 <div class="user_right fr">
 
 	<!--货品管理-->
 
 	<!--货品管理-->
 
@@ -496,9 +499,10 @@
 
 							<span ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 
 							<span ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 
 						</td>
 
 						</td>
 
 						<td>
 
 						<td>
 
-							<a ng-show="!isBatch && standard_tab == 'standard'" ng-click="showShelfArea(material)"><span ng-show="!isBatch">编辑</span></a>
 
-							<a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>
 
-							<a ng-show="!isBatch" ng-click="deleteMaterial(material)"><span ng-show="!isBatch">删除</span></a>
 
+							<a ng-show="!material.selected&&!isBatch && standard_tab == 'standard'" ng-click="showShelfArea(material)"><span ng-show="!isBatch">去上架</span></a>
 
+							<a ng-show="!material.selected&&!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>
 
+							<a ng-show="!material.selected&&!isBatch" ng-click="deleteMaterial(material)"><span ng-show="!isBatch">删除</span></a>
 
+							<a ng-if="material.selected">取消</a>
 
 						</td>
 
 						</td>
 
 					</tr>
 
 					</tr>
 
 					<!--编辑内容-->
 
 					<!--编辑内容-->
 
@@ -508,6 +512,18 @@
 
 								<p class="title">&nbsp;</p>
 
 								<p class="title">&nbsp;</p>
 
 								<img ng-src="{{material.img || 'static/img/store/common/default.png'}}" alt="img"/>
 
 								<img ng-src="{{material.img || 'static/img/store/common/default.png'}}" alt="img"/>
 
 							</div>
 
 							</div>
 
+							<div class="content">
 
+								<p class="title">ERP空闲库存</p>
 
+								<div class="input-list">8888</div>
 
+								<p>库存</p>
 
+								<div class="input-list">9999</div>
 
+							</div>
 
+							<div class="content">
 
+								<p class="title">上架数量</p>
 
+								<div class="input-list">
 
+									<input type="number" class="wid48 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
 
+								</div>
 
+							</div>
 
 							<div class="content">
 
 							<div class="content">
 
 								<p class="title">包装/生产日期</p>
 
 								<p class="title">包装/生产日期</p>
 
 								<div class="input-list">
 
 								<div class="input-list">
 
@@ -520,22 +536,16 @@
 
 										<!--<option value="0">不可拆卖</option>-->
 
 										<!--<option value="0">不可拆卖</option>-->
 
 									<!--</select>-->
 
 									<!--</select>-->
 
 								</div>
 
 								</div>
 
-								<div>
 
-									<span>可拆卖:</span>
 
-									<span class="switch"><button ng-class="{'active' : goods.breakUp}" ng-click="toggleIsBreadUp(goods)"></button></span>
 
-								</div>
 
-							</div>
 
-							<div class="content">
 
-								<p class="title">库存</p>
 
-								<div class="input-list">
 
-									<input type="number" class="wid48 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
 
-								</div>
 
 							</div>
 
 							</div>
 
 							<div class="content">
 
 							<div class="content">
 
 								<p class="title">最小包装量</p>
 
 								<p class="title">最小包装量</p>
 
 								<div class="input-list">
 
 								<div class="input-list">
 
 									<input type="number" class="form-control" name="minPackQty" title="最小包装量"  placeholder="数量" ng-model="goods.minPackQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinPackAmount(goods)" style="width: 70px;"/>
 
 									<input type="number" class="form-control" name="minPackQty" title="最小包装量"  placeholder="数量" ng-model="goods.minPackQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinPackAmount(goods)" style="width: 70px;"/>
 
 								</div>
 
 								</div>
 
+								<div style="position: relative;top: 13px;left: 3px;">
 
+									<span>可拆卖:</span>
 
+									<span class="switch"><button ng-class="{'active' : goods.breakUp}" ng-click="toggleIsBreadUp(goods)"></button></span>
 
+								</div>
 
 							</div>
 
 							</div>
 
 							<div class="content">
 
 							<div class="content">
 
 								<p class="title">起拍</p>
 
 								<p class="title">起拍</p>
 
@@ -544,16 +554,14 @@
 
 								</div>
 
 								</div>
 
 							</div>
 
 							</div>
 
 							<div class="content">
 
 							<div class="content">
 
-								<p class="title">交期</p>
 
+								<p class="title">交期<span style="color:#999;">（{{!store.enType || store.enType === 'HK'?'香港':!store.enType || store.enType === 'MAINLAND'?'国内':''}}）</span></p>
 
 								<div class="input-list">
 
 								<div class="input-list">
 
 									<p ng-if="!store.enType || store.enType === 'HK'">
 
 									<p ng-if="!store.enType || store.enType === 'HK'">
 
-										<span>香港:</span>
 
 										<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'HK')"/></span>
 
 										<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'HK')"/></span>
 
 										<span style="margin-left: 4px;">–</span>
 
 										<span style="margin-left: 4px;">–</span>
 
 										<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'HK')"/></span>
 
 										<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'HK')"/></span>
 
 									</p>
 
 									</p>
 
 									<p ng-if="!store.enType || store.enType === 'MAINLAND'">
 
 									<p ng-if="!store.enType || store.enType === 'MAINLAND'">
 
-										<span>国内:</span>
 
 										<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'DEM')"/></span>
 
 										<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'DEM')"/></span>
 
 										<span style="margin-left: 4px;">–</span>
 
 										<span style="margin-left: 4px;">–</span>
 
 										<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'DEM')"/></span>
 
 										<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'DEM')"/></span>
 
@@ -601,7 +609,8 @@
 
 							<div class="content" style="width: 56px; float: right; margin-right: 10px;">
 
 							<div class="content" style="width: 56px; float: right; margin-right: 10px;">
 
 								<p class="title">&nbsp;</p>
 
 								<p class="title">&nbsp;</p>
 
 								<div class="input-list">
 
 								<div class="input-list">
 
-									<button class="off" ng-click="closeShelArea(material)">取消</button>
 
+									<!--<button class="off" ng-click="closeShelArea(material)">取消</button>-->
 
+									<button class="ok" ng-click="publishGoods(material)" style="margin-bottom: 5px">保存</button>
 
 									<button class="ok" ng-click="publishGoods(material)">上架</button>
 
 									<button class="ok" ng-click="publishGoods(material)">上架</button>
 
 								</div>
 
 								</div>
 
 							</div>
 
 							</div>

+ 11 - 11
src/main/webapp/resources/view/vendor/forstore/pay_center.html
Zobrazit soubor 

@@ -371,17 +371,17 @@
 
 <div class="user_right fr" id="pay_center">
 
 <div class="user_right fr" id="pay_center">
 
     <!--支付中心-->
 
     <!--支付中心-->
 
     <div class="pay_record oder">
 
     <div class="pay_record oder">
 
-        <div class="user_r_01">
 
-            <dl>
 
-                <dt><img src="static/img/user/images/user_photo.png" /></dt>
 
-                <dd>
 
-					<span>{{userInfo.enterprise.enName}}<br/>
 
-                        <!--<em>账户余额：￥<b ng-bind="0"></b></em>-->
 
-					</span>
 
-                    <a href="vendor#/account/management">账户设置&nbsp;》</a>
 
-                </dd>
 
-            </dl>
 
-        </div>
 
+        <!--<div class="user_r_01">-->
 
+            <!--<dl>-->
 
+                <!--<dt><img src="static/img/user/images/user_photo.png" /></dt>-->
 
+                <!--<dd>-->
 
+					<!--<span>{{userInfo.enterprise.enName}}<br/>-->
 
+                        <!--&lt;!&ndash;<em>账户余额：￥<b ng-bind="0"></b></em>&ndash;&gt;-->
 
+					<!--</span>-->
 
+                    <!--<a href="vendor#/account/management">账户设置&nbsp;》</a>-->
 
+                <!--</dd>-->
 
+            <!--</dl>-->
 
+        <!--</div>-->
 
         <div class="oder01">
 
         <div class="oder01">
 
             <ul>
 
             <ul>
 
                 <li class="active"><a href="javascript:void(0)">收款账户信息</a></li>
 
                 <li class="active"><a href="javascript:void(0)">收款账户信息</a></li>