Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

src/main/webapp/WEB-INF/tags/sys/shelvesselectNotName.tag

@@ -13,6 +13,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 <%@ attribute name="callback" type="java.lang.String" required="false" description="回调"%>
 <%@ attribute name="iframeUrl" type="java.lang.String" required="false" description="iframe窗口"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
 	<input id="${id}Id"  class="${cssClass} form-control" type="hidden" value="${value}"/>
 	<div class="input-group" style="width:100%">
 		<input id="${id}Name"  ${allowInput?'':'readonly="readonly"'}  type="text"  value="${labelValue}" data-msg-required="${dataMsgRequired}"
@@ -20,7 +21,9 @@
        		 <span class="input-group-btn">
 	              <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
 	              </button>
+				<c:if test="${allowClear}">
 					<button type="button" id="${id}DelButton" class="close" data-dismiss="alert" style="position: absolute; top: 5px; right: 53px; z-index: 999; display: block;">×</button>
+				</c:if>
        		 </span>
        		
     </div>

src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp

@@ -368,11 +368,15 @@
                     shelvesNames: '',
                     warehouseNames: ''
                 };
+                var warehouseIdMap = {};
                 items.forEach(function (item) {
                     obj.shelvesIds += item.id + ',';
                     obj.shelvesNames += item.name + ',';
+                    if (!warehouseIdMap[item.warehouse.id]) {
                         obj.warehouseIds += item.warehouse.id + ',';
-                    obj.warehouseNames += item.warehouse.name + ','
+                        obj.warehouseNames += item.warehouse.name + ',';
+                        warehouseIdMap[item.warehouse.id] = true;
+                    }
                 })
 
                 var realSelections = []; // 保存真实选中的数据
@@ -530,11 +534,11 @@
 <script id="shelvesTpl" type="text/html">//<!--
   {{#row.readonly}}
   <sys:shelvesselectNotName id="storageInfoList{{idx}}_shelves" name="storageInfoList[{{idx}}].shelvesIds" value="{{row.shelvesIds}}" labelName="storageInfoList[{{idx}}].shelvesNames" labelValue="{{row.shelvesNames}}"
-                   cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" disabled="disabled" isMultiSelected="true" />
+                   cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" disabled="disabled" isMultiSelected="true" allowClear="false" />
   {{/row.readonly}}
   {{^row.readonly}}
   <sys:shelvesselectNotName id="storageInfoList{{idx}}_shelves" name="storageInfoList[{{idx}}].shelvesIds" value="{{row.shelvesIds}}" labelName="storageInfoList[{{idx}}].shelvesNames" labelValue="{{row.shelvesNames}}"
-                     cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" callback="onSelectShelves" isMultiSelected="true" />//-->
+                     cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" callback="onSelectShelves" isMultiSelected="true" allowClear="false" />//-->
 {{/row.readonly}}
 </script>
 <script id="remarksTpl" type="text/html">

src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp

@@ -142,11 +142,12 @@
             /**处理明细隐藏input元素*/
             jp.loading();
             getTableData().forEach(function(item,index){
-                $("#inputForm").append(Mustache.render($("#hideTpl").html(),{
+                $("#inputForm").append("<div class='inputForm-hide-content'>" + Mustache.render($("#hideTpl").html(),{
                     row: item,
                     idx: index
-                }))
+                }) + "</div>")
             })
+            try {
                 jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                     if(data.success){
                         jp.getParent().refresh();
@@ -156,8 +157,13 @@
 
                     }else{
                         jp.error(data.msg);
+                        $(".inputForm-hide-content").remove();
                     }
                 })
+            } catch (e) {
+                $(".inputForm-hide-content").remove();
+            }
+
         }
 
     }

src/main/webapp/webpage/modules/warehouse/storage/storageList.js

@@ -273,8 +273,8 @@ $(document).ready(function() {
 			data1[i].storageId = row.id;
 			data1[i].batchNum = row.batchNum;
 			data1[i].jsonStr = JSON.stringify(data1[i]);
-			data1[i].isNotStorage = data1[i].state !== '2';
-			data1[i].isStorage = data1[i].state === '2';
+			data1[i].isNotStorage = data1[i].qrCode.state !== '2';
+			data1[i].isStorage = data1[i].qrCode.state === '2';
 			data1[i].mainRowIndex = index;
 			item.infoSum = new Big(item.num).times(item.amount).toNumber();
 			item.shelvesNames = item.shelvesList.map(function (e) {