Merge branch 'wxw'

wxw

2024-09-26 4f7b007a9e0de9dac35c8c81e6e32f9ab6fee5c8

 HTML/views/StatisticalReport/BoxInfor.html

@@ -218,7 +218,12 @@
                            <p>已入库</p>
                        {{#  } else if(d.Status == '3') { }}
                            <p>已出库</p>
                        {{#  } }}
                        {{#  } else if(d.Status == '4') { }}
                     <p>已分配</p>
                  {{#  } else if(d.Status == '5') { }}
                     <p>已拣货</p>
                  {{#  } }}
						
                    </script>
                    <script type="text/html" id="InspectMarkStatus">
                        {{#  if(d.InspectMark=='0'){ }}
@@ -407,6 +412,7 @@
                    {field: 'FrozenQty', title: '冻结数量', align: 'center'},
                    {field: 'InspectMark', title: '抽检标记', align: 'center', templet: '#InspectMarkStatus'},
                    {field: 'BitPalletMark', title: '零托标记', align: 'center', templet: '#BitPalletMarkStatus'},
                    {field: 'Demo', title: '寄存备注', align: 'center'},
            ]];
            var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            //#endregion