From 96785ebcfe1bc9210f3d9d4056f4ec29fb60d810 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 10:58:22 +0800
Subject: [PATCH] 1

---
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html |   81 ++++++++++++++++++++++++++++++++--------
 1 files changed, 64 insertions(+), 17 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 55db939..8189c45 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -68,7 +68,7 @@
                                                 <label class="layui-form-label" id="BT_HWorksNumber">宸ュ巶浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
-                                                        <!--<option value="0">鑸滄垚</option>-->
+                                                        
                                                     </select>
                                                 </div>
                                             </div>
@@ -112,7 +112,7 @@
                                                 <label class="layui-form-label" id="BT_HBarCodeType">鏉$爜绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
-                                                        <!--<option value="11">鍞竴鏉$爜</option>-->
+                                                        
                                                     </select>
                                                 </div>
                                             </div>
@@ -293,7 +293,7 @@
             set_HBarCodeType();
 
             var rowdata = [{
-                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                "HMaterID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "", "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                 "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
             }];
             //鍒濆鍖栬〃鏍�
@@ -335,7 +335,7 @@
                 var AddRow = table.cache['mainTable'];
 
                 var NewRow = {
-                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HMaterID": 0, "HSubID": 0, "HSupID": 0,"HSupNumber": "", "HSupName": "", "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                     "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                 };
                 //console.log(NewRow);
@@ -370,6 +370,7 @@
                         break;
                 }
             });
+
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
@@ -823,6 +824,7 @@
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
             //鍒濆鍖栬〃鍗曟彃浠�
             function set_InitFrom() {
                 laydate.render({
@@ -853,6 +855,7 @@
                     }
                 })
             }
+
             //鑾峰彇宸ュ巶浠g爜
             function set_HWorksNumber() {
                 //鑾峰彇宸ュ巶浠g爜
@@ -878,6 +881,7 @@
                     }
                 })
             }
+
             //鑾峰彇鏉$爜绫诲瀷
             function set_HBarCodeType() {
                 //鑾峰彇鏉$爜绫诲瀷浠g爜
@@ -924,6 +928,12 @@
                     , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
                     , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
                     , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+                    , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                    , { field: 'HSupID', title: '渚涘簲鍟唅d', width: 100, hide: true }
+                    , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: 'HSupNumber', width: 120 }
+                    , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 120 }                   
                     , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
                     , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
                     , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
@@ -932,10 +942,7 @@
                     , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
                     , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
-                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
-                    , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
-                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
-                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }                   
                     , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
@@ -969,6 +976,7 @@
                 option.data = rowdata;
                 table.render(option);
             }
+
             //鍒濆鏉$爜淇℃伅琛ㄦ牸
             function set_CountGrid() {
                 //琛ㄥご
@@ -1008,6 +1016,7 @@
                     }
                 };
             }
+
             //鍒濆鍖栨。妗堝垪琛ㄤ俊鎭〃鏍�
             function set_InitGrid2() {
                 //琛ㄥご
@@ -1077,10 +1086,11 @@
                     }
                 };
             }
+
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 option.data = [{
-                    "HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+                    "HMainID": 0, "HSubID": 0, "HSupID": 0, "HSupNumber": "", "HSupName": "",  "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
                     , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                     , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                     , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
@@ -1089,8 +1099,6 @@
                 table.render(option);
                 //鍒锋柊琛ㄦ牸鏁版嵁
                 DisPlay_HideColumn();
-                //DisPlay_HideColumn1();
-                //DisPlay_HideColumn2();
             }
 
             function set_AddFNew1() {
@@ -1102,17 +1110,13 @@
                 }];
                 table.render(option1);
                 //鍒锋柊琛ㄦ牸鏁版嵁
-                //DisPlay_HideColumn();
                 DisPlay_HideColumn1();
-                //DisPlay_HideColumn2();
             }
 
             function set_AddFNew2() {
                 option2.data = [];
                 table.render(option2);
                 //鍒锋柊琛ㄦ牸鏁版嵁
-                //DisPlay_HideColumn();
-                //DisPlay_HideColumn1();
                 DisPlay_HideColumn2();
             }
 
@@ -1128,6 +1132,7 @@
 
                 return [year, month, day].join('-');
             }
+
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
                 //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
@@ -1146,6 +1151,7 @@
                 //rows++;
                 layer.msg(get_MessageError('[3899-2-005]澧炲姞涓�琛屾寜閽紒', sessionStorage["HTranSlate"]))
             }
+
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
                 data[0].HQty = '';
@@ -1498,6 +1504,7 @@
                     });
                 }
             }
+
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1605,7 +1612,7 @@
 
                                         childData = null;
                                     }
-                                    
+
 
                                     childPage = null;
                                     currRowIndex = 0;
@@ -1614,7 +1621,6 @@
                                 }
                             }
                         }
-
                     }
                     //#endregion
 
@@ -1901,6 +1907,46 @@
                                 }
                             });
                         }
+                        //渚涘簲鍟嗕唬鐮�
+                        if (obj.event === 'HSupNumber')  //渚涘簲鍟嗕唬鐮�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                                btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HSupID: checkStatus.data[0].HItemID,
+                                        HSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�,
+                                        HSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
                         obj.event = "";
                         return false;
                     }
@@ -2125,6 +2171,7 @@
                     }
                 });
             }
+
             //鐧诲綍鏍规嵁ic鍗″彿
             function loginByICCard(HBarCode) {
                 var index = layer.load();

--
Gitblit v1.9.1