bug修改

src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js

@@ -376,10 +376,10 @@ function onDelivery (id) {
 						{{row.ledgerInfo.batchNum}}
 					</td>
 					<td>
-						{{row.shelvesNames}}
+						{{row.ledgerInfo.shelvesNames}}
 					</td>
 					<td>
-						{{row.warehouseNames}}
+						{{row.ledgerInfo.warehouseNames}}
 					</td>
 					<td>
 						<img src="{{row.receiver}}" width="80"/>

src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp

@@ -22,6 +22,8 @@
         if(data.length){
             data = data.map(function(item){
                 item.delFlag = 0;
+                item.shelvesNames = item.shelvesList.map(function (e) { return e.name }).join(',') + ',';
+                item.warehouseNames = item.warehouseList.map(function (e) { return e.name }).join(',') + ',';
                 item.remarks = jp.escapeHtml(item.remarks);
                 item.readonly = item.qrCode && item.qrCode.state === '2'
                 return item;
@@ -549,7 +551,7 @@
 <script id="warehouseTpl" type="text/html">
     <input id="profitWarehousingInfoList{{idx}}_warehouseName"  type="text" value="{{row.warehouseNames}}" readonly  class="form-control "/>
     <input id="profitWarehousingInfoList{{idx}}_warehouseIds" name="profitWarehousingInfoList[{{idx}}].warehouseIds"  type="hidden" value="{{row.warehouseIds}}" readonly  class="form-control "/>
-    <input type="hidden" id="profitWarehousingInfoList{{idx}}_shelvesIds" name="profitWarehousingInfoList[{{idx}}].shelvesIds" value="{{row.shelvesIds}}">
+<%--    <input type="hidden" id="profitWarehousingInfoList{{idx}}_shelvesIds" name="profitWarehousingInfoList[{{idx}}].shelvesIds" value="{{row.shelvesIds}}">--%>
 </script>
 <script id="shelvesTpl" type="text/html">//<!--
   {{#row.readonly}}

src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js

@@ -284,6 +284,8 @@ function detailFormatter(index, row) {
 }
 
 function addRow(list, idx, tpl, row){
+    row.shelvesNames = row.shelvesList ? row.shelvesList.map(function (e) { return e.name }).join(',') + ',' : '';
+    row.warehouseNames = row.warehouseList ? row.warehouseList.map(function (e) { return e.name }).join(',') + ',' : '';
     $(list).append(Mustache.render(tpl, {
         idx: idx, delBtn: true, row: row
     }));
@@ -436,10 +438,10 @@ function inLedgerInfo(id, rowIndex ){
 						{{row.type.unit}}
 					</td>
 					<td>
-						{{row.shelves.name}}
+						{{row.shelvesNames}}
 					</td>
 					<td>
-						{{row.warehouse.name}}
+						{{row.warehouseNames}}
 					</td>
 					<td>
 						{{row.remarks}}