From baa980a58e7fa79fcab8a610f8d02a48c1b3e8ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 10 五月 2024 17:39:14 +0800
Subject: [PATCH] 1.发货通知单,销售出库单 选单后,给子表 仓库 赋值 2.销售订单列表 增加子表 仓库ID与名称字段 已隐藏

---
 WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html |  180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 170 insertions(+), 10 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 0c86873..a786870 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -120,6 +120,39 @@
                                             </td>
                                         </tr>
                                         <tr>
+                                            <th>鏈�缁堢粨璁�</th>
+                                            <td class="bz_td">
+                                                <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
+                                                <input type="radio" name="HLastResult" value="NG" title="NG">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>寮傚父鎯呭喌<br />璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HErrNote" class="layui-input LineHeight" id="HErrNote" placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>閲嶅ぇ瀹夊叏<br />闅愭偅璁板綍</th>
+                                            <td class="bz_td" style="margin-top:10px;">
+                                                <input type="text" name="HBigSafeNote" class="layui-input LineHeight" id="HBigSafeNote" placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐐规鏁版嵁</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HDotCheckNote" class="layui-input LineHeight" id="HDotCheckNote" placeholder="璇疯緭鍏ョ偣妫�鏁版嵁" style="border-radius: 50px;">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>鐢熶骇鐝</th>
+                                            <td class="bz_td">
+                                                <input type="text" name="HShiftsName" class="layui-input LineHeight" id="HShiftsName" placeholder="閫夋嫨鐢熶骇鐝" style="background-color:#efefef4d;">
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnShifts" id="btnShifts" style="font-weight:bolder">...</button>
+                                            </td>
+                                        </tr>
+                                        <tr>
                                             <th>鍗�&ensp;鎹�&ensp;鍙�</th>
                                             <td class="bz_td">
                                                 <input type="text" name="HBillNo" class="layui-input LineHeight" id="HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" style="border-radius: 50px;background-color:#EDEDED;" readonly>
@@ -279,6 +312,14 @@
     <script type="text/html" id="HDotCheckResult">
         <input type="checkbox" value="{{d.HDotCheckResult}}" lay-skin="primary" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HDotCheckResult" {{ d.HDotCheckResult == 1 ? 'checked' : '' }}>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(鐐规缁撴灉)-->
+    <!--<script type="text/html" id="HDotCheckResult">
+        <select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}">-->
+            <!--<option value="">璇烽�夋嫨</option>-->
+            <!--<option value="Y" selected>Y</option>
+            <option value="X">X</option>
+        </select>
+    </script>-->
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -354,8 +395,8 @@
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
-               
+                var NewRow = { "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""};
+
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -475,7 +516,7 @@
                 // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
                 $("#formData")[0].reset();
                 layui.form.render();
-                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
+                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                 table.render(option);
 
                 $("#HBarCode").focus();
@@ -541,6 +582,41 @@
                     }
                 });
             });
+            
+            //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+            form.on('submit(btnShifts)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇鐝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true
+                    , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            });
 
             //琛ㄥご淇℃伅璁惧淇濆吇瑙勭▼
             form.on('submit(HEquipDotCheckRuleInterist)', function () {
@@ -588,7 +664,7 @@
                                 var BYData = result;//
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var data = result.data;
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                                 table.render(option);
 
                                 if (BYData.data.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -599,7 +675,7 @@
                                         var checkrow = {
                                             "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
                                             "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
-                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": false
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -609,7 +685,7 @@
                                 }
                             }
                             else {
-                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                                option.data = [{ "HDotCheckResult": false,"HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                                 table.render(option);
                                 layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
                             }
@@ -629,6 +705,11 @@
                     , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
                     , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+                    , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
+                    //, { field: 'HDotCheckResult', title: '鐐规缁撴灉', templet: '#HDotCheckResult', event: 'HDotCheckResult' }
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -636,8 +717,8 @@
                     , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', hide: true }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true}
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true}
+                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', hide: true }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', hide: true }
                     , { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
                 ];
                 option = {
@@ -654,7 +735,7 @@
                     }
                 };
 
-                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
+                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""}];
                 table.render(option);
             }
             //澧炲姞涓�琛�
@@ -787,7 +868,7 @@
                                     {
                                         "HDotCheckResult": data[i].榛樿缁撹, "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠g爜, "HDotCheckItem": data[i].鐐规椤圭洰鍚嶇О,
                                         "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�,
-                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�
+                                        "HManagerName": data[i].璐熻矗浜哄悕绉�, "HSourceInterID": data[i].鐐规璁″垝ID, "HSourceEntryID": data[i].鐐规璁″垝瀛怚D, "HSourceBillNo": data[i].鐐规璁″垝鍗�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
                                     }
                                 );
                             }
@@ -797,6 +878,85 @@
                     }
                 })
             }
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {                        
+                        if (obj.event === 'HDotCheckItemClassName')  //鐐规椤圭洰鍒嗙被
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , 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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemClassID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+                        if (obj.event === 'HDotCheckItemMethodName')  //鐐规鏂规硶
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐐规鏂规硶鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true
+                                , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html', 'yes']
+                                , btn: ['纭畾', '鍙栨秷']
+                                , 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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+                                        HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+
+                })
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
     </script>

--
Gitblit v1.9.1