From 68ef2632aa52dca92a81250a8d95790d63441303 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 二月 2021 14:45:52 +0800
Subject: [PATCH] 解决销售出库新增问题

---
 WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
index 3462f88..7e19277 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
@@ -206,6 +206,13 @@
             $("#HMakerID").val(sessionStorage["Czybm"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
 
+            //鍒ゆ柇鐢ㄦ埛鏄惁缁戝畾鐝粍鍜岀敓浜ц祫婧�
+            if ($("#HGroupID").val() == 0 || $("#HSourceID").val() == 0) {
+                layer.confirm("璇ョ敤鎴锋湭缁戝畾鐝粍鎴栫敓浜ц祫婧愶紒涓嶅厑璁告壘璐э紒", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['纭閫�鍑�']
+                }, function () { window.location.href = "../../index.html"; });
+            }
+
             //鑾峰彇鏈�澶у崟鎹彿 new
             $("#HInterID").val("");
             $("#HBillNo").val("");
@@ -230,12 +237,12 @@
                 , cols: [[
                     { type: 'numbers', title: '搴忓彿' }
                     , { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true }
-                    , { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
+                    , { field: 'HMTONo', title: '鎵瑰彿' }
                     , { field: 'HSPID', title: '浠撲綅ID', hide: true }
                     , { field: 'HSPName', title: '浠撲綅' }
-                    , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 }
+                    , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' }
                     , { field: 'HWhID', title: '浠撳簱ID', hide: true }
-                    , { field: 'HWhName', title: '浠撳簱' }
+                    , { field: 'HWhName', title: '浠撳簱', width: 130 }
                     , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
                     , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
                     , { field: 'HGroupID', title: '鐝粍ID', hide: true }
@@ -269,15 +276,15 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'numbers', title: '搴忓彿' }
-                    //, { field: 'HIsStatus', title: '鏄惁鎵爜' }
-                    , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍙�', hide: true }
-                    , { field: 'HMTONo', title: '鎵瑰彿', width: 180 }
-                    , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 }
-                    , { field: 'HWhID', title: '浠撳簱ID', hide: true }
-                    , { field: 'HWhName', title: '浠撳簱' }
+                    //, { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true }
+                    , { field: 'HMTONo', title: '鎵瑰彿' }
                     , { field: 'HSPID', title: '浠撲綅ID', hide: true }
                     , { field: 'HSPName', title: '浠撲綅' }
+                    , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' }
+                    , { field: 'HWhID', title: '浠撳簱ID', hide: true }
+                    , { field: 'HWhName', title: '浠撳簱', width: 130 }
+                    , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
                     , { field: 'HGroupID', title: '鐝粍ID', hide: true }
                     , { field: 'HGroup', title: '鐝粍' }
                     , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
@@ -367,6 +374,7 @@
                                 $("#HSourceBillNo").attr("readonly", "readonly");//婧愬崟鍙峰彧璇�
                                 $("#HSourceBillNo").css("background-color", "#efefef4d");
                                 element.tabChange('tab-LookingForBill', '2');  //璺宠浆椤电
+                                $("#HSPName").focus();
                             }
                             else {
                                 layer.close(index);
@@ -564,7 +572,7 @@
                 {
                     //鍒ゆ柇涓婃灦搴撲綅鏄惁涓庢潯鐮佷腑搴撲綅涓�鑷�
                     var tableData = table.cache['bzd-table2'];
-                    if ($("#HWHID").val() != tableData[0].HWhID && $("#HSPID").val() != tableData[0].HSPID) {
+                    if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
                         layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
@@ -627,7 +635,7 @@
                                     layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                     return;
                                 }
-                                if (result.data[0].HWHID != tableData[0].HWhID && result.data[0].HItemID != tableData[0].HSPID) {
+                                if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
                                     layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 } else {
                                     $("#HSPName").val(result.data[0].HName);

--
Gitblit v1.9.1