From 32099d29dca4874ed255a51206be7a46b7a2fe4c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 20 五月 2025 11:35:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/wrkMast/wrkMast.html   |    2 +-
 src/main/webapp/static/js/wrkMast/wrkMast.js |   41 +++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index cb220cb..0569122 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -268,26 +268,7 @@
                     });
                 });
                 break;
-            case 'priWrkMast':
-                console.log(123)
-                layer.open({
-                    type: 2,
-                    title: '缁存姢宸ヤ綔妗�',
-                    maxmin: true,
-                    area: ['500px', top.detailHeight],
-                    shadeClose: false,
-                    content: 'wrkMast_detail.html',
-                    success: function(layero, index){
-                        layer.getChildFrame('#data-detail-submit-save', index).hide();
-                        setFormVal(layer.getChildFrame('#detail', index), data, false);
-                        // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
-                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                    }
-                });
-                break;
+
         }
     });
 
@@ -343,6 +324,26 @@
                     });
                 }
                 break;
+              case 'priWrkMast':
+                              console.log(123)
+                              layer.open({
+                                  type: 2,
+                                  title: '缁存姢宸ヤ綔妗�',
+                                  maxmin: true,
+                                  area: ['500px', top.detailHeight],
+                                  shadeClose: false,
+                                  content: 'wrkMast_detail.html',
+                                  success: function(layero, index){
+                                      layer.getChildFrame('#data-detail-submit-save', index).hide();
+                                      setFormVal(layer.getChildFrame('#detail', index), data, false);
+                                      // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                                      top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+                                      layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                                      layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                                      layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                                  }
+                              });
+                              break;
             //  鎷f枡鍏ュ簱
             case 'pick':
                 layer.confirm('鎷f枡鍏ュ簱璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 021051d..c368159 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -135,7 +135,7 @@
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
 
 <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 

--
Gitblit v1.9.1