From ddb3b1afa070cdbd7b77e8fcaf4218874561f80e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 14:54:57 +0800
Subject: [PATCH] 条码生成页面添加工号,条码日期;送货物料新增页面添加长度过滤

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
index 9736ad5..00c96da 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -181,9 +181,10 @@
                     , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
 /*                   , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
                     , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
-                  , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120, }
+                    , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120, }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: 'HStatusMan', title: '宸ュ彿', width: 120, edit: 'text' }
                     , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
                     , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, event: "inputHMinQty" }
                     , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 } 
@@ -192,8 +193,9 @@
                     , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
                     , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
                     , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
-                    , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100, templet: '#barCodeTypeTpl' }  
-                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
+                    , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100, templet: '#barCodeTypeTpl', hide: true }
+                    , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
+                    , { field: 'HBarCodeDate', title: '鏉$爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
                     , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, event: "inputHKFPeriod", hide: true }//
                     , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true }//, event: "chooseHKFDQDate"
                     , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
@@ -235,6 +237,7 @@
                         , { field: 'HSubjoin', title: '鐗╂枡浠g爜', width: 120, hide: true }
                         , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
                         , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                        , { field: 'HStatusMan', title: '宸ュ彿', width: 120, edit: 'text'}
                         , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
                         , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100, event: "inputHMinQty" }
                         , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
@@ -243,7 +246,8 @@
                         , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
                         , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
                         , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
-                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100 }
+                        , { field: 'HBarCodeDate', title: '鏉$爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate', event: "chooseHBarCodeDate" }
+                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100, hide: true }
                         , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }//, event: "chooseHKFDate"
                         , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }//
                         , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDQDate', hide: true}//, event: "chooseHKFDQDate"
@@ -294,6 +298,7 @@
                                     "HSupName": data[i].渚涘簲鍟嗗悕绉�,
                                     "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
                                     "HQty": 1, // 榛樿鐢熸垚鏉$爜鏁伴噺
+                                    "HBarCodeDate": data[i].鏉$爜鏃ユ湡,
                                     "biaoqianzhangshu": 1 // 鏍囩寮犳暟
                                 });
                             }
@@ -392,6 +397,18 @@
                             data[field] = value;
                             obj.update(data);
 
+                        }
+                    });
+                }
+                else if (obj.event == 'chooseHBarCodeDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
                         }
                     });
                 }
@@ -594,28 +611,31 @@
                                     , defaultToolbar: ['filter', 'exports']
                                     , limit: 500
                                     , cols: [[
-                                        { field: 'HBarCode', title: '鏉$爜', width: 230, ellipsis: true }
+                                        { field: 'HLSH', title: '娴佹按鍙�', align: 'center', width: 150, data_field: 'HBarCodeDate' }
+                                        , { field: 'HBarCode', title: '鏉$爜', width: 230, ellipsis: true }
                                         , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                                         , { field: 'HBarItemID', title: '鏉$爜ID', width: 100, hide: true }
                                         , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
 /*                                        , { field: 'LSH', title: '娴佹按鍙�', width: 120 }*/
                                         /*                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }*/
-                                        , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120 }
-                                        , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120, hide: true }
+                                        , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120, hide: true }
+                                        , { field: 'HSubjoin', title: '鐗╂枡绠�绉�', width: 120 }
                                         , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120, hide: true }
                                         , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
+                                        , { field: 'HStatusMan', title: '宸ュ彿', width: 120 }
                                         , { field: 'HQty', title: '鏈鐢熸垚鏉$爜鏁伴噺', width: 135 }
                                         , { field: 'HMinQty', title: '鏍囧噯鍖呰鏁帮紙鍐呯瑁呯鏁帮級', width: 100 }
                                         , { field: 'HBQty', title: '鏈�灏忓寘瑁呮暟锛堝唴绠辨暟锛�', width: 100 }
                                         , { field: 'biaoqianzhangshu', title: '鏍囩寮犳暟', width: 100 }
-                                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 100 }
+                                        , { field: 'HBarCodeDate', title: '鏉$爜鏃ユ湡', align: 'center', width: 150, data_field: 'HBarCodeDate' }
+                                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 100, hide: true }
                                         , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
                                         , { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, hide: true }
                                         , { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, hide: true }
-                                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100 }
-                                        , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDate"
-                                        , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }//
-                                        , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150 }//, event: "chooseHKFDQDate"
+                                        , { field: 'HSourceBillType', title: '鏉$爜绫诲瀷', width: 100, hide: true }
+                                        , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDate"
+                                        , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true}//
+                                        , { field: 'HKFDQDate', title: '鍒版湡鏃ユ湡', align: 'center', width: 150, hide: true }//, event: "chooseHKFDQDate"
                                         , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 150, hide: true }
                                         , { field: 'HSupName', title: '渚涘簲鍟嗗悕绉�', width: 150, hide: true }
 
@@ -661,7 +681,10 @@
                                                         "HSupName": data[i].渚涘簲鍟嗗悕绉�,
                                                         "HEXPUNIT": data[i].淇濊川鏈熷崟浣�,
                                                         "HQty":data[i].鐢熸垚鏉$爜鏁伴噺 , // 鏈鐢熸垚鏉$爜鏁伴噺
-                                                        "biaoqianzhangshu": 1
+                                                        "biaoqianzhangshu": 1,
+                                                        "HStatusMan": data[i].宸ュ彿,
+                                                        "HBarCodeDate": data[i].鏉$爜鏃ユ湡,
+                                                        "HLSH": data[i].娴佹按鍙�,
                                                     });
                                                 
                                                 
@@ -833,7 +856,7 @@
             //鑾峰彇渚涘簲鍟咺D
             function FetchSupInfo() {
                 var sWhere = "";
-                //var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+                var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
                 $.ajax({
                     url: GetWEBURL() + "/Gy_Supplier/list",
                     type: "GET",

--
Gitblit v1.9.1