调整入库表

src/main/webapp/static/common/js/jeeplus.js

@@ -322,8 +322,8 @@ function delRow(obj, prefix){
                 }
             });
         },
-        openStorageSelectDialog:function(isMultiSelect, batchNum, yesFuc){
-            var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+batchNum;
+        openStorageSelectDialog:function(params, yesFuc){
+            var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+params.batchNum+"&qrCode.state="+params.state;
             var fieldLabels = "物资编码|名称|类型|型号";
             var fieldKeys = "qrCode.code|name|type.name|model";
             var searchLabels = "类型|型号";
@@ -334,7 +334,7 @@ function delRow(obj, prefix){
                 title:"选择入库明细",
                 auto:true,
                 name:'friend',
-                content: ctx+"/tag/gridselect?url="+encodeURIComponent(url)+"&fieldLabels="+encodeURIComponent(fieldLabels)+"&fieldKeys="+encodeURIComponent(fieldKeys)+"&searchLabels="+encodeURIComponent(searchLabels)+"&searchKeys="+encodeURIComponent(searchKeys)+"&isMultiSelected="+isMultiSelect,
+                content: ctx+"/tag/gridselect?url="+encodeURIComponent(url)+"&fieldLabels="+encodeURIComponent(fieldLabels)+"&fieldKeys="+encodeURIComponent(fieldKeys)+"&searchLabels="+encodeURIComponent(searchLabels)+"&searchKeys="+encodeURIComponent(searchKeys)+"&isMultiSelected="+params.isMultiSelect,
                 btn: ['确定', '关闭'],
                 yes: function(index, layero){
                     var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();

src/main/webapp/webpage/modules/common/gridselect.jsp

@@ -28,7 +28,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）    
                pageList: [10, 25, 50, 'ALL'],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
-               url: "${url}",
+               url: jp.unescapeHTML("${url}"),
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',   
                ////查询参数,每次调用是会带上这个参数，可自定义                         

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

@@ -108,14 +108,18 @@
     return $(selector).bootstrapTable('getSelections');
   }
 
+  /**
+   * 手动添加明细
+   * @param selector
+   */
   function addDetail(selector){
-
+    // 选择该批次号下的货品明细
     if(!$("#batchNum").val()){
       jp.warning('请选择批次号！');
       return;
     }
 
-    jp.openStorageSelectDialog(true,$("#batchNum").val(),function (items){
+    jp.openStorageSelectDialog({batchNum:$("#batchNum").val(),state: 0, isMultiSelect: true },function (items){
         if(Array.isArray(items)){
           var data = items.map(function (item){
             if(item.goodsInfo && !item.goodsInfo.amount){

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

@@ -90,11 +90,13 @@
                                     <%@include file="storageDetail.jsp" %>
                                 </td>
                             </tr>
+                            <c:if test="${mode == 'view'}">
                             <tr>
                                 <td colspan="4">
                                     <%@include file="storageStatistic.jsp" %>
                                 </td>
                             </tr>
+                            </c:if>
                         </table>
                     </form:form>
                 </div>