From 7dca38e7b698b4648eae0fd98121ff3c3af30f92 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 23 六月 2025 14:59:31 +0800
Subject: [PATCH] 华远: 直方图:点击PCS 设置PCS检验信息功能完善

---
 WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html     |   39 ++++-
 WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit.html                 |   16 +-
 WebTM/views/案例代码/华远/HY_HistogramReport.html                 |    3 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user          |    8 
 WebTM/views/案例代码/华远/HY_HistogramReport_ForPCSCheckNote.html |  257 +++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 290 insertions(+), 33 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index cf2f84d..64a1929 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3656,7 +3656,7 @@
       <publishTime>04/08/2025 10:03:42</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PNLInfoEdit.html">
-      <publishTime>06/23/2025 09:37:48</publishTime>
+      <publishTime>06/23/2025 14:25:58</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PNLInfoList.html">
       <publishTime>06/23/2025 11:02:52</publishTime>
@@ -4909,10 +4909,10 @@
       <publishTime>09/13/2024 15:42:13</publishTime>
     </File>
     <File Include="views/妗堜緥浠g爜/鍗庤繙/HY_HistogramReport.html">
-      <publishTime>06/23/2025 11:17:43</publishTime>
+      <publishTime>06/23/2025 14:28:24</publishTime>
     </File>
     <File Include="views/妗堜緥浠g爜/鍗庤繙/HY_HistogramReport_ForPCSCheckNote.html">
-      <publishTime>06/10/2025 16:46:17</publishTime>
+      <publishTime>06/23/2025 14:35:05</publishTime>
     </File>
     <File Include="views/妗堜緥浠g爜/鍗庤繙/HY_InterfaceTest.html">
       <publishTime>06/20/2025 14:20:44</publishTime>
@@ -6815,7 +6815,7 @@
       <publishTime>06/16/2025 08:38:36</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html">
-      <publishTime>06/23/2025 09:37:48</publishTime>
+      <publishTime>06/23/2025 14:36:14</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempList.html">
       <publishTime>06/23/2025 09:37:48</publishTime>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
index 1303f84..ab79ceb 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoEdit.html"
@@ -54,7 +54,7 @@
                                             <div class="layui-tab-item layui-show">
                                                 <div class="layui-form-item">
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL甯冨眬: </label>
+                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL甯冨眬<label style="color:red"> * </label> </label>
                                                         <div class="layui-input-inline">
                                                             <input type="text" class="layui-input" lay-verify="HLayOutName" name="HLayOutName"
                                                                    id="HLayOutName"
@@ -71,7 +71,7 @@
                                                     </div>
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS鍥炬爣: </label>
+                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS鍥炬爣 </label>
                                                         <div class="layui-input-block" style="margin-left: 77px;">
                                                             <input type="text" class="layui-input" lay-verify="HIcon" name="HIcon"
                                                                    id="HIcon"
@@ -84,19 +84,19 @@
                                                         </div>
                                                     </div>
 
-                                                    <div class="layui-inline">
+                                                    <div class="layui-inline" style="display:none;">
                                                         <label class="layui-form-label">琛屾暟:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HRowCount" id="HRowCount"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
-                                                    <div class="layui-inline">
+                                                    <div class="layui-inline" style="display:none;">
                                                         <label class="layui-form-label">鍒楁暟:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HColCount" id="HColCount"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
@@ -104,7 +104,7 @@
                                                         <label class="layui-form-label">PNL浜岀淮鐮佺儳铓�x鍧愭爣:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HPNLPosition_x" id="HPNLPosition_x"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
@@ -112,7 +112,7 @@
                                                         <label class="layui-form-label">PNL浜岀淮鐮佺儳铓�y鍧愭爣:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HPNLPosition_y" id="HPNLPosition_y"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
index 3ce2a31..3a31689 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
@@ -346,6 +346,9 @@
                                     , area: ["50%", "80%"] //绐椾綋澶у皬
                                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                                     , content: ['./HY_HistogramReport_ForPCSCheckNote.html?HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&PCSNo=" + PCSNo, "yes"]
+                                    , end: function () {
+                                        $("#btnSearch").trigger('click');
+                                    }
                                 })
                             });
                         }
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport_ForPCSCheckNote.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport_ForPCSCheckNote.html"
index cebb46b..51f2591 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport_ForPCSCheckNote.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport_ForPCSCheckNote.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鎵规敼灏忔椂浜ц兘</title>
+    <title>鐩存柟鍥�-PCS妫�楠屼俊鎭淮鎶�</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -11,6 +11,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style>
         /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
         .layui-table-cell {
@@ -33,8 +34,11 @@
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="add" id="add">鏂板</button>
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="edit" id="edit">淇敼</button>
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="delete" id="delete">鍒犻櫎</button>
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="refresh" id="delete">鍒锋柊</button>
                         <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="exit" id="exit">閫�鍑�</button>
                     </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                 </form>
             </div>
         </div>
@@ -46,14 +50,27 @@
         base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable'], function () {
         //#region 鍏叡鍙橀噺
         var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
             , table = layui.table
             , form = layui.form
-            , element = layui.element;
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , soulTable = layui.soulTable;
+
+        var HPageTitle = "";
+        var sWhere = "";
+        var option = [];
+        var titleData = ['sorderid', 'hmainid', 'HInterid'];
+
+        var HModName = "HY_HistogramReport_ForPCSCheckNote";
         //#endregion
 
         //#region 鑾峰彇鍙傛暟淇℃伅
@@ -64,30 +81,250 @@
         var HPCSNo = params[params[2]];         //PCS鍙�
         //#endregion
 
+        set_ClearBill();
+
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-        //#region鎸夐挳鐩戝惉 鏂板
+        //#region 鐐瑰嚮琛岄�変腑楂樹寒
+        table.on('row(mainTable)', function (obj) {
+            //閫変腑琛屾敼鍙橀鑹�
+            var flag = !obj.tr.find(':checkbox:first').prop('checked');
+            obj.tr.find(':checkbox').prop('checked', flag);
+            if (flag) {
+                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            } else {
+                obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+            }
+            //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+            layui.each(table.cache.mainTable, function (i, l) {
+                if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                    l.LAY_CHECKED = flag;
+                }
+            });
+        })
+        //#endregion
+
+        //#region 鎸夐挳鐩戝惉 鏂板
         form.on('submit(add)', function (data) {
-            alert("1");
+            set_AddNew();
         });
         //#endregion
 
-        //#region鎸夐挳鐩戝惉 淇敼
+        //#region 鎸夐挳鐩戝惉 淇敼
         form.on('submit(edit)', function (data) {
-            alert("2");
+            set_ShowBill();
         });
         //#endregion
 
-        //#region鎸夐挳鐩戝惉 鍒犻櫎
+        //#region 鎸夐挳鐩戝惉 鍒犻櫎
         form.on('submit(delete)', function (data) {
-            alert("3");
+            set_DeleteBill();
         });
         //#endregion
 
-        //#region閫�鍑�
+        //#region 鎸夐挳鐩戝惉 鍒锋柊
+        form.on('submit(refresh)', function (data) {
+            get_FastQuery();
+        });
+        //#endregion
+
+        //#region 鎸夐挳鐩戝惉 閫�鍑�
         form.on('submit(exit)', function () {
             Pub_Close(1);
         })
         //#endregion
+
+        //#region 鍒濆鍖栨煡璇�
+        function set_ClearBill() {
+            set_InitGrid();
+            get_FastQuery();
+        }
+        //#endregion
+
+        //#region 鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-130'
+                , page: false
+                , cellMinWidth: 90
+                , limit: 5000
+                , limits: [50, 500, 5000, 20000]
+            }
+        };
+        //#endregion
+
+        //#region 鍒嗛〉鏌ヨ
+        function get_DisplayPage(sWhere) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/QC_CheckNote_PNL_TempController/GetQC_CheckNote_PNL_TempListPage',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": 1, "size": 10000 },
+                success: function (data1) {
+                    if (data1.code == 1) {
+                        var data = [];
+                        var col = [];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(data1.list[key].ColmCols)) {
+                                titleData[key] = data1.list[key].ColmCols;
+                            }
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if (data[i].name === '鏍囪瘑ID') {
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+                                    templet: function (d) {
+                                        return '<span style="color: blue;" lay-unrow >' + d.鏍囪瘑ID + '</span>'
+                                    }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
+                                });
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                        break;
+                                    case 'Decimal':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                        break;
+                                    case 'Int32':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                }
+                            }
+                        }
+
+                        option.cols = [col];
+                        option.data = data1.data;
+                        option.totalRow = true;
+
+                        //鍒楄缃�
+                        DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        table.render(option);
+
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+        //#region 蹇�熻繃婊�
+        function get_FastQuery() {
+            sWhere += " and PNL鏉$爜缂栧彿 = '" + HBarCode_PNL + "'";
+            sWhere += " and set鍙� = '" + HSetNo + "'";
+            sWhere += " and PCS鍙� = '" + HPCSNo + "'";
+
+            //get_Display(sWhere);
+            get_DisplayPage(sWhere);
+            sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+        }
+        //#endregion
+
+        //#region 鏂板
+        function set_AddNew() {
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '鏂板' + HPageTitle,
+                closeBtn: 1,
+                shift: 2,
+                area: ['100%', '100%'],
+                maxmin: true,
+                content: '../../璐ㄩ噺绠$悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html?OperationType=4&linterid=&HSouceBillType=10004&HBarCode_PNL=' + HBarCode_PNL + "&HSetNo=" + HSetNo + "&HPCSNo=" + HPCSNo,
+                end: function () {
+                    //鍒锋柊椤甸潰,
+                    get_FastQuery();
+                },
+                success: function (layero, index) {
+
+                }
+            });
+        }
+        //#endregion
+
+        //#region 缂栬緫
+        function set_ShowBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                var linterid = data[0]['HItemID'];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../璐ㄩ噺绠$悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html?OperationType=5&linterid=' + linterid + '&HSouceBillType=10004'
+                    , end: function () {
+                        get_FastQuery()
+                    }
+                })
+            } else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            }
+        }
+        //#endregion
+
+        //#region 鍒犻櫎
+        function set_DeleteBill() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+
+                //閫昏緫鍒犻櫎鏂规硶
+                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HItemID": data[0]['HItemID'], "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    get_FastQuery();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function (e) {
+                            console.error(e)
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+            }
+        }
         //#endregion
     });
 </script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
index 264b53c..77aa45c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
@@ -46,7 +46,7 @@
                                                 <div class="layui-form-item">
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">鏉$爜缂栧彿:</label>
+                                                        <label class="layui-form-label">鏉$爜缂栧彿<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
                                                             <input type="text" name="HBarCode" id="HBarCode"
                                                                    class="layui-input">
@@ -56,7 +56,7 @@
                                                     </div>
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">set鍙�:</label>
+                                                        <label class="layui-form-label">set鍙�<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
                                                             <input type="text" name="HSetNo" id="HSetNo"
                                                                    class="layui-input">
@@ -64,32 +64,32 @@
                                                     </div>
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">PCS鍙�:</label>
+                                                        <label class="layui-form-label">PCS鍙�<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
                                                             <input type="text" name="HPCSNo" id="HPCSNo"
                                                                    class="layui-input">
                                                         </div>
                                                     </div>
 
-                                                    <div class="layui-inline">
+                                                    <div class="layui-inline" style="display:none;">
                                                         <label class="layui-form-label">PCS琛岀储寮�:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HPosition_x" id="HPosition_x"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
-                                                    <div class="layui-inline">
+                                                    <div class="layui-inline"  style="display:none;">
                                                         <label class="layui-form-label">PCS鍒楃储寮�:</label>
                                                         <div class="layui-input-inline">
                                                             <input type="number" name="HPosition_y" id="HPosition_y"
-                                                                   class="layui-input">
+                                                                   class="layui-input" value="0">
                                                         </div>
                                                     </div>
 
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">妫�楠屽伐搴�:</label>
+                                                        <label class="layui-form-label">妫�楠屽伐搴�<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
                                                             <select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
                                                                 <option value="鐐.VRS鍐呭眰" selected="selected">鐐.VRS鍐呭眰</option>
@@ -101,7 +101,7 @@
                                                     </div>
 
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">姝e弽闈�:</label>
+                                                        <label class="layui-form-label">姝e弽闈�<label style="color:red"> * </label></label>
                                                         <div class="layui-input-inline">
                                                             <select name="HPageIndex" lay-filter="HPageIndex" id="HPageIndex">
                                                                 <option value="姝i潰" data-value="1" selected="selected">姝i潰</option>
@@ -164,6 +164,9 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var HBarCode_PNL = params[params[3]]; //PNL鏉$爜缂栧彿
+            var HSetNo = params[params[4]]; //set鍙�
+            var HPCSNo = params[params[5]]; //PCS鍙�
         }
 
         layui.config({
@@ -208,6 +211,20 @@
             }
             else if (OperationType == 3) {//缂栬緫
                 roadBillMain();
+            } else if (OperationType == 4) {//鐩存柟鍥炬柊澧�
+                set_AddFNew();
+                $("#HBarCode").val(HBarCode_PNL);
+                $("#HSetNo").val(HSetNo);
+                $("#HPCSNo").val(HPCSNo);
+
+                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
+                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
+                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
+            } else if (OperationType == 5) {//鐩存柟鍥剧紪杈�
+                roadBillMain();
+                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
+                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
+                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
             }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -226,9 +243,9 @@
 
                 debugger
                 let url = GetWEBURL()
-                if (OperationType == 3) {
+                if (OperationType == 3 || OperationType == 5) {
                     url += "/QC_CheckNote_PNL_TempController/EditBill"
-                } else if (OperationType == 1 || OperationType == 2) {
+                } else if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                     url += "/QC_CheckNote_PNL_TempController/AddBill"
                 }
                 $.ajax(

--
Gitblit v1.9.1