From 0a7e007b32518c5e1f1bc9ca64da2c747d28d592 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 25 二月 2025 14:06:03 +0800
Subject: [PATCH] 提料计划信息列表: 退出 设置为需要进行确认 子表弹窗选择的地方设置为可以双击返回

---
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           |    2 +-
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html |   50 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 3ca2147..a4ead85 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5071,7 +5071,7 @@
       <publishTime>02/25/2025 13:54:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html">
-      <publishTime>03/28/2024 10:03:22</publishTime>
+      <publishTime>02/25/2025 14:04:31</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Excel.html">
       <publishTime>09/14/2023 13:59:10</publishTime>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index d9dd126..8bf4498 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -70,7 +70,7 @@
     </script>
 
     <script>
-
+        var HDataEmp = {};
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -222,11 +222,14 @@
 
             //閫�鍑�
             form.on('submit(Cancel)', function () {
-                if ((OperationType == 1 ) || OperationType == 3) {
-                    Pub_Close(1);
-                } else {
-                    Pub_Close(2);
-                }
+                //閫昏緫鍒犻櫎鏂规硶
+                layer.confirm("閫�鍑哄墠璇风‘淇濇暟鎹凡淇濆瓨锛屾槸鍚︾户缁��鍑猴紵", { title: "閫�鍑虹‘璁�" }, function (index) {
+                    if ((OperationType == 1) || OperationType == 3) {
+                        Pub_Close(1);
+                    } else {
+                        Pub_Close(2);
+                    }
+                })
             })
 
             //淇濆瓨鎻愪氦
@@ -318,7 +321,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', "yes"]
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -336,10 +339,22 @@
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
+                                , end: function () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HSupplierID": HDataEmp.HItemID
+                                            , "HSupplierNumber": HDataEmp.渚涘簲鍟嗕唬鐮�
+                                            , "HSupplierName": HDataEmp.渚涘簲鍟嗗悕绉�
+                                        })
+                                        HDataEmp = {};
+                                    }
+                                }
                             })
                         }
                         //鐗╂枡
                         if (obj.event == "HMaterID") {
+                            var HOrgID = $("#HPRDORGID").val();
                             //鎵撳紑鐗╂枡  灏忕獥浣�
                             layer.open({
                                 type: 2
@@ -349,7 +364,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -368,6 +383,18 @@
                                         , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HMaterID": HDataEmp.HItemID
+                                            , "HMaterNumber": HDataEmp.鐗╂枡浠g爜
+                                            , "HMaterName": HDataEmp.鐗╂枡鍚嶇О
+                                            , "HMaterModel": HDataEmp.瑙勬牸鍨嬪彿
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
                         }
@@ -454,7 +481,14 @@
 
         });
 
+        function GetHSupNameValue(obj) {
+            HDataEmp = obj[0];
+        }       //渚涘簲鍟�
 
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
+        {
+            HDataEmp = obj;
+        }
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1