From 22ae2a27d1f66c6acbb126fdbd3d1446b6837acb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 16 四月 2023 21:52:37 +0800
Subject: [PATCH] 合并

---
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index 51f8b80..ff2f6c8 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -75,17 +75,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鑱屽姟</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
-                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+                                        
 
                                     </div>
                                     <div class="layui-row">
@@ -449,7 +439,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">宀椾綅</label>
                                             <div class="layui-input-inline">
@@ -461,8 +451,17 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽姟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
+                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鐝粍</label>
                                             <div class="layui-input-inline">
@@ -474,7 +473,10 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                        <!--<div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">璐濆+杈鹃儴闂�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
@@ -484,7 +486,7 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
@@ -579,7 +581,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杞彮璋冧紤鏍囧織</label>
                                             <div class="layui-input-inline">
-                                                <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁璋冧紤">
+                                                <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁杞彮璋冧紤">
                                                 <input type="hidden" value="false" name="HShiftFlag" id="HShiftFlag">
                                             </div>
                                         </div>

--
Gitblit v1.9.1