Parcourir la source

erp空闲库存显示修改

yangc il y a 8 ans
Parent
commit
1db8e9b609

+ 9 - 7
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -465,17 +465,18 @@
 					<thead>
 					<thead>
 					<tr>
 					<tr>
 						<th width="80">序号</th>
 						<th width="80">序号</th>
-						<th width="180">产品编号</th>
-						<th width="200">产品名称(类目)</th>
-						<th width="150">品牌</th>
-						<th width="100">单位</th>
+						<th width="80">ERP空闲库存</th>
+						<th width="160">产品编号</th>
+						<th width="180">产品名称(类目)</th>
+						<th width="130">品牌</th>
+						<th width="80">单位</th>
 						<th>产品型号</th>
 						<th>产品型号</th>
 						<th width="150">操作</th>
 						<th width="150">操作</th>
 					</tr>
 					</tr>
 					</thead>
 					</thead>
 					<tbody>
 					<tbody>
 					<tr style="height: 14px;">
 					<tr style="height: 14px;">
-						<td colspan="7" class="hei16"></td>
+						<td colspan="8" class="hei16"></td>
 					</tr>
 					</tr>
 					</tbody>
 					</tbody>
 					<tbody ng-repeat="material in currenctMaterial">
 					<tbody ng-repeat="material in currenctMaterial">
@@ -484,6 +485,7 @@
 							<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 							<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 							<span ng-show="!isBatch" ng-bind="(param.currentPage - 1) * 10 + $index + 1"></span>
 							<span ng-show="!isBatch" ng-bind="(param.currentPage - 1) * 10 + $index + 1"></span>
 						</td>
 						</td>
+						<td>{{material.productDetail.reserve || 0}}</td>
 						<td ng-bind="material.prodNum" title="{{material.prodNum}}"></td>
 						<td ng-bind="material.prodNum" title="{{material.prodNum}}"></td>
 						<td>
 						<td>
 							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
 							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
@@ -513,8 +515,8 @@
 								<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" ng-show="material.sourceApp == 'ERP'">
 							<div class="content" ng-show="material.sourceApp == 'ERP'">
-								<p class="title">ERP空闲库存</p>
-								<div class="input-list" ng-bind="goods.erpReserve"></div>
+								<!--<p class="title">ERP空闲库存</p>-->
+								<!--<div class="input-list" ng-bind="goods.erpReserve"></div>-->
 								<p>已上架库存</p>
 								<p>已上架库存</p>
 								<div class="input-list" ng-bind="goods.b2cReserve"></div>
 								<div class="input-list" ng-bind="goods.b2cReserve"></div>
 							</div>
 							</div>