Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

12 小时以前 e9fa2cd033cc5399a4a23601f8155a8cd2079aab

 HTML/views/StatisticalReport/AdventSlot.html

@@ -121,6 +121,13 @@
                     }}
                     {{ GetBtn(d) }}
                  </script>
                  <script type="text/html" id="templetExpirationTime">
                     {{# function GetBtn(d){
                        return formatDate(d.ExpirationTime);
                     }
                  }}
                  {{GetBtn(d)}}
                  </script>
                  <!-- #endregion -->
               </div>

@@ -277,6 +284,12 @@
                //                 },
                //             },
                //             {
                //                 field: 'ExpirationTime', title: '过期时间', align: 'center',width:150,
                //                 templet: function(d) {
                //                     return formatDate2(d.ExpirationTime);
                //                 },
                //             },
                //             {
                //                 field: 'Status', title: '物料状态', align: 'center',width:100, templet: '#buttonTpl'
                //             },
                //             {
@@ -308,11 +321,13 @@
                            {field: 'LotText',title: '批次描述',  align: 'center', width:100},
                            {field: 'SupplierLot',title: '供货批次', align: 'center', width:100},
                            {field: 'ProductionTime', title: '生产时间', align: 'center',width:150,templet: '#templetProductionTime'},
                            {field: 'ExpirationTime', title: '过期时间', align: 'center',width:150,templet: '#templetExpirationTime'},
                            {field: 'Status', title: '物料状态', align: 'center',width:100, templet: '#buttonTpl'},
                            {field: 'InspectMark', title: '抽检标记', align: 'center',width:100, templet: '#InspectMarkStatus'},
                            {field: 'InspectStatus', title: '质量状态', align: 'center',width:100, templet: '#InspectStatus1'},
                  ]];
            var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            console.log(TotalColsSysArr);
            //#endregion
            //获取总量信息
            function refreshTable(SkuNo,SkuName,LotNo,PalletNo,Status,InspectMark,InspectStatus,IsBale,IsBelt) {