Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp

@@ -105,6 +105,13 @@
             ]
         })
     }
+    /**
+     * 获取所有明细数据
+     * @returns {*|jQuery}
+     */
+    function getTableData() {
+        return $(selector).bootstrapTable('getData');
+    }
     function addDetail(selector){
         var row = {
             id: '',
@@ -126,7 +133,7 @@
     }
     function removeRow(index, rowId, rowDelFlag){
         if(rowId){
-            var delFlag = rowDelFlag === 1 ? 0 : 1
+            var delFlag = rowDelFlag == 1 ? 0 : 1
             updateRow(index, {
                 delFlag: delFlag
             })

src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp

@@ -99,6 +99,11 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写明细!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp

@@ -123,7 +123,7 @@
 
     function removeRow(index, rowId, rowDelFlag) {
         if (rowId) {
-            var delFlag = rowDelFlag === 1 ? 0 : 1
+            var delFlag = rowDelFlag == 1 ? 0 : 1
             updateRow(index, {
                 delFlag: delFlag
             })

src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp

@@ -165,7 +165,7 @@
 
     function removeRow(index, rowId, rowDelFlag) {
         if (rowId) {
-            var delFlag = rowDelFlag === 1 ? 0 : 1
+            var delFlag = rowDelFlag == 1 ? 0 : 1
             updateRow(index, {
                 delFlag: delFlag
             })

src/main/webapp/webpage/modules/warehouse/materialloss/materialLossForm.jsp

@@ -74,6 +74,11 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写明细!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp

@@ -23,6 +23,12 @@
 
     function initTable() {
         var data = ${fns:toJson(materialRequisition.materialRequisitionInfoList)};
+        if(data.length){
+            data = data.map(function(item){
+                item.delFlag = 0;
+                return item;
+            })
+        }
         $(selector).bootstrapTable({
             data: data,
             columns: [{checkbox: true},
@@ -116,7 +122,7 @@
                     field: '',
                     title: '操作',
                     formatter: function (value, row, index) {
-                        var text =  '删除';
+                        var text = row.delFlag == 1 ? '撤销删除' : '删除';
                         var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "',  '" + row.delFlag + "')\">" + text + "</a>"]
                         return result.join('');
                     }
@@ -177,10 +183,17 @@
     }
 
     function removeRow(index, rowId, rowDelFlag) {
-        $(selector).bootstrapTable("remove", {
-            field: '$index',
-            values: [index]
-        })
+        if (rowId && rowId != 'undefined') {
+            var delFlag = rowDelFlag == 1 ? 0 : 1
+            updateRow(index, {
+                delFlag: delFlag
+            })
+        } else {
+            $(selector).bootstrapTable("remove", {
+                field: '$index',
+                values: [index]
+            })
+        }
     }
 
     function updateRow(index, row) {

src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp

@@ -117,6 +117,18 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写领用物资!');
+                return;
+            }
+            var hasReceiver = getTableData().every(function(item){
+                return item.receiver
+            })
+            if(!hasReceiver){
+                jp.warning('领用人必填!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp

@@ -147,7 +147,7 @@
 
     function removeRow(index, rowId, rowDelFlag) {
         if (rowId) {
-            var delFlag = rowDelFlag === 1 ? 0 : 1
+            var delFlag = rowDelFlag == 1 ? 0 : 1
             updateRow(index, {
                 delFlag: delFlag
             })

src/main/webapp/webpage/modules/warehouse/outbound/outboundForm.jsp

@@ -82,6 +82,11 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写明细!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

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

@@ -126,7 +126,7 @@
      */
     function removeRow(index, rowId, rowDelFlag){
         if(rowId){
-            var delFlag = rowDelFlag === 1 ? 0 : 1
+            var delFlag = rowDelFlag == 1 ? 0 : 1
             updateRow(index, {
                 delFlag: delFlag
             })

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

@@ -85,6 +85,11 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写明细!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){

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

@@ -169,7 +169,7 @@
    */
   function removeRow(index, rowId, rowDelFlag){
     if(rowId){
-      var delFlag = rowDelFlag === 1 ? 0 : 1
+      var delFlag = rowDelFlag == 1 ? 0 : 1
       updateRow(index, {
         delFlag: delFlag
       })

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

@@ -133,6 +133,11 @@
         if(!isValidate){
             return false;
         }else{
+            var hasDetails = getTableData().length == 0;
+            if(hasDetails){
+                jp.warning('请填写明细!');
+                return;
+            }
             jp.loading();
             jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
                 if(data.success){