From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表:layui中开发 查看包装明细

---
 WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index 4486268..6ac7d53 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>浜у搧鍣ㄥ叿娓呭崟</title>
+    <title>浜у搧宸ヨ壓鍙傛暟娓呭崟</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -25,14 +25,19 @@
             font-size: 16px;
         }
         /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
-        .layui-table-cell {
+/*        .layui-table-cell {
             overflow: visible !important;
+        }*/
+
+        td:has(select) .layui-table-cell {
+            overflow: visible !important;
+            padding: 0;
         }
         /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
         td .layui-form-select {
             margin-top: -10px;
-            margin-left: -15px;
-            margin-right: -15px;
+          /*  margin-left: -15px;
+            margin-right: -15px;*/
         }
 
         .layui-form-item .layui-inline {
@@ -60,13 +65,13 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -714,6 +719,7 @@
                         "HDataUnit": "绉�",
                         "HDataTimes": "0",
                         "HTechParamClassID": "0",
+                        "HTechParamClassName": "",
                         "HSNO": "0",
                         "HStdNextTimes": "0",
                         "HTechParamIDStd": "0",
@@ -762,7 +768,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgID=' + sessionStorage['Organization'], 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -886,7 +892,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -915,7 +921,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '璁惧缂栫爜琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html', 'yes']
+                    , content: ['../../璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html?openType=2', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -944,7 +950,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes']
+                    , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -994,8 +1000,8 @@
                                             "HTechParamID": rowData.HItemID,
                                             "HTechParamNumber": rowData.宸ヨ壓鍙傛暟浠g爜,
                                             "HTechParamName": rowData.宸ヨ壓鍙傛暟鍚嶇О,
-                                            "HTechParamUnitID": 0,
-                                            "HTechParamUnitName": "",
+                                            "HTechParamUnitID": rowData.HUnitID,
+                                            "HTechParamUnitName": rowData.宸ヨ壓鍙傛暟鍗曚綅,
                                             "HStd": "0",
                                             "HMax": "0",
                                             "HMin": "0",
@@ -1003,7 +1009,8 @@
                                             "HIsRequired": false,
                                             "HDataUnit": "绉�",
                                             "HDataTimes": "0",
-                                            "HTechParamClassID": "0",
+                                            "HTechParamClassID": rowData.HClassID,
+                                            "HTechParamClassName": rowData.宸ヨ壓鍙傛暟澶х被,
                                             "HSNO": "0",
                                             "HStdNextTimes": "0",
                                             "HTechParamIDStd": "0",
@@ -1022,10 +1029,13 @@
                                     if (OptionData.length > 0) {
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         obj.update({
-                                            "HTechParamID": OptionData[0].HItemID,
-                                            "HTechParamNumber": OptionData[0].宸ヨ壓鍙傛暟浠g爜,
-                                            "HTechParamName": OptionData[0].宸ヨ壓鍙傛暟鍚嶇О,
-
+                                            "HTechParamID":         OptionData[0]['HItemID'],
+                                            "HTechParamNumber": OptionData[0]['宸ヨ壓鍙傛暟浠g爜'],
+                                            "HTechParamName": OptionData[0]['宸ヨ壓鍙傛暟鍚嶇О'],
+                                            "HTechParamUnitID": OptionData[0]['HUnitID'],
+                                            "HTechParamUnitName": OptionData[0]['宸ヨ壓鍙傛暟鍗曚綅'],
+                                            "HTechParamClassID": OptionData[0]['HClassID'],
+                                            "HTechParamClassName": OptionData[0]['宸ヨ壓鍙傛暟澶х被'],
                                         });
                                         OptionData = [];
                                     }
@@ -1310,7 +1320,7 @@
             {
 
                 $.ajax({
-                    url: GetWEBURL() + "Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
+                    url: GetWEBURL() + "/Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
                     async: false,
                     type: "GET",
                     data: {
@@ -1348,7 +1358,7 @@
                                 , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
                                 , "HOrgID": tableMain[0].HOrgID
                                 , "HMaker": tableMain[0]["鍒跺崟浜�"]
-                                , "HUpDater": tableMain[0]["淇敼浜�"]
+                                , "HUpdater": tableMain[0]["淇敼浜�"]
                                 , "HChecker": tableMain[0]["瀹℃牳浜�"]
                                 , "HMakeDate": tableMain[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
                                 , "HUpDateDate": tableMain[0]["淇敼鏃堕棿"] == null ? "" : Format(new Date(tableMain[0]["淇敼鏃堕棿"]), "yyyy-MM-dd")
@@ -1356,6 +1366,8 @@
                                 , "HCloseMan": tableMain[0]["鍏抽棴浜�"]
                                 , "HCloseDate": tableMain[0]["鍏抽棴鏃堕棿"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃堕棿"]), "yyyy-MM-dd")
                             });
+
+
                             //瀛愯〃  璧嬪��
                             option.data = tableSub;
                             table.render(option);
@@ -1638,6 +1650,14 @@
             }
         }
 
+        // 鐗╂枡
+        function GetGyMaterial(obj) {
+            $("#HMaterID").val(    obj.HItemID);
+            $("#HMaterNumber").val(obj.鐗╂枡浠g爜);
+            $("#HMaterName").val(  obj.鐗╂枡鍚嶇О);
+            $("#HMaterModel").val( obj.瑙勬牸鍨嬪彿);
+        }
+
         //宸ヨ壓鍙傛暟
         function GetParameterValue(obj) {
             OptionData = obj;

--
Gitblit v1.9.1