diff --git a/public/html/userForm.html b/public/html/userForm.html
index 87eeac6..3c5e037 100644
--- a/public/html/userForm.html
+++ b/public/html/userForm.html
@@ -135,7 +135,7 @@
                             <input id="orgName" type="text" placeholder="请选择分公司" jyValidate="required"
                                    readonly
                                    value="" class="FormElement ui-widget-content ui-corner-all"
-                                   onclick="showRole(); return false;"/>
+                                   />
                             <input type="hidden" id="orgId" name="orgId" value="">
                             <input type="hidden" id="companyId" name="companyId" value="">
                             <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD"
@@ -204,7 +204,7 @@
                         <div style="border: 0.5px solid #E6E6E6;height: 37px;text-indent: 10px;">
                             <input class="FormElement ui-widget-content ui-corner-all" id="departmentldlz"
                                    readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
-                                   onclick="showRoleLdlz(); return false;"
+
                                    style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
                             <input type="hidden" id="departmentIdldlz" name="departmentIdldlz">
                             <div id='orgContentldlz' class="menuContent ztreeMC">
@@ -235,10 +235,10 @@
                         <div style="border: 0.5px solid #E6E6E6;height: 37px;text-indent: 10px;">
                             <input class="FormElement ui-widget-content ui-corner-all" id="department"
                                    readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
-                                   onclick="showRoleCzl(); return false;"
+
                                    style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
                             <input type="hidden" id="departmentId" name="departmentId">
-                            <div id='orgContentCzl' class="menuContent ztreeMC">
+                            <div id='orgContentCzl' class="menuContent ztreeMC" style="display: none;position: absolute;width: 99%;">
                                 <ul id="departmentTree" class="ztree accountOrgTree"></ul>
                             </div>
                         </div>
@@ -276,7 +276,6 @@
 <script type="text/javascript" src="../login/js/companyTreeCzl.js"></script>
 <script type="text/javascript" src="../login/js/companyTreeLdlz.js"></script>
 
-
 <script type="text/javascript">
     var form1;
     var companyIds;
@@ -329,15 +328,11 @@
                     // 检查是否至少有一个承载力被选中
                     var czlChecked = $('#czl_1').is(':checked') || $('#czl_2').is(':checked');
                     $('#czlqx').toggle(czlChecked);
-                    getRoleCzl(form, null);
-                    loadOrgTree();
                 } else if (value == '4' || value == '5') {
                     var smzChecked = $('#smz_1').is(':checked') || $('#smz_2').is(':checked');
                     $('#smzqx').toggle(smzChecked)
                 } else if (value == '3') {
                     $('#ldlzqx').toggle(checked);
-                    getRoleLdlz(form, null);
-                    loadOrgTreeLdlz();
                 }
             }
             form1.render();
@@ -376,13 +371,13 @@
                     } else if (!$('#roles').val()) {
                         showError($('#roles'), '请选择角色！');
                         hasError = true;
-                    } else if (!$('#proId').val()) {
+                    } else if (!$('#proId').val() && $('#idNumber').val()) {
                         showError($('#proId'), '请选择工程名称！');
                         hasError = true;
-                    } else if (!$('#subId').val()) {
+                    } else if (!$('#subId').val() && $('#idNumber').val()) {
                         showError($('#subId'), '请选择分包商！');
                         hasError = true;
-                    } else if (!$('#teamId').val()) {
+                    } else if (!$('#teamId').val() && $('#idNumber').val()) {
                         showError($('#teamId'), '请选择班组！');
                         hasError = true;
                     }
@@ -391,8 +386,42 @@
                     }
                 }
 
+                if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+                    var hasError = false;
+                    if (!$('#departmentId').val()) {
+                        showError($('#department'), '请选择部门！');
+                        hasError = true;
+                    }else if (!$('#roleIdCzl').val()) {
+                        showError($('#roleIdCzl'), '请选择角色！');
+                        hasError = true;
+                    }
+                    if (hasError) {
+                        return false; // 阻止提交
+                    }
+                }
+                if ($('#ldlz').is(':checked')){
+                    var hasError = false;
+                    if (!$('#departmentIdldlz').val()) {
+                        showError($('#departmentldlz'), '请选择部门！');
+                        hasError = true;
+                    }else if (!$('#roleIdLdlz').val()) {
+                        showError($('#roleIdLdlz'), '请选择角色！');
+                        hasError = true;
+                    }
+                    if (hasError) {
+                        return false; // 阻止提交
+                    }
+                }
 
-                add(data); // 触发你的提交函数
+               if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+                   addCzl(data); // 触发你的提交函数
+               }
+               if ($('#ldlz').is(':checked')) {
+                   addLdlz(data); // 触发你的提交函数
+                   if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
+                       add(data); // 触发你的提交函数
+                   }
+               }
             } else {
                 layer.msg('请选择系统类型！', {icon: 5});
             }
@@ -402,6 +431,46 @@
 
     function add(data) {
         var fieldData = data.field || {};
+
+        //构建实名制json数据
+        var smzJson = {
+            userName: fieldData.userName || null,
+            loginName: fieldData.loginName || null,
+            userPhone: fieldData.phone || null,
+            orgId: fieldData.orgId || null,
+            proId: fieldData.proId || null,
+            subId: fieldData.subId || null,
+            roleId: fieldData.roleId || null,
+            type: roleType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
+            dataType: fieldData.permissionType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
+            sex: fieldData.sex || null,
+            teamId: fieldData.teamId || null,
+            idCard: fieldData.idNumber || null,
+            isAdmin: fieldData.isAdmin || null
+        };
+        // 构建承载力json数据
+        var ldlzJson = {
+            userName: fieldData.userName || null,
+            loginName: fieldData.loginName || null,
+            userPhone: fieldData.phone || null,
+            orgId: fieldData.departmentIdldlz || null,
+            roleId: fieldData.roleIdLdlz || null
+        };
+        // 承载力
+        var czlJson = {
+            userName: fieldData.userName || null,
+            loginName: fieldData.loginName || null,
+            userPhone: fieldData.phone || null,
+            orgId: fieldData.departmentId || null,
+            roleId: fieldData.roleIdCzl || null
+        };
+
+        var jsonData = {
+            smz: smzJson,
+            ldlz: ldlzJson,
+            czl: czlJson
+        }
+
         // 构建请求参数
         var requestData = {
             userName: fieldData.userName || null,
@@ -416,7 +485,64 @@
             sex: fieldData.sex || null,
             teamId: fieldData.teamId || null,
             idCard: fieldData.idNumber || null,
-            isAdmin: fieldData.isAdmin || null
+            isAdmin: fieldData.isAdmin || null,
+            jsonData: JSON.stringify(jsonData)
+        };
+        $.ajax({
+            type: 'post',
+            url: request_url + '/realname/publicLogin/addUserData',
+            contentType: "application/json; charset=utf-8",
+            data: JSON.stringify(requestData),
+            success: function (data) {
+                if (data.code != 200) {
+                    layer.msg(data.msg);
+                    return;
+                } else {
+                    layer.msg(data.msg);
+                    parent.layer.close();
+                }
+            }
+        });
+    }
+
+    // 承载力添加用户
+    function addCzl(data) {
+        var fieldData = data.field || {};
+        // 构建请求参数
+        var requestData = {
+            userName: fieldData.userName || null,
+            loginName: fieldData.loginName || null,
+            userPhone: fieldData.phone || null,
+            orgId: fieldData.departmentId || null,
+            roleId: fieldData.roleIdCzl || null
+        };
+        $.ajax({
+            type: 'post',
+            url: czl_ht_url + '/publicLogin/addUser',
+            contentType: "application/json; charset=utf-8",
+            data: JSON.stringify(requestData),
+            success: function (data) {
+                if (data.code != 200) {
+                    layer.msg(data.msg);
+                    return;
+                } else {
+                    layer.msg(data.msg);
+                    parent.layer.close();
+                }
+            }
+        });
+    }
+
+    // 领导履职添加用户
+    function addLdlz(data) {
+        var fieldData = data.field || {};
+        // 构建请求参数
+        var requestData = {
+            userName: fieldData.userName || null,
+            loginName: fieldData.loginName || null,
+            userPhone: fieldData.phone || null,
+            orgId: fieldData.departmentIdldlz || null,
+            roleId: fieldData.roleIdLdlz || null
         };
         $.ajax({
             type: 'post',
diff --git a/public/login/js/treeBind.js b/public/login/js/treeBind.js
index c6fd4e0..946b569 100644
--- a/public/login/js/treeBind.js
+++ b/public/login/js/treeBind.js
@@ -17,6 +17,9 @@ function bindTreeSelector(options) {
             type: "post",
             url: ajaxUrl,
             dataType: "json",
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (res) {
                 $.fn.zTree.init($("#" + treeId), {
                     view: { dblClickExpand: false, selectedMulti: false, nameIsHTML: true },
diff --git a/public/public.js b/public/public.js
index 633c1ca..b043acf 100644
--- a/public/public.js
+++ b/public/public.js
@@ -1,7 +1,8 @@
 let web_url="http://127.0.0.1:8848"
 
 let contentPath="/hn_cloud_web";
-let request_url="http://192.168.0.38:42880"
+// let request_url="http://192.168.0.38:42880"
+let request_url="http://127.0.0.1:42880"
 //承载力大屏
 let czl_url= request_url+"/czldp";
 //承载力后台
diff --git a/smz-web/css/work/person/faceContrast/faceContrastDetail.css b/smz-web/css/work/person/faceContrast/faceContrastDetail.css
index 1db60d5..284be3a 100644
--- a/smz-web/css/work/person/faceContrast/faceContrastDetail.css
+++ b/smz-web/css/work/person/faceContrast/faceContrastDetail.css
@@ -144,6 +144,21 @@ body,html{
     margin-top: 0.5%;
     margin-left: 0.5%;
 }
+
+.test6{
+    width: 240px;
+    height: 33px;
+    display:block;
+    float: left;
+    background: none;
+    border: 1px solid #D9D9D9;
+    color: #000;
+    text-align: center;
+    margin-top: 0.5%;
+    margin-left: 1.5%;
+}
+
+
 #keyWord{
     width: 120px;
     height: 30px;
@@ -156,16 +171,20 @@ body,html{
     color: #000;
 }
 #query{
-    width: 4%;
-    height: 77.5%;
     float: left;
     margin-top: 0.5%;
     margin-left: 1%;
-    border: 0;
-    background-color: transparent;
-    outline:none;
-    background-image: url(../../../../img/info/查询.png);
-    background-repeat: no-repeat;
+    height: 33px;
+    line-height: 33px;
+    padding: 0 13px;
+    background-color: #009688;
+    color: #fff;
+    white-space: nowrap;
+    text-align: center;
+    font-size: 14px;
+    border: none;
+    border-radius: 2px;
+    cursor: pointer;
 }
 /* #reset{
 	width: 4%;
@@ -231,4 +250,4 @@ body,html{
 /**
  * 表数据过长添加  JS width 不要使用百分比
  */
-.table {table-layout:fixed;word-break:break-all;}
\ No newline at end of file
+.table {table-layout:fixed;word-break:break-all;}
diff --git a/smz-web/js/work/managementReview/managementResultsView.js b/smz-web/js/work/managementReview/managementResultsView.js
index ff10986..8bd996c 100644
--- a/smz-web/js/work/managementReview/managementResultsView.js
+++ b/smz-web/js/work/managementReview/managementResultsView.js
@@ -452,8 +452,8 @@ function del() {
 	})
 }
 function update(){
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: '修改',
 		type: 2,
@@ -520,8 +520,8 @@ function noPass() {
 
 
 function view(id) {
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: ['异常','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
 		type: 2,
@@ -536,8 +536,8 @@ function view(id) {
 	});
 }
 function xianxia() {
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var rewordNum=$("#rewordNum").val();
 	localStorage.setItem("mrewordNum",rewordNum);
 	localStorage.setItem("xianxiaindex",rewordNum);
@@ -569,8 +569,8 @@ function packageDownload() {
  * 查看流程
  */
 function processView(){
-	var height = '100%';
-	var width = '70%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: '流程说明',
 		type: 2,
@@ -597,4 +597,4 @@ function reloading() {
 	parent.layer.closeAll();
 	layer.closeAll();
 	window.parent.example.ajax.reload(null, false); // 刷新页面
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/managementReview/managementReviewList.js b/smz-web/js/work/managementReview/managementReviewList.js
index 0b84802..ed11f2a 100644
--- a/smz-web/js/work/managementReview/managementReviewList.js
+++ b/smz-web/js/work/managementReview/managementReviewList.js
@@ -207,8 +207,8 @@ function init() {
 function view(id) {
     localStorage.setItem("pageType", "查看");
     localStorage.setItem("uprewordNum", id);
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: '详情',
         type: 2,
@@ -258,7 +258,7 @@ function del(id) {
 
 // 详情按钮
 function buttonView(id) {
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 // 编辑按钮
diff --git a/smz-web/js/work/ownPerson/Announcement.js b/smz-web/js/work/ownPerson/Announcement.js
index 171ed96..e6d3d21 100644
--- a/smz-web/js/work/ownPerson/Announcement.js
+++ b/smz-web/js/work/ownPerson/Announcement.js
@@ -5,98 +5,26 @@ let layer;
 var remarkShowLength = 50;//默认现实的字符串长度
 layui.use(['laydate','form','layer'], function () {
     layer = layui.layer;
+
     var laydate = layui.laydate;
     pers = checkPermission();
 
-    var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01
-    var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31
-    $('#startTime').val(getNowTime());
-    $('#endTime').val(getNowTime());
-    var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框
-    var endChange = function (val, date) {
-        if (date && date.year)
-            begindate.config.max = {
-                year: date.year,
-                month: date.month - 1,//必须减1才是正确值
-                date: date.date,
-                hours: date.hours,
-                minutes: date.minutes,
-                seconds: date.seconds
-            };
-        else {
-            var dateInit = new Date(maxListDate.replace(/-/g, "/"));
-            begindate.config.max = {
-                year: dateInit.getFullYear(),
-                month: dateInit.getMonth(),
-                date: dateInit.getDate(),
-                hours: dateInit.getHours(),
-                minutes: dateInit.getMinutes(),
-                seconds: dateInit.getSeconds()
-            };
-        }
-    };
-    var beginChange = function (val, date) {
-        if (date && date.year)
-            enddate.config.min = {
-                year: date.year,
-                month: date.month - 1,
-                date: date.date,
-                hours: date.hours,
-                minutes: date.minutes,
-                seconds: date.seconds
-            };
-        else {
-            var dateInit = new Date(minListDate.replace(/-/g, "/"));
-            enddate.config.min = {
-                year: dateInit.getFullYear(),
-                month: dateInit.getMonth(),
-                date: dateInit.getDate(),
-                hours: dateInit.getHours(),
-                minutes: dateInit.getMinutes(),
-                seconds: dateInit.getSeconds()
-            };
-        }
-    };
-    var enddate = laydate.render({
-        elem: end,
-        format: 'yyyy-MM-dd',
-        min: minListDate,
-        max: maxListDate,
-        done: endChange
-    });
-    var begindate = laydate.render({
-        elem: begin,
-        format: 'yyyy-MM-dd',
-        min: minListDate,
-        max: maxListDate,
-        done: beginChange
-    });
-    $("#searchBt").click(function () {
-        var ggbt = $("#ggbt").val();
-        var startTime = $("#startTime").val();
-        var endTime = $("#endTime").val();
-        var dateStart = new Date(startTime);
-        var dateEnd = new Date(endTime);
-        var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24);
-        if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) {
-            return top.layer.msg('时间填写不完整', {
-                icon: 2,
-                time: 2000 //2秒关闭（如果不配置，默认是3秒）
-            });
-        }
-        var startDateTemp = startTime.split("-");
-        var endDateTemp = endTime.split("-");
-        var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]);
-        var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]);
-        if (allStartDate.getTime() > allEndDate.getTime()) {
-            return top.layer.msg('时间选择不合理，请重新选择', {
-                icon: 2,
-                time: 2000 //2秒关闭（如果不配置，默认是3秒）
-            });
-        }
+    var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式
+    $('#test6').val(today + ' - ' + today);
+    laydate.render({
+        elem: '#test6',
+        range: true,
+        min: $('#hidMinListDate').val(),
+        max: $('#hidMaxListDate').val()
     });
+
+
     init();
     $("#searchBt").click(function () {
+        var dateRange = $.trim($('#test6').val());
+        if (!dateRange) {
+            return layer.msg('请选择日期范围', { icon: 2, time: 2000 });
+        }
         example.ajax.reload();
     });
 });
@@ -125,9 +53,14 @@ function init() {
                 "url": smz_ht_url + "/Announcement",
                 "type": "get",
                 "data": function (d) {
+                    var dateRange = $.trim($('#test6').val());
+                    var parts = dateRange.split(' - ');
+                    var startTime = parts[0];
+                    var endTime = parts[1];
+
                     d.ggbt = $("#ggbt").val();
-                    d.startTime = $("#startTime").val();
-                    d.endTime = $("#endTime").val();
+                    d.startTime = startTime;
+                    d.endTime = endTime;
                 },
                 "error": function (xhr, textStatus, errorThrown) {
                     var msg = xhr.responseText;
@@ -250,8 +183,8 @@ function del(id) {
  * 新增页面
  * */
 function insertAnnouncement() {
-    var height = '600px';
-    var width = '1200px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -327,4 +260,4 @@ function getNowTime() {
     var month = time.getMonth() + 1 >= 10 ? time.getMonth() + 1 : '0' + (time.getMonth() + 1);
     var day = time.getDate() >= 10 ? time.getDate() : '0' + time.getDate();
     return year + "-" + month + "-" + day;
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/contractNumber.js b/smz-web/js/work/ownPerson/contractNumber.js
index a7d8efa..86aec48 100644
--- a/smz-web/js/work/ownPerson/contractNumber.js
+++ b/smz-web/js/work/ownPerson/contractNumber.js
@@ -111,8 +111,8 @@ function init(){
  * 编辑页面
  */
 function edit(id) {
-    var height = '85%';
-    var width = '85%';
+    var height = '30%';
+    var width = '30%';
     var index = layer.open({
         title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -144,6 +144,6 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/contractView.js b/smz-web/js/work/ownPerson/contractView.js
index 3ab6870..ebf6bb0 100644
--- a/smz-web/js/work/ownPerson/contractView.js
+++ b/smz-web/js/work/ownPerson/contractView.js
@@ -89,16 +89,7 @@ var Base64 = {
     }
 }
 
-// var filePreviewPathAll = "http://140.210.195.210:8012/onlinePreview?url=";
-// var filePreviewPathAll = "http://192.168.0.204:8012/onlinePreview?url=";
-// var filePath = localStorage.getItem("url");
 var filePreviewPath = smz_ht_url ;
-// var filePreviewPathAll ="http://140.210.209.102:1918/hnBmw"; //部署上线地址
-// var filePreviewPathAll ="http://116.63.172.211:1918/hnBmw";  //线上正式环境--外网
-// var filePreviewPathAll ="http://172.16.0.235:1918/hnBmw";  //线上正式环境--内网
-var filePreviewPathAll ="http://192.168.0.14:19118/hnBmw";  //公司测试地址
-// var dataPath ="http://101.201.61.123:19118/hnBmw";  //外围公司测试地址
-
 
 var downloadFileName = localStorage.getItem("downloadFileName");
 var filePreviewPath;
diff --git a/smz-web/js/work/ownPerson/corporationMag.js b/smz-web/js/work/ownPerson/corporationMag.js
index c16156f..8bab5ad 100644
--- a/smz-web/js/work/ownPerson/corporationMag.js
+++ b/smz-web/js/work/ownPerson/corporationMag.js
@@ -113,8 +113,8 @@ function init(){
  * 新增页面
  * */
 function insertCorporations() {
-    var height = '85%';
-    var width = '85%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -145,8 +145,8 @@ function edit(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -203,7 +203,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -214,6 +214,6 @@ function buttonDel(data, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/dictionaryForm.js b/smz-web/js/work/ownPerson/dictionaryForm.js
index 66b0593..b137474 100644
--- a/smz-web/js/work/ownPerson/dictionaryForm.js
+++ b/smz-web/js/work/ownPerson/dictionaryForm.js
@@ -182,6 +182,5 @@ function getDictionarys(id) {
 function reloading() {
     var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
     parent.layer.close(index); //再执行关闭
-    // window.parent.example.ajax.reload( null, false ); // 刷新页面
-    window.parent.location.href = smz_ht_url + "/pages/work/ownPerson/dictionaryList.html";
-}
\ No newline at end of file
+    window.parent.location.href = contentPath + "/smz-web/pages/work/ownPerson/dictionaryList.html";
+}
diff --git a/smz-web/js/work/ownPerson/dictionaryList.js b/smz-web/js/work/ownPerson/dictionaryList.js
index 591b3fb..88af2b9 100644
--- a/smz-web/js/work/ownPerson/dictionaryList.js
+++ b/smz-web/js/work/ownPerson/dictionaryList.js
@@ -62,7 +62,7 @@ function buttonDel(data, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 
 
@@ -105,8 +105,8 @@ var option = {
  * */
 function insertDictionary() {
     localStorage.setItem("keyWords",$("#keyWord").val());
-    var height = '600px';
-    var width = '1200px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -137,7 +137,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -153,8 +153,8 @@ function edit(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
diff --git a/smz-web/js/work/ownPerson/own-certificate-list.js b/smz-web/js/work/ownPerson/own-certificate-list.js
index 72e7334..c7c9b34 100644
--- a/smz-web/js/work/ownPerson/own-certificate-list.js
+++ b/smz-web/js/work/ownPerson/own-certificate-list.js
@@ -115,7 +115,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -130,8 +130,8 @@ function edit(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -165,7 +165,7 @@ function buttonDel(data, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -187,4 +187,4 @@ function del(id){
             }
         });
     });
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/own-certificate.js b/smz-web/js/work/ownPerson/own-certificate.js
index cf6f268..563d5f3 100644
--- a/smz-web/js/work/ownPerson/own-certificate.js
+++ b/smz-web/js/work/ownPerson/own-certificate.js
@@ -230,7 +230,7 @@ function init() {
                         var id = row['id'];
                         var idCardNum = row['idCardNum'];
                         if(idCardNum>0){
-                            var html = '<span style = "color:#35B3F1;cursor: pointer" onclick="idCardView(\''+id +'\')">'+"查看"+'</span>';
+                            var html = '<button class="layui-btn layui-btn-xs" title="查看" onclick="idCardView(\''+id +'\')" style="background-color: transparent;color: #009688;" >'+"查看"+'</button>';
                         }else{
                             var html = '<span>未上传身份证</span>';
                         }
@@ -243,7 +243,7 @@ function init() {
                     "render": function (data, type, row) {
                         var id = row['id'];
                         var photoNum = row['otherDocuments'];
-                        var html = '<span style = "color:#35B3F1;cursor: pointer" onclick="photoView(\''+id +'\')">'+photoNum+'</span>';
+                        var html = '<button class="layui-btn layui-btn-xs" title="照片查看" onclick="photoView(\''+id +'\')" style="background-color: transparent;color: #009688;">'+photoNum+'</button>';
                         return html;
                     }
                 },
@@ -276,7 +276,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='照片查看' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='照片查看' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>照片查看</button>");
     return btn.prop("outerHTML");
 }
 
@@ -285,8 +285,8 @@ function buttonEdits(id, permission, pers) {
  */
 function edit(id) {
     localStorage.setItem("id",id);
-    var height = '85%';
-    var width = '85%';
+    var height = '75%';
+    var width = '75%';
     layer.open({
         title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -303,7 +303,7 @@ function buttonCard(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='身份证' onclick='card(\"" + id + "\")'><i class='layui-icon'>&#xe612;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='身份证修改' onclick='card(\"" + id + "\")' style='background-color: transparent;color: #009688;'>身份证修改</button>");
     return btn.prop("outerHTML");
 }
 
@@ -318,8 +318,8 @@ function card(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -353,7 +353,7 @@ function buttonAdd(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='添加' onclick='add(\"" + id + "\")'><i class='layui-icon'>&#xe654;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='添加' onclick='add(\"" + id + "\")' style='background-color: transparent;color: #009688;'>添加</button>");
     return btn.prop("outerHTML");
 }
 
@@ -361,8 +361,8 @@ function buttonAdd(id, permission, pers) {
  * 添加页面
  */
 function add(id) {
-    var height = '85%';
-    var width = '85%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['添加', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -389,8 +389,8 @@ function add(id) {
 //身份证照片查看
 function idCardView(id) {
     localStorage.setItem("id",id);
-    var height = '525px';
-    var width = '800px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -403,8 +403,8 @@ function idCardView(id) {
 //照片查看
 function photoView(id) {
     localStorage.setItem("id",id);
-    var height = '525px';
-    var width = '800px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
diff --git a/smz-web/js/work/ownPerson/paySlip.js b/smz-web/js/work/ownPerson/paySlip.js
index 7683c85..22cec3d 100644
--- a/smz-web/js/work/ownPerson/paySlip.js
+++ b/smz-web/js/work/ownPerson/paySlip.js
@@ -330,7 +330,7 @@ function buttonEdits(id, permission, pers) {
             //return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\""+id+"\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\""+id+"\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -341,7 +341,7 @@ function buttonDel(data,lxdh, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\",\"" + lxdh +"\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\",\"" + lxdh +"\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -398,8 +398,8 @@ function edit(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -438,8 +438,8 @@ function view(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['查看','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -480,8 +480,8 @@ function del(id,lxdh) {
 }
 
 function depart(id,lxdh) {
-    var height = '40%';
-    var width = '30%';
+    var height = '75%';
+    var width = '75%';
     localStorage.setItem("id",id);
     localStorage.setItem("lxdh",lxdh);
     var index = layer.open({
@@ -516,8 +516,8 @@ function entry(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['入职证明生成','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -555,8 +555,8 @@ function income(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['收入证明生成','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -684,4 +684,4 @@ function delPaySlipBtn() {
             }
         })
     })
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerBenefits.js b/smz-web/js/work/ownPerson/workerBenefits.js
index 8e62585..bba31ec 100644
--- a/smz-web/js/work/ownPerson/workerBenefits.js
+++ b/smz-web/js/work/ownPerson/workerBenefits.js
@@ -226,7 +226,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='申报明细' onclick='edit(\"" + id + "\")'>申报明细</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='申报明细' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>申报明细</button>");
     return btn.prop("outerHTML");
 }
 
@@ -234,8 +234,8 @@ function buttonEdits(id, permission, pers) {
  * 编辑页面
  */
 function edit(id) {
-    var height = getDefaultHeight().toFixed(0) + 'px';
-    var width = getDefaultWidth().toFixed(0) + 'px';
+    var height = '97.5%';
+    var width = '97.5%';
     var layerIndex = layer.open({
         id: 'layer-contract-signing-infor',
         title: ['申报明细', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
@@ -259,4 +259,4 @@ function edit(id) {
         btn2: function (index, layero) {
         }
     });
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerBenefitsList.js b/smz-web/js/work/ownPerson/workerBenefitsList.js
index 76ac8e0..a3abd0f 100644
--- a/smz-web/js/work/ownPerson/workerBenefitsList.js
+++ b/smz-web/js/work/ownPerson/workerBenefitsList.js
@@ -14,96 +14,20 @@ function setBenefitsData(id){
         getOWNType(form,"reportType","reportType","--请选择申报类型--");
         init();
 
-        var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01
-        var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31
-        $('#startTime').val(getNowTime());
-        $('#endTime').val(getNowTime());
-        var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框
-        var endChange = function (val, date) {
-            if (date && date.year)
-                begindate.config.max = {
-                    year: date.year,
-                    month: date.month - 1,//必须减1才是正确值
-                    date: date.date,
-                    hours: date.hours,
-                    minutes: date.minutes,
-                    seconds: date.seconds
-                };
-            else {
-                var dateInit = new Date(maxListDate.replace(/-/g, "/"));
-                begindate.config.max = {
-                    year: dateInit.getFullYear(),
-                    month: dateInit.getMonth(),
-                    date: dateInit.getDate(),
-                    hours: dateInit.getHours(),
-                    minutes: dateInit.getMinutes(),
-                    seconds: dateInit.getSeconds()
-                };
-            }
-        };
-        var beginChange = function (val, date) {
-            if (date && date.year)
-                enddate.config.min = {
-                    year: date.year,
-                    month: date.month - 1,
-                    date: date.date,
-                    hours: date.hours,
-                    minutes: date.minutes,
-                    seconds: date.seconds
-                };
-            else {
-                var dateInit = new Date(minListDate.replace(/-/g, "/"));
-                enddate.config.min = {
-                    year: dateInit.getFullYear(),
-                    month: dateInit.getMonth(),
-                    date: dateInit.getDate(),
-                    hours: dateInit.getHours(),
-                    minutes: dateInit.getMinutes(),
-                    seconds: dateInit.getSeconds()
-                };
-            }
-        };
-        var enddate = laydate.render({
-            elem: end,
-            format: 'yyyy-MM-dd',
-            min: minListDate,
-            max: maxListDate,
-            done: endChange
-        });
-        var begindate = laydate.render({
-            elem: begin,
-            format: 'yyyy-MM-dd',
-            min: minListDate,
-            max: maxListDate,
-            done: beginChange
+        var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式
+        $('#test6').val(today + ' - ' + today);
+        laydate.render({
+            elem: '#test6',
+            range: true,
+            min: $('#hidMinListDate').val(),
+            max: $('#hidMaxListDate').val()
         });
 
         $("#searchBt").click(function () {
-            var startTime = $("#startTime").val();
-            var endTime = $("#endTime").val();
-            var dateStart = new Date(startTime);
-            var dateEnd = new Date(endTime);
-            var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24);
-            if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) {
-                return top.layer.msg('时间填写不完整', {
-                    icon: 2,
-                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
-                });
+            var dateRange = $.trim($('#test6').val());
+            if (!dateRange) {
+                return layer.msg('请选择日期范围', { icon: 2, time: 2000 });
             }
-            var startDateTemp = startTime.split("-");
-            var endDateTemp = endTime.split("-");
-            var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]);
-            var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]);
-            if (allStartDate.getTime() > allEndDate.getTime()) {
-                return top.layer.msg('时间选择不合理，请重新选择', {
-                    icon: 2,
-                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
-                });
-            }
-            example.ajax.reload();
-        });
-
-        $("#searchBt").click(function () {
             example.ajax.reload();
         });
     });
@@ -123,9 +47,14 @@ function init(){
                 "url" : smz_ht_url + "/workerBenefits/getWorkerBenefitsList",
                 "type":"post",
                 "data":function(d){
+
+                    var dateRange = $.trim($('#test6').val());
+                    var parts = dateRange.split(' - ');
+                    var startTime = parts[0];
+                    var endTime = parts[1];
                     d.id = ids;
-                    d.startTime = $("#startTime").val();
-                    d.endTime = $("#endTime").val();
+                    d.startTime = startTime;
+                    d.endTime = endTime;
                     d.reportType = $("#reportType").val();
                 },
                 "error":function(xhr, textStatus, errorThrown){
@@ -200,7 +129,7 @@ function init(){
                         var html = '';
                         if (reportPath != '' && reportPath != null) {
                             var name = "附件";
-                            html += "<a style = 'color:#09A8F1;cursor: pointer' onclick = 'dataFileView(\"" + id + "\")'>" + name + "</a>";
+                            html += "<button  class='layui-btn layui-btn-xs' title='查看' onclick = 'dataFileView(\"" + id + "\")' style='background-color: transparent;color: #009688;'>" + name + "</button>";
                         } else {
                             html += "<span style='color: red'>无</span>"
                         }
@@ -230,8 +159,8 @@ function init(){
  * 新增页面
  * */
 function inserts() {
-    var height = '85%';
-    var width = '65%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -261,8 +190,8 @@ function inserts() {
 //查看附件详情
 function dataFileView(id) {
     localStorage.setItem("id",id);
-    var height = '525px';
-    var width = '800px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -279,7 +208,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -290,7 +219,7 @@ function buttonDel(data, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -305,8 +234,8 @@ function edit(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -406,4 +335,4 @@ function getCurrentMonthFirst() {
     var month = date.getMonth() + 1 > 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
     var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
     return year + "-" + month + "-" + day;
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerContractManagementList.js b/smz-web/js/work/ownPerson/workerContractManagementList.js
index 1a0602a..1502b21 100644
--- a/smz-web/js/work/ownPerson/workerContractManagementList.js
+++ b/smz-web/js/work/ownPerson/workerContractManagementList.js
@@ -285,9 +285,9 @@ function init() {
                         if(isDownload==null){
                             html="<span style = 'color:red;'></span>";
                         }else if(isDownload==0){
-                            html="<span style = 'color:#09A8F1;'>未下载</span>";
+                            html="<span >未下载</span>";
                         }else if(isDownload==1){
-                            html="<span style = 'color:#09A8F1;'>已下载</span>";
+                            html="<span >已下载</span>";
                         }
                         return html;
                     }
@@ -321,8 +321,8 @@ function init() {
                         if(state==null||state==""){
                             console.log(roleIdLogin);
                             if(usernameLogin == "bnsAdmin"  || roleIdLogin =="680"){
-                                html += " <a style = 'color:#09A8F1;cursor: pointer' onclick = 'buttonEdits(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\")'>新签</a>";
-                                html += " <a style = 'color:#09A8F1;cursor: pointer' onclick = 'buttonEditsOld(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\",\""+rzrq+"\",\""+htOn+"\",\""+htOff+"\")'>录入已签合同</a>";
+                                html += " <button class='layui-btn layui-btn-xs' title='新签' onclick = 'buttonEdits(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\")' style='background-color: transparent;color: #009688;'>新签</button>";
+                                html += " <button class='layui-btn layui-btn-xs' title='录入已签合同' onclick = 'buttonEditsOld(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\",\""+rzrq+"\",\""+htOn+"\",\""+htOff+"\")' style='background-color: transparent;color: #009688;'>录入已签合同</button>";
                             }else{
                                // html += buttonEditsPower(workId,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh, legalPersonName,gw,electronicSeal,legalPersonSeal,"", pers);//
                                 //html += buttonEditsOldPower(workId,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh, legalPersonName,gw,electronicSeal,legalPersonSeal,rzrq,htOn,htOff,"", pers);//
@@ -332,12 +332,12 @@ function init() {
 
                              //html += buttonEdits(id, "", pers);//sys:project:add
                         }else if(state==4||state==2){
-                            html += " <a style = 'color:#4ED14D;cursor: pointer' onclick = 'buttonEdits(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\")'>新签</a>";
+                            html += " <button class='layui-btn layui-btn-xs' title='新签' onclick = 'buttonEdits(\"" + workId + "\",\""+contractCode+"\",\""+ssdw+"\",\""+ssdwdz+"\",\""+hkdz+"\",\""+workName+"\",\""+idNumber+"\",\""+lxdh+"\",\""+legalPersonName+"\",\""+gw+"\",\""+electronicSeal+"\",\""+legalPersonSeal+"\")' style='background-color: transparent;color: #009688;'>新签</button>";
                             localStorage.setItem("htworkId", workId);
-                            html += " <a style = 'color:#09A8F1;cursor: pointer' onclick = 'buttonView(\"" + workId + "\")'>合同记录</a>";
+                            html += " <button class='layui-btn layui-btn-xs' title='合同记录' onclick = 'buttonView(\"" + workId + "\")' style='background-color: transparent;color: #009688;'>合同记录</button>";
                         }else{
                             localStorage.setItem("htworkId", workId);
-                            html += " <a style = 'color:#09A8F1;cursor: pointer' onclick = 'buttonView(\"" + workId + "\")'>合同记录</a>";
+                            html += " <button class='layui-btn layui-btn-xs' title='合同记录' onclick = 'buttonView(\"" + workId + "\")' style='background-color: transparent;color: #009688;'>合同记录</button>";
                             //html += buttonView(id, "", pers);
                         }
                         return html;
@@ -435,8 +435,8 @@ function downloadWorks() {
  * 新增页面
  * */
 function insertWorkerOn() {
-    var height = '85%';
-    var width = '65%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -470,8 +470,8 @@ function insertWorkerOn() {
  * 新签页面
  */
 function buttonEdits(id,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh,legalPersonName,gw,electronicSeal,legalPersonSeal) {
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     localStorage.setItem("htworkId", id);
     localStorage.setItem("htcontractCode", contractCode);
     localStorage.setItem("htssdw", ssdw);
@@ -518,8 +518,8 @@ function buttonEdits(id,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh,leg
     // $(".layui-layer-btn0").css("display","none");
 }
 function buttonEditsOld(id,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh,legalPersonName,gw,electronicSeal,legalPersonSeal,rzrq,htOn,htOff) {
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     localStorage.setItem("htworkId", id);
     localStorage.setItem("htcontractCode", contractCode);
     localStorage.setItem("htssdw", ssdw);
@@ -561,8 +561,8 @@ function buttonEditsOld(id,contractCode,ssdw,ssdwdz,hkdz,workName,idNumber,lxdh,
  * 查看
  * */
 function buttonView(id) {
-    var height = '80%';
-    var width = '60%';
+    var height = '97.5%';
+    var width = '97.5%';
     console.log(id,"id")
     localStorage.setItem("recordWorkId", id);
     localStorage.setItem("recordType", "1")
@@ -579,8 +579,8 @@ function buttonView(id) {
     });
 }
 function renewalView(id) {
-    var height = '90%';
-    var width = '70%';
+    var height = '97.5%';
+    var width = '97.5%';
     console.log(id,"id")
     localStorage.setItem("recordWorkId", id);
     var index = layer.open({
@@ -699,4 +699,4 @@ function importExcel(){
         }
     });
     $("#articleImageFile").val("");
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerContractManagementRecords.js b/smz-web/js/work/ownPerson/workerContractManagementRecords.js
index 37b28e5..c650987 100644
--- a/smz-web/js/work/ownPerson/workerContractManagementRecords.js
+++ b/smz-web/js/work/ownPerson/workerContractManagementRecords.js
@@ -121,7 +121,7 @@ function init(){
                         }
                         var html = '';
                         if(url != '' && url != null){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer' onclick = 'electronicContractView(\"" + contractId + "\",\"" + type + "\",\"" + idNumber + "\",\"" + url + "\")'>"+ctype+"</a>";
+                            html += "<button class='layui-btn layui-btn-xs' title='电子合同详情' onclick = 'electronicContractView(\"" + contractId + "\",\"" + type + "\",\"" + idNumber + "\",\"" + url + "\")' style='background-color: transparent;color: #009688;'>"+ctype+"</button>";
                         }else{
                             html += "<span style='color: red'>无</span>"
                         }
@@ -164,13 +164,13 @@ function init(){
                         var videourl = row['videoUrl'];
                         var workId = row['workId'];
                         if(state==0||state==null||state=='null'){
-                            html += "<a style = 'color:red;cursor: pointer'>暂未签订</a>";
+                            html += "<span style = 'color:red;'>暂未签订</span>";
                         }else{
                             var contractType = row['contractType'];
                             if(contractType==2){
 
                             }else{
-                                html += "<a style = 'color:#09A8F1;cursor: pointer' onclick = 'ContractView(\"" + contractId + "\",\"" + type + "\",\"" + idNumber + "\",\"" + videourl + "\")'>签订信息</a>";
+                                html += "<button class='layui-btn layui-btn-xs' title='签订信息' onclick = 'ContractView(\"" + contractId + "\",\"" + type + "\",\"" + idNumber + "\",\"" + videourl + "\")' style='background-color: transparent;color: #009688;'>签订信息</button>";
                             }
                         }
                         var recordType=localStorage.getItem("recordType")
@@ -195,7 +195,7 @@ function electronicContractView(id,contractType,idNumber,url){
 
     let layerIndex = parent.layer.open({
         id: 'layer-electronicContract',
-        title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
+        title: ['电子合同详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'ownContractView.html',
         area: [width, height],
diff --git a/smz-web/js/work/ownPerson/workerDepart.js b/smz-web/js/work/ownPerson/workerDepart.js
index 7ee74a5..23ffa68 100644
--- a/smz-web/js/work/ownPerson/workerDepart.js
+++ b/smz-web/js/work/ownPerson/workerDepart.js
@@ -243,11 +243,11 @@ function init(){
                         var html = '';
                         var offType= row['offType'];
                         if(offType==1){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>个人离职</a>";
+                            html += "<span style = 'color:#09A8F1;'>个人离职</span>";
                         }else if(offType==2){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>辞退</a>";
+                            html += "<span style = 'color:#09A8F1;'>辞退</span>";
                         }else{
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>--</a>";
+                            html += "<span style = 'color:#09A8F1;'>--</span>";
                         }
                         return html;
                     }},
@@ -260,22 +260,22 @@ function init(){
                         //     html += "<a style = 'color:#09A8F1;cursor: pointer'>离职合同待完善</a>";
                         // }else
                         if(state==0){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>待确认</a>";
+                            html += "<span style = 'color:#09A8F1;'>待确认</span>";
                         }else if(state==1){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>已确认</a>";
+                            html += "<span style = 'color:#09A8F1;'>已确认</span>";
                         }else if(state==2){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>已归档</a>";
+                            html += "<span style = 'color:#09A8F1;'>已归档</span>";
                         }else if(state==3){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>通知书待确认</a>";
+                            html += "<span style = 'color:#09A8F1;'>通知书待确认</span>";
                         }else if(state==4){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>通知书已确认</a>";
+                            html += "<span style = 'color:#09A8F1;'>通知书已确认</span>";
                         }
                         return html;
                     }},
                      {
                     "data": "jjlxrdh", "orderable": false, "render": function (data, type, row) {
                         var id = row['id'];
-                        var html = " <a style = 'color:#09A8F1;cursor: pointer' onclick = 'contractHistoryBtn(\"" + id + "\")'>合同记录</a>";
+                        var html = " <button class='layui-btn layui-btn-xs' onclick = 'contractHistoryBtn(\"" + id + "\")' style='background-color: transparent;color: #009688;'>合同记录</button>";
                         return html;
                     }
                 },
@@ -297,30 +297,15 @@ function init(){
                         var html = '';
                         var state= row['offState'];
 
-                        // if(state==''||state==null||state=='null'){
-                        //     html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick='dws(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\")'>离职合同待完善</a>";
-                        // }else
-                        if(state==0){
-                            html += "   <a style = 'color:#000000;cursor: pointer' >确认离职中</a>";
-                        }else if(state==1){
-                            html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick = 'edit(\"" + id + "\",\"" + offType + "\",\"" + lxdh + "\",\"" + workerId + "\")'>填写减员信息</a>";
-                        }else if(state==2){
-                            html += "   <a style = 'color:#000000;cursor: pointer' >已归档</a>";
-                        }else if(state==3){
-                            html += "   <a style = 'color:#000000;cursor: pointer' >通知书待确认</a>";
-                        }else if(state==4){
-                            html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick='dws(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\",\"" + lxdh + "\")'>离职合同待完善</a>";
+                        if(state==1){
+                            html += "   <button class='layui-btn layui-btn-xs' title='填写减员信息' onclick = 'edit(\"" + id + "\",\"" + offType + "\",\"" + lxdh + "\",\"" + workerId + "\")' style='background-color: transparent;color: #009688;'>填写减员信息</button>";
                         }
 
                         if(state!=2){
-                            html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick='del(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\",\"" + lxdh + "\")'>删除</a>";
+                            html += "   <button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\",\"" + lxdh + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>";
                         }
-
-                        html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick='xiangqing(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\")'>详情</a>";
-                        html += "   <a style = 'color:#09A8F1;cursor: pointer' onclick='jilu(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\")'>记录</a>";
-
+                        html += "   <button class='layui-btn layui-btn-xs' title='记录' onclick='jilu(\"" + id + "\",\"" + name + "\",\"" + idNumber + "\")' style='background-color: transparent;color: #009688;'>记录</button>";
                         html += buttonView(workerId, "", pers);
-
                         return html;
                     }
                 },
@@ -333,8 +318,8 @@ function init(){
  * 合同记录
  */
 function contractHistoryBtn(id) {
-    var height = '80%';
-    var width = '60%';
+    var height = '75%';
+    var width = '75%';
     console.log(id,"id")
     localStorage.setItem("recordWorkId", id);
     localStorage.setItem("recordType", "2")
@@ -490,8 +475,8 @@ function xiangqing(id,name,idNumber) {
     });
 }
 function jilu(id,name,idNumber) {
-    var height = '80%';
-    var width = '60%';
+    var height = '75%';
+    var width = '75%';
     localStorage.setItem("noticeId",id);
     localStorage.setItem("offName",name);
     localStorage.setItem("offIdNumber",idNumber);
@@ -719,7 +704,7 @@ function buttonView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\")'>详情</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -734,8 +719,8 @@ function view(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['查看','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -799,4 +784,4 @@ function reloading() {
     // window.parent.example.ajax.reload(null, false); // 刷新页面
     // window.parent.location.reload();
     history.go(0);
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerDepartFaceContrast.js b/smz-web/js/work/ownPerson/workerDepartFaceContrast.js
index dff3553..fc6166c 100644
--- a/smz-web/js/work/ownPerson/workerDepartFaceContrast.js
+++ b/smz-web/js/work/ownPerson/workerDepartFaceContrast.js
@@ -12,94 +12,20 @@ $(function () {
         getPro(form);
         pers = checkPermission();
         init();
-        var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01
-        var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31
-        $('#startTime').val(getNowTime());
-        $('#endTime').val(getNowTime());
-        var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框
-        var endChange = function (val, date) {
-            if (date && date.year)
-                begindate.config.max = {
-                    year: date.year,
-                    month: date.month - 1,//必须减1才是正确值
-                    date: date.date,
-                    hours: date.hours,
-                    minutes: date.minutes,
-                    seconds: date.seconds
-                };
-            else {
-                var dateInit = new Date(maxListDate.replace(/-/g, "/"));
-                begindate.config.max = {
-                    year: dateInit.getFullYear(),
-                    month: dateInit.getMonth(),
-                    date: dateInit.getDate(),
-                    hours: dateInit.getHours(),
-                    minutes: dateInit.getMinutes(),
-                    seconds: dateInit.getSeconds()
-                };
-            }
-        };
-        var beginChange = function (val, date) {
-            if (date && date.year)
-                enddate.config.min = {
-                    year: date.year,
-                    month: date.month - 1,
-                    date: date.date,
-                    hours: date.hours,
-                    minutes: date.minutes,
-                    seconds: date.seconds
-                };
-            else {
-                var dateInit = new Date(minListDate.replace(/-/g, "/"));
-                enddate.config.min = {
-                    year: dateInit.getFullYear(),
-                    month: dateInit.getMonth(),
-                    date: dateInit.getDate(),
-                    hours: dateInit.getHours(),
-                    minutes: dateInit.getMinutes(),
-                    seconds: dateInit.getSeconds()
-                };
-            }
-        };
-        var enddate = laydate.render({
-            elem: end,
-            format: 'yyyy-MM-dd',
-            min: minListDate,
-            max: maxListDate,
-            done: endChange
-        });
-        var begindate = laydate.render({
-            elem: begin,
-            format: 'yyyy-MM-dd',
-            min: minListDate,
-            max: maxListDate,
-            done: beginChange
+
+        var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式
+        $('#test6').val(today + ' - ' + today);
+        laydate.render({
+            elem: '#test6',
+            range: true,
+            min: $('#hidMinListDate').val(),
+            max: $('#hidMaxListDate').val()
         });
 
         $("#searchBt").click(function () {
-            var startTime = $("#startTime").val();
-            var endTime = $("#endTime").val();
-            var dateStart = new Date(startTime);
-            var dateEnd = new Date(endTime);
-            var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24);
-            if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) {
-                return top.layer.msg('时间填写不完整', {
-                    icon: 2,
-                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
-                });
-            }
-            var startDateTemp = startTime.split("-");
-            var endDateTemp = endTime.split("-");
-            var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]);
-            var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]);
-            if (allStartDate.getTime() > allEndDate.getTime()) {
-                return top.layer.msg('时间选择不合理，请重新选择', {
-                    icon: 2,
-                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
-                }, () => {
-                    $('#startTime').empty()
-                    $('#endTime').empty()
-                });
+            var dateRange = $.trim($('#test6').val());
+            if (!dateRange) {
+                return layer.msg('请选择日期范围', { icon: 2, time: 2000 });
             }
 
             example.ajax.reload();
@@ -121,14 +47,19 @@ function init() {
                 "url": smz_ht_url + "/WorkerDepartFaceContrast",
                 "type": "get",
                 "data": function (d) {
+                    var dateRange = $.trim($('#test6').val());
+                    var parts = dateRange.split(' - ');
+                    var startTime = parts[0];
+                    var endTime = parts[1];
+
                     d.ssdw = $("#ssdw").val();
                     d.ygdw = $("#orgId").val();
                     d.rylx = $("#rylx").val();
                     d.state = $("#state").val();
                     d.proName = $("#proName").val();
                     d.name = $("#name").val();
-                    d.startTime = $("#startTime").val();
-                    d.endTime = $("#endTime").val();
+                    d.startTime = startTime;
+                    d.endTime = endTime;
                 },
                 "error": function (xhr, textStatus, errorThrown) {
                     var msg = xhr.responseText;
@@ -225,7 +156,7 @@ function faceBtn() {
         title: ['人脸照片信息变更', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'workerDepartFaceContrastForm.html',
-        area: ['1200px', '600px'],
+        area: ['75%', '75%'],
         maxmin: false,
         /*yes: function (index, layero) {
             // 获取弹出层中的form表单元素
@@ -243,8 +174,10 @@ function faceBtn() {
  * 查看
  * */
 function view(id,proName,name) {
-    var startTime = $('#startTime').val();
-    var endTime =  $('#endTime').val();
+    var dateRange = $.trim($('#test6').val());
+    var parts = dateRange.split(' - ');
+    var startTime = parts[0];
+    var endTime = parts[1];
     localStorage.setItem("startTime",startTime);
     localStorage.setItem("endTime",endTime);
     localStorage.setItem("id", id);
@@ -253,8 +186,8 @@ function view(id,proName,name) {
     var index = layer.open({
         title: false,
         type: 2,
-        content: './workerDepartFaceContrastDetail.html',
-        area: ['80%', '96%'],
+        content: 'workerDepartFaceContrastDetail.html',
+        area: ['97.5%', '97.5%'],
         maxmin: false
     });
 }
@@ -267,7 +200,7 @@ function buttonView(id,proName,name, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\",\"" + proName + "\",\"" + name + "\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\",\"" + proName + "\",\"" + name + "\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -518,4 +451,4 @@ function getOWNryxz() {
             form.render();  //这里就是我们要渲染的地方了
         }
     })
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js b/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js
index 01cfd9c..2450dd9 100644
--- a/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js
+++ b/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js
@@ -5,36 +5,32 @@ var proName = localStorage.getItem("proName");
 var name = localStorage.getItem("name");
 var pers = null;
 
-var form,layer;
+var form,layer,laydate;
 $(function() {
-    layui.use(['layer', 'form'], function () {
+    layui.use(['layer','laydate', 'form'], function () {
         layer = layui.layer;
         form = layui.form;
-    });
-    jeDate({
-        dateCell: "#startTime", // isinitVal:true,
-        format: "YYYY-MM-DD",
-        isTime: false
-    });
-    jeDate({
-        dateCell: "#endTime", // isinitVal:true,
-        format: "YYYY-MM-DD",
-        isTime: false,
-    });
-    $("#startTime").val(startTime);
-    $("#endTime").val(endTime);
+        laydate = layui.laydate;
+        $('#test6').val(startTime + ' - ' + endTime);
+        laydate.render({
+            elem: '#test6',
+            range: true,
+            min: $('#hidMinListDate').val(),
+            max: $('#hidMaxListDate').val()
+        });
 
-    pers = checkPermission();
-    console.log(proName)
-    if (proName == null || proName === 'null'){
-        leftTitle(name)
-    }else {
-        leftTitle(proName + "—" + name)
-    }
 
-    initDate();
-    initTable();
+        pers = checkPermission();
+        console.log(proName)
+        if (proName == null || proName === 'null'){
+            leftTitle(name)
+        }else {
+            leftTitle(proName + "—" + name)
+        }
 
+        initDate();
+        initTable();
+    });
 });
 
 // 子页面调用的刷新父页面方法
@@ -45,8 +41,10 @@ function reloadData() {
 
 function initDate() {
     //初始化Table
-    var startTime = $("#startTime").val();
-    var endTime = $("#endTime").val();
+    var dateRange = $.trim($('#test6').val());
+    var parts = dateRange.split(' - ');
+    var startTime = parts[0];
+    var endTime = parts[1];
     $.ajax({
         url: smz_ht_url + '/WorkerDepartFaceContrast/getListById',
         type: "get",
@@ -67,8 +65,11 @@ function initDate() {
 
 function initTable() {
     //初始化Table
-    var startTime = $("#startTime").val();
-    var endTime = $("#endTime").val();
+    var dateRange = $.trim($('#test6').val());
+    var parts = dateRange.split(' - ');
+    var startTime = parts[0];
+    var endTime = parts[1];
+
     $("#table").bootstrapTable('destroy').bootstrapTable({
         classes: 'table table-hover',
         url: smz_ht_url + '/WorkerDepartFaceContrast/getById',
@@ -209,8 +210,11 @@ function responseHandler(res) {
 }
 
 function querys() {
-    var startTime = $("#startTime").val();
-    var endTime = $("#endTime").val();
+    var dateRange = $.trim($('#test6').val());
+    var parts = dateRange.split(' - ');
+    var startTime = parts[0];
+    var endTime = parts[1];
+
     var dateStart = new Date(startTime);
     var dateEnd = new Date(endTime);
     var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24);
@@ -363,4 +367,4 @@ function getAll(data) {
     for (var k = 0; k < data.length; k++) {
         dateArr.push(data[k].currentDay);
     }
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerDepartRecordOld.js b/smz-web/js/work/ownPerson/workerDepartRecordOld.js
index 438fe93..73b398b 100644
--- a/smz-web/js/work/ownPerson/workerDepartRecordOld.js
+++ b/smz-web/js/work/ownPerson/workerDepartRecordOld.js
@@ -91,11 +91,11 @@ function init(){
                         var html = '';
                         var offBook= row['noticePath'];
                         if(offBook==null||offBook==''){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>--</a>";
+                            html += "<span >--</span>";
                         }else if(offBook=='线下'){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>线下</a>";
+                            html += "<span >线下</span>";
                         } else{
-                            html += "<a onclick = 'electronicContractView(\"" + offBook + "\")' style = 'color:#09A8F1;cursor: pointer'>解除劳动合同通知书</a>";
+                            html += "<button onclick = 'electronicContractView(\"" + offBook + "\")' class='layui-btn layui-btn-xs' title='解除劳动合同通知书' style='background-color: transparent;color: #009688;'>解除劳动合同通知书</button>";
                         }
                         return html;
                     }},
@@ -104,11 +104,11 @@ function init(){
                         var html = '';
                         var offBook= row['agreementPath'];
                         if(offBook==null||offBook==''){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>--</a>";
+                            html += "<span >--</span>";
                         }else if(offBook=='线下'){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>线下</a>";
+                            html += "<span >线下</span>";
                         }else{
-                            html += "<a onclick = 'electronicContractView(\"" + offBook + "\")' style = 'color:#09A8F1;cursor: pointer'>解除劳动合同协议书</a>";
+                            html += "<button onclick = 'electronicContractView(\"" + offBook + "\")' class='layui-btn layui-btn-xs' title='解除劳动合同协议书' style='background-color: transparent;color: #009688;'>解除劳动合同协议书</button>";
                         }
                         return html;
                     }},
@@ -117,11 +117,11 @@ function init(){
                         var html = '';
                         var offBook= row['offBook'];
                         if(offBook==null||offBook==''){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>--</a>";
+                            html += "<span >--</span>";
                         }else if(offBook=='线下'){
-                            html += "<a style = 'color:#09A8F1;cursor: pointer'>线下</a>";
+                            html += "<span >线下</span>";
                         }else{
-                            html += "<a onclick = 'electronicContractView(\"" + offBook + "\")' style = 'color:#09A8F1;cursor: pointer'>终止/解除劳动合同证明</a>";
+                            html += "<button onclick = 'electronicContractView(\"" + offBook + "\")' class='layui-btn layui-btn-xs' title='终止/解除劳动合同证明' style='background-color: transparent;color: #009688;'>终止/解除劳动合同证明</button>";
                         }
                         return html;
                     }},
@@ -341,4 +341,4 @@ function getCurrentMonthFirst() {
     var month = date.getMonth() + 1 > 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
     var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
     return year + "-" + month + "-" + day;
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/ownPerson/workerOn.js b/smz-web/js/work/ownPerson/workerOn.js
index bfe48f8..f9260d6 100644
--- a/smz-web/js/work/ownPerson/workerOn.js
+++ b/smz-web/js/work/ownPerson/workerOn.js
@@ -339,7 +339,7 @@ function buttonView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\"" + id + "\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -350,7 +350,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\""+id+"\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\""+id+"\")' style='background-color: transparent;color: #009688;'>编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -361,7 +361,7 @@ function buttonEditsContract(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='签订合同-编辑' onclick='editContract(\""+id+"\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='签订合同-编辑' onclick='editContract(\""+id+"\")' style='background-color: transparent;color: #009688;'>签订合同-编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -372,7 +372,7 @@ function buttonDel(data,lxdh, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\",\"" + lxdh +"\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data +"\",\"" + lxdh +"\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -383,7 +383,7 @@ function buttonEntry(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='入职证明' onclick='entry(\""+id+"\")'><i class='layui-icon'>&#xe64C;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='入职证明' onclick='entry(\""+id+"\")' style='background-color: transparent;color: #009688;'>入职证明</button>");
     return btn.prop("outerHTML");
 }
 
@@ -394,7 +394,7 @@ function buttonIncome(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='收入证明' onclick='income(\""+id+"\")'><i class='layui-icon'>&#xe64C;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='收入证明' onclick='income(\""+id+"\")' style='background-color: transparent;color: #009688;'>收入证明</button>");
     return btn.prop("outerHTML");
 }
 
@@ -405,7 +405,7 @@ function buttonRegistration(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='入职登记表' onclick='registration(\""+id+"\")'><i class='layui-icon'>&#xe60e;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='入职登记表' onclick='registration(\""+id+"\")' style='background-color: transparent;color: #009688;'>入职登记表</button>");
     return btn.prop("outerHTML");
 }
 
@@ -416,7 +416,7 @@ function buttonDepart(data,lxdh, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='离职' onclick='depart(\"" + data +"\",\"" + lxdh +"\")'><i class='layui-icon'>&#x1007;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='离职' onclick='depart(\"" + data +"\",\"" + lxdh +"\")' style='background-color: transparent;color: #009688;'>离职</button>");
     return btn.prop("outerHTML");
 }
 
@@ -429,8 +429,8 @@ function registration(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['入职登记表','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -520,8 +520,8 @@ function downloadWorks() {
  * 新增页面
  * */
 function insertWorkerOn() {
-    var height = '85%';
-    var width = '65%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -565,8 +565,8 @@ function edit(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = layer.open({
                 title: ['修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -605,8 +605,8 @@ function editContract(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = layer.open({
                 title: ['修改-合同签订','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -645,8 +645,8 @@ function view(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = layer.open({
                 title: ['查看','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -687,7 +687,7 @@ function del(id,lxdh) {
 }
 
 function depart(id,lxdh) {
-    var height = '40%';
+    var height = '30%';
     var width = '30%';
     localStorage.setItem("id",id);
     localStorage.setItem("lxdh",lxdh);
@@ -723,8 +723,8 @@ function entry(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['入职证明生成','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -762,8 +762,8 @@ function income(id) {
         data:{"id":id},
         dataType: 'json',
         success: function (data) {
-            var height = '80%';
-            var width = '60%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['收入证明生成','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -884,8 +884,8 @@ function importExcel(){
  * 可批量修改信息（例如：社保增员、意外险生效时间、意外险到期时间）
  * */
 function batchBtn() {
-    var height = '85%';
-    var width = '85%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['批量修改信息', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -950,4 +950,4 @@ function importExcelBatch(){
         }
     });
     $("#articleImageFileBatch").val("");
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/person/faceContrast.js b/smz-web/js/work/person/faceContrast.js
index 2bb8f07..deb1e9a 100644
--- a/smz-web/js/work/person/faceContrast.js
+++ b/smz-web/js/work/person/faceContrast.js
@@ -180,7 +180,7 @@ function view(exitTime,einTime,idNumber,proId,name,proName,subId,teamId,gz,effec
     var index = layer.open({
         title: false,
         type: 2,
-        content: './faceContrastDetail.html',
+        content: 'faceContrastDetail.html',
         area: ['97.5%', '97.5%'],
         maxmin: false
     });
diff --git a/smz-web/js/work/personnelWarning/attentionWarningList.js b/smz-web/js/work/personnelWarning/attentionWarningList.js
index f2d6fc2..bd72364 100644
--- a/smz-web/js/work/personnelWarning/attentionWarningList.js
+++ b/smz-web/js/work/personnelWarning/attentionWarningList.js
@@ -32,7 +32,7 @@ function init() {
             "serverSide": true,
             "pagingType": "full_numbers", //首页|尾页
             "language": {
-                "url": "../../../js/plugin/datatables/Chinese.lang"
+                "url": "../../../smz-web/js/plugin/datatables/Chinese.lang"
             },
             "ajax": {
                 "url": smz_ht_url + "/attentionWarning/getAttentionWarningList",
diff --git a/smz-web/js/work/personnelWarning/specialWarningList.js b/smz-web/js/work/personnelWarning/specialWarningList.js
index e3188c0..1d72252 100644
--- a/smz-web/js/work/personnelWarning/specialWarningList.js
+++ b/smz-web/js/work/personnelWarning/specialWarningList.js
@@ -32,7 +32,7 @@ function init() {
             "serverSide": true,
             "pagingType": "full_numbers", //首页|尾页
             "language": {
-                "url": "../../../js/plugin/datatables/Chinese.lang"
+                "url": "../../../smz-web/js/plugin/datatables/Chinese.lang"
             },
             "ajax": {
                 "url": smz_ht_url + "/specialWarning/getSpecialWarningList",
diff --git a/smz-web/js/work/salaryAttendance/salaryAttendanceDetails.js b/smz-web/js/work/salaryAttendance/salaryAttendanceDetails.js
index 3934047..2afa1ee 100644
--- a/smz-web/js/work/salaryAttendance/salaryAttendanceDetails.js
+++ b/smz-web/js/work/salaryAttendance/salaryAttendanceDetails.js
@@ -731,8 +731,8 @@ function abnormalView(idNumber, rewordNum) {
         dataType: 'json',
         success: function (data) {
             console.log("data:", data)
-            var height = '100%';
-            var width = '90%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = parent.layer.open({
                 title: ['比对结果-异常数据','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -817,8 +817,8 @@ function filePreView(url,fileName,fileId) {
     localStorage.setItem("fileNames", fileName);
     // localStorage.setItem("fileTimes", time);
     localStorage.setItem("fileId", fileId);
-    var height = '525px';
-    var width = '800px';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -826,4 +826,4 @@ function filePreView(url,fileName,fileId) {
         area: [width, height],
         maxmin: false
     });
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/salaryAttendance/salaryAttendanceList.js b/smz-web/js/work/salaryAttendance/salaryAttendanceList.js
index 017bfae..12c5148 100644
--- a/smz-web/js/work/salaryAttendance/salaryAttendanceList.js
+++ b/smz-web/js/work/salaryAttendance/salaryAttendanceList.js
@@ -194,7 +194,7 @@ function detailsBtn(idNumber, month, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='detailsView(\""+idNumber+"\", \""+month+"\")'><i class='layui-icon'>&#xe63c;</i>详情</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='detailsView(\""+idNumber+"\", \""+month+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 /**
@@ -211,8 +211,8 @@ function detailsView(idNumber, month) {
         },
         dataType: 'json',
         success: function (data) {
-            var height = '100%';
-            var width = '100%';
+            var height = '97.5%';
+            var width = '97.5%';
             var index = layer.open({
                 title: ['详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -227,4 +227,4 @@ function detailsView(idNumber, month) {
             });
         }
     })
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/adjustRecordForm.js b/smz-web/js/work/smallSubManagement/adjustRecordForm.js
index b1a497c..a74dc5f 100644
--- a/smz-web/js/work/smallSubManagement/adjustRecordForm.js
+++ b/smz-web/js/work/smallSubManagement/adjustRecordForm.js
@@ -237,7 +237,7 @@ function buttonBeforeView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='更改前' onclick='downloadContract(\"" + id + "\",\"" + 2 + "\")'>更改前</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='更改前' onclick='downloadContract(\"" + id + "\",\"" + 2 + "\")' style='background-color: transparent;color: #009688;'>更改前</button>");
     return btn.prop("outerHTML");
 }
 
@@ -247,7 +247,7 @@ function buttonAfterView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='更改后' onclick='downloadContract(\"" + id + "\",\"" + 3 + "\")'>更改后</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='更改后' onclick='downloadContract(\"" + id + "\",\"" + 3 + "\")' style='background-color: transparent;color: #009688;'>更改后</button>");
     return btn.prop("outerHTML");
 }
 
diff --git a/smz-web/js/work/smallSubManagement/lumpSumAddList.js b/smz-web/js/work/smallSubManagement/lumpSumAddList.js
index bb78e84..c73d78a 100644
--- a/smz-web/js/work/smallSubManagement/lumpSumAddList.js
+++ b/smz-web/js/work/smallSubManagement/lumpSumAddList.js
@@ -185,7 +185,7 @@ function buttonDelView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='删除' onclick='delView(\"" + id + "\")'>删除</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;background-color: transparent;color: #ff4d4f;' title='删除' onclick='delView(\"" + id + "\")'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -222,7 +222,7 @@ function lumpSumAdd(){
         title: ['选择包干工序及桩位', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'lumpSumAddForm.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['确定','关闭'],
 
@@ -320,4 +320,4 @@ function reloading() {
     var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
     parent.layer.close(index); //再执行关闭
     window.parent.location.reload();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/smallSubPermission.js b/smz-web/js/work/smallSubManagement/smallSubPermission.js
index 116f811..223b9e9 100644
--- a/smz-web/js/work/smallSubManagement/smallSubPermission.js
+++ b/smz-web/js/work/smallSubManagement/smallSubPermission.js
@@ -120,7 +120,7 @@ function insertSubPermission() {
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'smallSubPermissionForm.html',
-        area: ['50%', '60%'],
+        area: ['75%', '75%'],
         maxmin: false,
         btn: ['确定','关闭'],
         yes: function (index, layero) {
@@ -145,7 +145,7 @@ function buttonUnbindView(subId, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='操作确认' onclick='unbindView(\""+subId+"\")'>解绑</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='解绑' onclick='unbindView(\""+subId+"\")' style='background-color: transparent;color: #009688;'>解绑</button>");
     return btn.prop("outerHTML");
 }
 
diff --git a/smz-web/js/work/smallSubManagement/stat/contractStat.js b/smz-web/js/work/smallSubManagement/stat/contractStat.js
index 386a411..b0bf870 100644
--- a/smz-web/js/work/smallSubManagement/stat/contractStat.js
+++ b/smz-web/js/work/smallSubManagement/stat/contractStat.js
@@ -120,8 +120,8 @@ function init() {
  * 查看
  * */
 function contractView(id,proId) {
-    var height = '85%';
-    var width = '91%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['小包干合同详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -151,7 +151,7 @@ function buttonView(id,proId,permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='contractView(\""+id+"\",\""+proId+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='contractView(\""+id+"\",\""+proId+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -190,4 +190,4 @@ function exportBtnOutContract() {
         window.URL.revokeObjectURL(url)
     };
     xhr.send();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/stat/gxStat.js b/smz-web/js/work/smallSubManagement/stat/gxStat.js
index 7466fad..3850da6 100644
--- a/smz-web/js/work/smallSubManagement/stat/gxStat.js
+++ b/smz-web/js/work/smallSubManagement/stat/gxStat.js
@@ -128,7 +128,7 @@ function buttonView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='gxView(\""+id+"\" )'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='gxView(\""+id+"\" )' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -136,8 +136,8 @@ function buttonView(id, permission, pers) {
  * 小包干工序桩位详情
  * */
 function gxView(id) {
-    var height = '85%';
-    var width = '91%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['小包干工序桩位详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -164,8 +164,8 @@ function gxView(id) {
  * */
 function view(id,proName,contractNum,contractAmount,teamNum,totalNum,gxNum,attDayNum) {
     localStorage.setItem("pageType", "查看");
-    var height = '85%';
-    var width = '90%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['查看','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -256,4 +256,4 @@ function exportBtnOutGx() {
         window.URL.revokeObjectURL(url)
     };
     xhr.send();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/stat/gxStatView.js b/smz-web/js/work/smallSubManagement/stat/gxStatView.js
index 692e1d2..4ea8b9a 100644
--- a/smz-web/js/work/smallSubManagement/stat/gxStatView.js
+++ b/smz-web/js/work/smallSubManagement/stat/gxStatView.js
@@ -161,8 +161,8 @@ function initProcessTable(id) {
  * */
 function personnelView(item) {
     let idCard = item.idCard
-    var height = '85%';
-    var width = '91%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = parent.layer.open({
         title: ['小包干人员详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
diff --git a/smz-web/js/work/smallSubManagement/stat/personnelStat.js b/smz-web/js/work/smallSubManagement/stat/personnelStat.js
index 2371cbf..33dba1d 100644
--- a/smz-web/js/work/smallSubManagement/stat/personnelStat.js
+++ b/smz-web/js/work/smallSubManagement/stat/personnelStat.js
@@ -122,8 +122,8 @@ function init() {
  * 查看
  * */
 function personnelView(idCard) {
-    var height = '85%';
-    var width = '91%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['小包干人员详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -152,7 +152,7 @@ function buttonView(idCard, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='personnelView(\""+idCard+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='personnelView(\""+idCard+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -195,4 +195,4 @@ function exportBtnOutPersonnel() {
         window.URL.revokeObjectURL(url)
     };
     xhr.send();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/stat/projectStat.js b/smz-web/js/work/smallSubManagement/stat/projectStat.js
index 15a5be3..e43844c 100644
--- a/smz-web/js/work/smallSubManagement/stat/projectStat.js
+++ b/smz-web/js/work/smallSubManagement/stat/projectStat.js
@@ -127,8 +127,8 @@ function init() {
  * 查看
  * */
 function view(id,proName,contractNum,contractAmount,teamNum,totalNum,gxNum,attDayNum) {
-    var height = '85%';
-    var width = '90%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: ['小包干工程详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -161,7 +161,7 @@ function buttonView(id,proName,contractNum,contractAmount,teamNum,totalNum,gxNum
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\",\""+proName+"\",\""+contractNum+"\",\""+contractAmount+"\",\""+teamNum+"\",\""+totalNum+"\",\""+gxNum+"\",\""+attDayNum+"\" )'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\",\""+proName+"\",\""+contractNum+"\",\""+contractAmount+"\",\""+teamNum+"\",\""+totalNum+"\",\""+gxNum+"\",\""+attDayNum+"\" )' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -198,4 +198,4 @@ function resetProject() {
     // 重新渲染 select 下拉框
     layui.form.render("select");
     example.ajax.reload();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/teamPackageManageContractForm.js b/smz-web/js/work/smallSubManagement/teamPackageManageContractForm.js
index 0ac1875..deac3e0 100644
--- a/smz-web/js/work/smallSubManagement/teamPackageManageContractForm.js
+++ b/smz-web/js/work/smallSubManagement/teamPackageManageContractForm.js
@@ -249,7 +249,7 @@ function lumpSum(){
         title: ['选择包干工序及桩位', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'lumpSum.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function(layero, index){
@@ -351,7 +351,7 @@ function generateQrCode(party) {
             let index = layer.open({
                 type: 1,
                 title: '电子签名二维码',
-                area: ['200px', '250px'],
+                area: ['75%', '75%'],
                 content: $content[0].outerHTML, // 转为字符串插入弹窗
                 success: function () {
                     // 弹窗打开后执行生成二维码
@@ -543,7 +543,7 @@ function nextStep() {
         title: '合同预览',
         type: 2,
         content: 'teamPackageManageContractPreview.html',
-        area: ['95%', '95%'],
+        area: ['97.5%', '97.5%'],
         maxmin: true,
         btn: ['确认', '返回'],
         // yes: function (index, layero) {
@@ -565,4 +565,4 @@ function nextStep() {
             // 返回编辑页
         }
     });
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/teamPackageManageForm.js b/smz-web/js/work/smallSubManagement/teamPackageManageForm.js
index d2af688..25da9e7 100644
--- a/smz-web/js/work/smallSubManagement/teamPackageManageForm.js
+++ b/smz-web/js/work/smallSubManagement/teamPackageManageForm.js
@@ -14,7 +14,7 @@ function contractInfo(){
         title: ['填写合同信息', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'teamPackageManageContractForm.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         // btn: ['下一步','关闭'],
         // yes: function (index, layero) {
diff --git a/smz-web/js/work/smallSubManagement/teamPackageManageList.js b/smz-web/js/work/smallSubManagement/teamPackageManageList.js
index 6950655..c212f17 100644
--- a/smz-web/js/work/smallSubManagement/teamPackageManageList.js
+++ b/smz-web/js/work/smallSubManagement/teamPackageManageList.js
@@ -269,7 +269,7 @@ function insertTeamPackageload() {
         title: ['包干合同模版预览', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'teamPackageManageForm.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
     });
 }
@@ -281,7 +281,7 @@ function buttonDetailView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='detailView(\"" + id + "\")'>详情</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='detailView(\"" + id + "\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -293,7 +293,7 @@ function detailView(id) {
         title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'teamPackageManageDetailForm.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['关闭'],
         success: function (layero, index) {
@@ -310,7 +310,7 @@ function buttonMoreView(id,proId,contractStatus, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs more-btn' style='margin-left: 20px;' data-id='" + id + "' data-pro-id='" + proId + "' data-contract-Status='" + contractStatus + "'>更多</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs more-btn' style='margin-left: 20px;background-color: transparent;color: #009688;' data-id='" + id + "' data-pro-id='" + proId + "' data-contract-Status='" + contractStatus + "'>更多</button>");
     return btn.prop("outerHTML");
 }
 
@@ -398,7 +398,7 @@ function buttonScopeAdjustView(id,proId, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='作业范围调整' onclick='scopeAdjustView(\"" + id + "\",\"" + proId + "\")'>作业范围调整</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;background-color: transparent;color: #009688;' title='作业范围调整' onclick='scopeAdjustView(\"" + id + "\",\"" + proId + "\")'>作业范围调整</button>");
     return btn.prop("outerHTML");
 }
 
@@ -409,7 +409,7 @@ function buttonContentAdjustView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='作业内容调整' onclick='contentAdjustView(\"" + id + "\")'>作业内容调整</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #009688;' title='作业内容调整' onclick='contentAdjustView(\"" + id + "\")'>作业内容调整</button>");
     return btn.prop("outerHTML");
 }
 
@@ -420,7 +420,7 @@ function buttonPeriodAdjustView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='作业期限调整' onclick='periodAdjustView(\"" + id + "\")'>作业期限调整</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #009688;' title='作业期限调整' onclick='periodAdjustView(\"" + id + "\")'>作业期限调整</button>");
     return btn.prop("outerHTML");
 }
 
@@ -431,7 +431,7 @@ function buttonPriceAdjustView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='协议价调整' onclick='priceAdjustView(\"" + id + "\")'>协议价调整</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #009688;' title='协议价调整' onclick='priceAdjustView(\"" + id + "\")'>协议价调整</button>");
     return btn.prop("outerHTML");
 }
 
@@ -442,7 +442,7 @@ function buttonAdjustRecordView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='调整记录' onclick='adjustRecordView(\"" + id + "\")'>调整记录</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #009688;' title='调整记录' onclick='adjustRecordView(\"" + id + "\")'>调整记录</button>");
     return btn.prop("outerHTML");
 }
 
@@ -453,7 +453,7 @@ function buttonProtocolTerminateView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='协议终止' onclick='protocolTerminateView(\"" + id + "\")'>协议终止</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #009688;' title='协议终止' onclick='protocolTerminateView(\"" + id + "\")'>协议终止</button>");
     return btn.prop("outerHTML");
 }
 
@@ -465,7 +465,7 @@ function buttonDelView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px;' title='删除' onclick='delView(\"" + id + "\")'>删除</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' style='margin: 5px 5px; background-color: transparent;color: #ff4d4f;' title='删除' onclick='delView(\"" + id + "\")'>删除</button>");
     return btn.prop("outerHTML");
 }
 
@@ -480,7 +480,7 @@ function scopeAdjustView(id,proId) {
         title: ['作业范围调整', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'lumpSumAddList.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['确定','关闭'],
         yes: function (index, layero) {
@@ -503,7 +503,7 @@ function contentAdjustView(id) {
         title: ['作业内容调整', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'contentAdjustForm.html',
-        area: ['90%', '70%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
@@ -525,7 +525,7 @@ function periodAdjustView(id) {
         title: ['作业期限调整', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'periodAdjustForm.html',
-        area: ['50%', '60%'],
+        area: ['75%', '75%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
@@ -547,7 +547,7 @@ function priceAdjustView(id) {
         title: ['协议价调整', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'priceAdjustForm.html',
-        area: ['50%', '60%'],
+        area: ['75%', '75%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
@@ -570,7 +570,7 @@ function adjustRecordView(id) {
         title: ['调整记录', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'adjustRecordForm.html',
-        area: ['90%', '90%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['关闭'],
     });
@@ -602,4 +602,4 @@ function closeView() {
     $('.more-options').remove(); // 或者使用 currentMenu.remove();
     currentMenu = null;
     currentBtn = null;
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/smallSubManagement/totalProWorkloadManageList.js b/smz-web/js/work/smallSubManagement/totalProWorkloadManageList.js
index cdce3b1..7a93954 100644
--- a/smz-web/js/work/smallSubManagement/totalProWorkloadManageList.js
+++ b/smz-web/js/work/smallSubManagement/totalProWorkloadManageList.js
@@ -148,7 +148,7 @@ function insertProWorkload() {
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'totalProWorkloadManageForm.html',
-        area: ['50%', '60%'],
+        area: ['75%', '75%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
@@ -176,7 +176,7 @@ function buttonUpdateView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='修改' onclick='updateView(\"" + id + "\")'>修改</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='修改' onclick='updateView(\"" + id + "\")' style='background-color: transparent;color: #009688;'>修改</button>");
     return btn.prop("outerHTML");
 }
 
@@ -189,7 +189,7 @@ function updateView(id) {
         title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'totalProWorkloadManageForm.html',
-        area: ['50%', '60%'],
+        area: ['75%', '75%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
@@ -215,7 +215,7 @@ function buttonDelView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='delView(\"" + id + "\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='delView(\"" + id + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 
diff --git a/smz-web/js/work/smallSubManagement/totalProWorkloadManageOneList.js b/smz-web/js/work/smallSubManagement/totalProWorkloadManageOneList.js
index edb6c63..a1533e2 100644
--- a/smz-web/js/work/smallSubManagement/totalProWorkloadManageOneList.js
+++ b/smz-web/js/work/smallSubManagement/totalProWorkloadManageOneList.js
@@ -130,12 +130,12 @@ function insertProWorkload() {
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'totalProWorkloadManageList.html',
-        area: ['50%', '60%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         btn: ['确定','关闭'],
         success: function (layero, index) {
             var myIframe = window[layero.find('iframe')[0]['name']];
-            myIframe.getPros(); //aaa()为子页面的方法
+            myIframe.selectCheck(""); //aaa()为子页面的方法
         },
         end: function() {
             // 弹窗关闭时刷新当前页面数据
@@ -152,7 +152,7 @@ function buttonDetailsView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='修改' onclick='detailsView(\"" + id + "\")'>明细</button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='明细' onclick='detailsView(\"" + id + "\")' style='background-color: transparent;color: #009688;'>明细</button>");
     return btn.prop("outerHTML");
 }
 
@@ -164,7 +164,7 @@ function detailsView(id) {
         title: ['明细', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
         content: 'totalProWorkloadManageList.html',
-        area: ['100%', '100%'],
+        area: ['97.5%', '97.5%'],
         maxmin: false,
         success: function (layero, index) {
             var myIframe = window[layero.find('iframe')[0]['name']];
@@ -196,4 +196,4 @@ function getPro() {
             form.render(); //这里就是我们要渲染的地方了
         }
     })
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/sysMag/corporationMag.js b/smz-web/js/work/sysMag/corporationMag.js
index 784d542..75ef8de 100644
--- a/smz-web/js/work/sysMag/corporationMag.js
+++ b/smz-web/js/work/sysMag/corporationMag.js
@@ -193,8 +193,8 @@ function changeShowRemarks(obj) {//obj是td
  * */
 function insertCorporation() {
     localStorage.setItem("corporationType","新增");
-    var height = '85%';
-    var width = '85%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -230,8 +230,8 @@ function edit(id) {
         data: {"id": id},
         dataType: 'json',
         success: function (data) {
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -273,8 +273,8 @@ function view(id) {
         dataType: 'json',
         success: function (data) {
             localStorage.setItem("corporationType","查看");
-            var height = '85%';
-            var width = '85%';
+            var height = '75%';
+            var width = '75%';
             var index = layer.open({
                 title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
@@ -323,8 +323,8 @@ function del(id) {
  * */
 function audit(id,) {
     localStorage.setItem("auditId",id);
-    var height = '525px';
-    var width = '475px';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: ['审核', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
         type: 2,
@@ -359,7 +359,7 @@ function buttonView(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")' style='background-color: transparent;color: #009688;'> 详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -370,7 +370,7 @@ function buttonEdits(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")'><i class='layui-icon'>&#xe642;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='edit(\"" + id + "\")' style='background-color: transparent;color: #009688;'> 编辑</button>");
     return btn.prop("outerHTML");
 }
 
@@ -381,7 +381,7 @@ function buttonDel(data, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")'><i class='layui-icon'>&#xe640;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + data + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
     return btn.prop("outerHTML");
 }
 // 审核按钮
@@ -391,7 +391,7 @@ function buttonAudit(id, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='审核' onclick='audit(\"" + id + "\")'><i class='layui-icon'>&#xe672;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='审核' onclick='audit(\"" + id + "\")' style='background-color: transparent;color: #009688;'>审核</button>");
     return btn.prop("outerHTML");
 }
 /**
@@ -444,4 +444,4 @@ function getCompanyType() {
 
 function getProjectParent() {
     getCompanyType(layui.form);
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/monthWagesForm.js b/smz-web/js/work/uploadResults/monthWagesForm.js
index bd41d44..0381ef2 100644
--- a/smz-web/js/work/uploadResults/monthWagesForm.js
+++ b/smz-web/js/work/uploadResults/monthWagesForm.js
@@ -120,7 +120,7 @@ function buttonDownload(fileName,filePath, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )'><i class='layui-icon'>&#xe601;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )' style='background-color: transparent;color: #009688;'>下载</button>");
     return btn.prop("outerHTML");
 }
 
diff --git a/smz-web/js/work/uploadResults/monthWagesList.js b/smz-web/js/work/uploadResults/monthWagesList.js
index 039f9d4..2e8b667 100644
--- a/smz-web/js/work/uploadResults/monthWagesList.js
+++ b/smz-web/js/work/uploadResults/monthWagesList.js
@@ -124,8 +124,8 @@ function init() {
  * 查看
  * */
 function view(month,proId) {
-    var height = '90%';
-    var width = '90%';
+    var height = '97.5%';
+    var width = '97.5%';
     localStorage.setItem("monthWages", month)
     localStorage.setItem("proIdWages", proId)
     var index = layer.open({
@@ -153,7 +153,7 @@ function buttonView(month, proId, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+month+"\",  \""+proId+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+month+"\",  \""+proId+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -190,4 +190,4 @@ function resetProject() {
     // 重新渲染 select 下拉框
     layui.form.render("select");
     example.ajax.reload();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/personWagesForm.js b/smz-web/js/work/uploadResults/personWagesForm.js
index 716eb1c..48dae2a 100644
--- a/smz-web/js/work/uploadResults/personWagesForm.js
+++ b/smz-web/js/work/uploadResults/personWagesForm.js
@@ -206,7 +206,7 @@ function buttonDownload(fileName,filePath, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )'><i class='layui-icon'>&#xe601;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )' style='background-color: transparent;color: #009688;'>下载</button>");
     return btn.prop("outerHTML");
 }
 
@@ -216,7 +216,7 @@ function download(fileName, filePath) {
         layer.msg('文件路径无效');
         return;
     }
-    
+
     // 创建a标签进行下载
     var a = document.createElement('a');
     a.href = smz_ht_url + "/" + filePath;
diff --git a/smz-web/js/work/uploadResults/personWagesList.js b/smz-web/js/work/uploadResults/personWagesList.js
index 6780169..1bc355e 100644
--- a/smz-web/js/work/uploadResults/personWagesList.js
+++ b/smz-web/js/work/uploadResults/personWagesList.js
@@ -123,8 +123,8 @@ function init() {
  * 查看
  * */
 function view(idNumber) {
-    var height = '90%';
-    var width = '90%';
+    var height = '97.5%';
+    var width = '97.5%';
     localStorage.setItem("idNumberWages", idNumber)
     var index = layer.open({
         title: ['详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
@@ -143,7 +143,7 @@ function buttonView(idNumber, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+idNumber+"\" )'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+idNumber+"\" )' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -180,4 +180,4 @@ function resetProject() {
     // 重新渲染 select 下拉框
     layui.form.render("select");
     example.ajax.reload();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/proWagesForm.js b/smz-web/js/work/uploadResults/proWagesForm.js
index 610030b..2686573 100644
--- a/smz-web/js/work/uploadResults/proWagesForm.js
+++ b/smz-web/js/work/uploadResults/proWagesForm.js
@@ -117,7 +117,7 @@ function buttonDownload(fileName,filePath, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )'><i class='layui-icon'>&#xe601;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='下载' onclick='download(\""+fileName+"\",\""+filePath+"\" )' style='background-color: transparent;color: #009688;'>下载</button>");
     return btn.prop("outerHTML");
 }
 
@@ -127,7 +127,7 @@ function download(fileName, filePath) {
         layer.msg('文件路径无效');
         return;
     }
-    
+
     // 创建a标签进行下载
     var a = document.createElement('a');
     a.href = smz_ht_url + "/" + filePath;
diff --git a/smz-web/js/work/uploadResults/proWagesList.js b/smz-web/js/work/uploadResults/proWagesList.js
index 583c193..6b504b2 100644
--- a/smz-web/js/work/uploadResults/proWagesList.js
+++ b/smz-web/js/work/uploadResults/proWagesList.js
@@ -123,8 +123,8 @@ function init() {
  * 查看
  * */
 function view(proId) {
-    var height = '90%';
-    var width = '90%';
+    var height = '97.5%';
+    var width = '97.5%';
     localStorage.setItem("proIdWages", proId)
     var index = layer.open({
         title: ['详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
@@ -143,7 +143,7 @@ function buttonView(proId, permission, pers) {
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+proId+"\" )'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+proId+"\" )' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 
@@ -180,4 +180,4 @@ function resetProject() {
     // 重新渲染 select 下拉框
     layui.form.render("select");
     example.ajax.reload();
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/uploadResultsAddForm.js b/smz-web/js/work/uploadResults/uploadResultsAddForm.js
index 91b3031..3dba42c 100644
--- a/smz-web/js/work/uploadResults/uploadResultsAddForm.js
+++ b/smz-web/js/work/uploadResults/uploadResultsAddForm.js
@@ -299,8 +299,8 @@ function importExcel(){
 }
 function openResult(){
     localStorage.setItem("submitrewordNum",$("#rewordNum").val());
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: '结果',
         type: 2,
@@ -315,8 +315,8 @@ function openResult(){
  */
 function ruleView(){
     localStorage.setItem("uprewordNum",$("#rewordNum").val());
-    var height = '90%';
-    var width = '60%';
+    var height = '75%';
+    var width = '75%';
     var index = layer.open({
         title: '比对说明',
         type: 2,
@@ -364,8 +364,8 @@ function jieguo(){
  * 跳转考勤统计页面
  */
 function goDownload(){
-    var height = '95%';
-    var width = '95%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = parent.layer.open({
         title: '考勤统计',
         type: 2,
@@ -381,8 +381,8 @@ function resultsView(){
         return;
     }
     localStorage.setItem("uprewordNum",$("#rewordNum").val());
-    var height = '95%';
-    var width = '95%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = parent.layer.open({
         title: '考勤统计',
         type: 2,
@@ -403,4 +403,4 @@ function reloading() {
     parent.layer.closeAll();
     layer.closeAll();
     window.parent.example.ajax.reload(null, false); // 刷新页面
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/uploadResultsList.js b/smz-web/js/work/uploadResults/uploadResultsList.js
index d67833f..3b66b69 100644
--- a/smz-web/js/work/uploadResults/uploadResultsList.js
+++ b/smz-web/js/work/uploadResults/uploadResultsList.js
@@ -229,8 +229,8 @@ function edit(id) {
 function view(id) {
     localStorage.setItem("pageType", "查看");
     localStorage.setItem("uprewordNum", id);
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: '详情',
         type: 2,
@@ -281,7 +281,7 @@ function del(id) {
 
 // 详情按钮
 function buttonView(id) {
-    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")'><i class='layui-icon'>&#xe63c;</i></button>");
+    var btn = $("<button class='layui-btn layui-btn-xs' title='详情' onclick='view(\""+id+"\")' style='background-color: transparent;color: #009688;'>详情</button>");
     return btn.prop("outerHTML");
 }
 // 编辑按钮
@@ -307,8 +307,8 @@ function buttonDel(data, permission, pers){
 }
 // 新增特征信息弹出框
 function addFeaturesInfo(){
-    var height = '100%';
-    var width = '100%';
+    var height = '97.5%';
+    var width = '97.5%';
     var index = layer.open({
         title: '新增',
         type: 2,
@@ -353,4 +353,4 @@ function processView(){
 
         }
     });
-}
\ No newline at end of file
+}
diff --git a/smz-web/js/work/uploadResults/uploadResultsView.js b/smz-web/js/work/uploadResults/uploadResultsView.js
index 4ae9b91..99646f3 100644
--- a/smz-web/js/work/uploadResults/uploadResultsView.js
+++ b/smz-web/js/work/uploadResults/uploadResultsView.js
@@ -551,8 +551,8 @@ function del() {
 	})
 }
 function update(){
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: '修改',
 		type: 2,
@@ -580,8 +580,8 @@ function update(){
 	});
 }
 function xianxia() {
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var rewordNum=$("#rewordNum").val();
 	localStorage.setItem("mrewordNum",rewordNum);
 	localStorage.setItem("xianxiaindex",rewordNum);
@@ -601,8 +601,8 @@ function xianxia() {
 }
 
 function view(id) {
-	var height = '100%';
-	var width = '100%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: ['异常','color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
 		type: 2,
@@ -630,8 +630,8 @@ function packageDownload() {
  * 查看流程
  */
 function processView(){
-	var height = '100%';
-	var width = '70%';
+	var height = '97.5%';
+	var width = '97.5%';
 	var index = layer.open({
 		title: '流程说明',
 		type: 2,
@@ -658,4 +658,4 @@ function reloading() {
 	parent.layer.closeAll();
 	layer.closeAll();
 	window.parent.example.ajax.reload(null, false); // 刷新页面
-}
\ No newline at end of file
+}
diff --git a/smz-web/pages/personnelWarning/attentionWarningList.html b/smz-web/pages/personnelWarning/attentionWarningList.html
index 6de662c..85b91f0 100644
--- a/smz-web/pages/personnelWarning/attentionWarningList.html
+++ b/smz-web/pages/personnelWarning/attentionWarningList.html
@@ -50,11 +50,16 @@
                                             </select>
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <button id="exportBt" onclick="exportBtnAttentionWarning()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-input-inline" style="margin-top: -0.5%;">
+                                    <button id="exportBt" onclick="exportBtnAttentionWarning()" class="layui-btn layui-btn-sm">导出</button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -65,7 +70,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>姓名</th>
diff --git a/smz-web/pages/personnelWarning/speciaWarningList.html b/smz-web/pages/personnelWarning/speciaWarningList.html
index 9c50c07..6a0ca6c 100644
--- a/smz-web/pages/personnelWarning/speciaWarningList.html
+++ b/smz-web/pages/personnelWarning/speciaWarningList.html
@@ -50,11 +50,16 @@
                                             </select>
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <button id="exportBt" onclick="exportBtnJobWarning()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-input-inline" style="margin-top: -0.5%;">
+                                    <button id="exportBt" onclick="exportBtnJobWarning()" class="layui-btn layui-btn-sm">导出</button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -65,7 +70,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>姓名</th>
diff --git a/smz-web/pages/work/managementReview/managementResultsView.html b/smz-web/pages/work/managementReview/managementResultsView.html
index ff8538a..934d5eb 100644
--- a/smz-web/pages/work/managementReview/managementResultsView.html
+++ b/smz-web/pages/work/managementReview/managementResultsView.html
@@ -13,13 +13,13 @@
     <title>详情</title>
 
 </head>
-<body>
+<body style="padding: 0 24px 0 24px;width: 96%;" >
 <script type="text/html" id="opeator-bar">
-    <button class="layui-btn layui-btn-sm " lay-event="edit"><img src="../../../img/search.png">预览</button>
-    <button class="layui-btn layui-btn-sm " lay-event="del"><img src="../../../img/downloads.png">下载</button>
+    <button class="layui-btn layui-btn-sm " lay-event="edit">预览</button>
+    <button class="layui-btn layui-btn-sm " lay-event="del">下载</button>
 </script>
 
-<div class="title">
+<div class="title" style="padding: 0 24px 0 24px">
     <div>
         <input type="hidden" id="rewordNum" name="rewordNum">
         <input type="hidden" id="state" name="state">
@@ -35,20 +35,20 @@
     </div>
     <div>
         <button class="layui-btn layui-bg-blue" style="display: none" id="tijiao" onclick="pass()">
-            <i class="layui-icon layui-icon-edit"></i>
+
             审核
         </button>
 
         <button class="layui-btn layui-bg-red" style="display: none" id="xianxia" onclick="xianxia()">
-            <i class="layui-icon layui-icon-upload-circle"></i>
+
             线下发放附件上传
         </button>
         <button class="layui-btn layui-bg-blue" style="display: none" id="shanchu" onclick="noPass()">
-            <i class="layui-icon layui-icon-delete"></i>
+
             驳回
         </button>
         <button class="layui-btn layui-bg-blue" onclick="packageDownload()">
-            <i class="layui-icon layui-icon-download-circle"></i>
+
             下载
         </button>
     </div>
@@ -357,4 +357,4 @@
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/managementReview/managementReviewList.html b/smz-web/pages/work/managementReview/managementReviewList.html
index 7b278d1..ebbcfa4 100644
--- a/smz-web/pages/work/managementReview/managementReviewList.html
+++ b/smz-web/pages/work/managementReview/managementReviewList.html
@@ -34,7 +34,7 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="form-inline" onsubmit="return false">
+                            <form class="form-inline layui-form" onsubmit="return false">
                                 <div id="commonFunctionsContent">
                                     <span id="" class="checkData" onclick="stateBtn('')"
                                           style="border-bottom-left-radius:4px;border-top-left-radius:2px;background-color: #31A7FF;color: #fff">全部</span><span
@@ -44,21 +44,30 @@
                                         style="border-bottom-right-radius:4px;border-top-right-radius:2px;">已驳回</span>
                                 </div>
                                 <div class="form-group">
-                                    <input id="keyWord" name="keyWord" type="text" class="form-control" placeholder="搜索关键词">
-                                    <input type="text" class="form-control" id="months" autocomplete="off"
-                                           placeholder="选择月份范围">
-                                    <div class="layui-input-inline">
-                                        <select id="state" class="form-control" name="state">
-                                            <option value="">核定结果审核状态</option>
-                                            <option value="0">待提交</option>
-                                            <option value="1">待确认</option>
-                                            <option value="2">已驳回</option>
-                                            <option value="3">已确认</option>
-                                        </select>
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                        <input id="keyWord" name="keyWord" type="text" class="layui-input" placeholder="搜索关键词">
+                                        </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i
-                                            class="layui-icon">&#xe615;</i>搜索
-                                    </button>
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                            <input type="text" class="layui-input" id="months" autocomplete="off"
+                                           placeholder="选择月份范围">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline">
+                                            <select id="state"  name="state">
+                                                <option value="">核定结果审核状态</option>
+                                                <option value="0">待提交</option>
+                                                <option value="1">待确认</option>
+                                                <option value="2">已驳回</option>
+                                                <option value="3">已确认</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
                                 </div>
                             </form>
                         </td>
@@ -73,7 +82,7 @@
                 <table id="dt-table"
                        class="table table-striped table-bordered table-hover"
                        style="width: 100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th style="width:1%">序号</th>
                         <th>核定编号</th>
@@ -108,4 +117,4 @@
 <script type="text/javascript" src="../../../js/work/managementReview/managementReviewList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/Announcement.html b/smz-web/pages/work/ownPerson/Announcement.html
index a6169d5..ac3d8b7 100644
--- a/smz-web/pages/work/ownPerson/Announcement.html
+++ b/smz-web/pages/work/ownPerson/Announcement.html
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/bootstrap.min.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/dataTables.bootstrap.min.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../layui/css/layui.css">
-	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/proManager.css">
+<!--	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/proManager.css">-->
 </head>
 <body>
 <div>
@@ -16,30 +16,29 @@
 				<table style="width: 100%">
 					<tr>
 						<td>
-							<form class="form-inline" onsubmit="return false">
+							<form class="form-inline layui-form" onsubmit="return false">
 								<div class="form-group">
-									公告标题：<input id="ggbt"  type="text" class="form-control"placeholder="请输入标题">
-									发布日期：<input type="text" style="width: 15%;" class="form-control" readonly placeholder="请选择日期" id="startTime">
-									<span>~</span>
-									<input type="text" style="width: 15%;" class="form-control" readonly placeholder="请选择日期" id="endTime" value='@DateTime.Now.ToString("yyyy-MM-dd")'>
-<!--									permission="sys:user:query"-->
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-									<button id="createBt"  class="layui-btn layui-btn-sm" onclick="insertAnnouncement()"><i class="layui-icon">&#xe608;</i>发布公告</button>
-									<input type="hidden" id="hidMinListDate" value="2021-01-01" />
-									<input type="hidden" id="hidMaxListDate" value='@DateTime.Now.ToString("yyyy-MM-dd")' />
+									<div class="layui-inline" >
+										<div class="layui-input-inline">
+											<input id="ggbt"  type="text" class="layui-input"placeholder="请输入标题">
+										</div>
+									</div>
+
+
+									<div class="layui-input-inline">
+										<input type="text" id="test6" class="layui-input"
+											   placeholder="请选择日期范围" readonly>
+										<input type="hidden" id="hidMinListDate" value="2021-01-01"/>
+										<input type="hidden" id="hidMaxListDate"
+											   value='@DateTime.Now.ToString("yyyy-MM-dd")'/>
+									</div>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
 								</div>
 							</form>
+							<div class="layui-inline" style="margin-top: 5px;">
+								<button id="createBt"  class="layui-btn layui-btn-sm" onclick="insertAnnouncement()">发布公告</button>
+							</div>
 						</td>
-<!--						<td align="right">-->
-<!--							<button class="layui-btn layui-btn-sm" onclick="addFeaturesInfo()">-->
-<!--								<i class="layui-icon">&#xe608;</i>新增持证信息-->
-<!--							</button>-->
-<!--						</td>-->
-					<!--	<td align="right">
-							<button class="layui-btn layui-btn-sm" onclick="addPorject()">
-								<i class="layui-icon">&#xe608;</i> 添加
-							</button>
-						</td>-->
 					</tr>
 				</table>
 			</div>
@@ -51,7 +50,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:5%">序号</th>
 						<th style="width:25%">公告标题</th>
@@ -85,4 +84,4 @@
 <script type="text/javascript" src="../../../js/work/ownPerson/Announcement.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/AnnouncementForm.html b/smz-web/pages/work/ownPerson/AnnouncementForm.html
index 9ae3dd7..3cc0627 100644
--- a/smz-web/pages/work/ownPerson/AnnouncementForm.html
+++ b/smz-web/pages/work/ownPerson/AnnouncementForm.html
@@ -23,7 +23,7 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
 
@@ -97,4 +97,4 @@
 </div>
 </body>
 <script type="text/javascript" src="../../../js/work/ownPerson/AnnouncementForm.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/addContractNumber.html b/smz-web/pages/work/ownPerson/addContractNumber.html
index 2f90389..b8fee49 100644
--- a/smz-web/pages/work/ownPerson/addContractNumber.html
+++ b/smz-web/pages/work/ownPerson/addContractNumber.html
@@ -11,15 +11,15 @@
     <script type="text/javascript" src="../../../js/jq.js"></script>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px">
 <form class="layui-form" id="formDemo" action="" onsubmit=" return false">
     <input type="hidden" id="id" name="id">
 
-    <div class="layui-form-item" style="margin-left: 25%;">
+    <div class="layui-form-item" style="margin-top: 3%;">
         <div class="layui-inline">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 单位编号</label>
             <div class="layui-input-inline">
-                <input type="text" name="contractNumber" id="contractNumber" required  lay-verify="required" class="layui-input" style="margin-top: 1%;">
+                <input type="text" name="contractNumber" id="contractNumber" required  lay-verify="required" class="layui-input" >
             </div>
         </div>
     </div>
@@ -34,4 +34,4 @@
 </div>
 </body>
 <script type="text/javascript" src="../../../js/work/ownPerson/addContractNumber.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/contractNumber.html b/smz-web/pages/work/ownPerson/contractNumber.html
index 4cbb0da..f7c5430 100644
--- a/smz-web/pages/work/ownPerson/contractNumber.html
+++ b/smz-web/pages/work/ownPerson/contractNumber.html
@@ -31,7 +31,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>分公司（二级单位）</th>
@@ -61,4 +61,4 @@
 <script type="text/javascript" src="../../../js/dict.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/contractNumber.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/corporationMag.html b/smz-web/pages/work/ownPerson/corporationMag.html
index 94c12b6..7a3a1a5 100644
--- a/smz-web/pages/work/ownPerson/corporationMag.html
+++ b/smz-web/pages/work/ownPerson/corporationMag.html
@@ -31,20 +31,23 @@
                             <form class="form-inline layui-form" onsubmit="return false" id="form">
                                 <div class="form-group" >
                                     <div class="layui-inline">
-                                        <div class="layui-input-inline" style="margin-top: 1.3%">
+                                        <div class="layui-input-inline" >
                                             <input id="keyWord" type="text" class="layui-input" placeholder="请输入关键字">
                                         </div>
                                     </div>
                                     <button id="searchBt" class="layui-btn layui-btn-sm"
-                                            permission="sys:companyManage:query" style="margin-top: 2%;"><i
-                                            class="layui-icon">&#xe615;</i>搜索
-                                    </button>
-                                    <button class="layui-btn layui-btn-sm"
-                                            permission="sys:companyManage:add" style="margin-top: 2%;" onclick="insertCorporations()">
-                                        <i class="layui-icon">&#xe608;</i>添加
+                                            permission="sys:companyManage:query" style="margin-top: 2%;">搜索
                                     </button>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 10px;">
+                                <div class="layui-input-inline" >
+                                    <button class="layui-btn layui-btn-sm"
+                                            permission="sys:companyManage:add" style="margin-top: 2%;" onclick="insertCorporations()">
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
 
                     </tr>
@@ -56,7 +59,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>公司名称</th>
@@ -90,4 +93,4 @@
 <script type="text/javascript" src="../../../js/dict.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/corporationMag.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/dictionaryForm.html b/smz-web/pages/work/ownPerson/dictionaryForm.html
index 547ab47..ec12a0a 100644
--- a/smz-web/pages/work/ownPerson/dictionaryForm.html
+++ b/smz-web/pages/work/ownPerson/dictionaryForm.html
@@ -22,10 +22,10 @@
 	</style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px;">
 	<form class="layui-form" enctype="multipart/form-data" id="" action="">
 		<input type="hidden" id="id" name="id">
-		<div class="layui-form-item" style="margin-left: 25%;display: none" id="parentNode">
+		<div class="layui-form-item" style="margin-left: 25%;margin-top:2%;display: none" id="parentNode">
 			<div class="layui-input-inline" style="width: 350px">
 				<label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 上级节点</label>
 				<div class="layui-input-block">
@@ -69,4 +69,4 @@
 </div>
 </body>
 <script type="text/javascript" src="../../../js/work/ownPerson/dictionaryForm.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/dictionaryList.html b/smz-web/pages/work/ownPerson/dictionaryList.html
index 23a4cee..f52ee93 100644
--- a/smz-web/pages/work/ownPerson/dictionaryList.html
+++ b/smz-web/pages/work/ownPerson/dictionaryList.html
@@ -26,31 +26,34 @@
                                         <div class="form-group" style="width: 100%;">
                                             <div class="layui-inline" >
                                                 <div class="layui-input-inline">
-                                                    字典名称：
-                                                    <input id="keyWord" type="text" class="form-control" placeholder="请输入字典名称">
+                                                    <input id="keyWord" type="text" class="layui-input" placeholder="请输入字典名称">
                                                 </div>
                                             </div>
-                                            <button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:dictionary:query"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                            <button class="layui-btn layui-btn-sm" onclick="insertDictionary()" permission="sys:dictionary:query">
-                                                <i class="layui-icon">&#xe608;</i> 添加
-                                            </button>
+                                            <button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:dictionary:query">搜索</button>
                                         </div>
                                     </form>
+                                    <div class="layui-inline" style="margin-top: 7px;">
+                                        <div class="layui-input-inline">
+                                            <button class="layui-btn layui-btn-sm" onclick="insertDictionary()" permission="sys:dictionary:query">
+                                                添加
+                                            </button>
+                                        </div>
+                                    </div>
 								</td>
 								<!--<td align="right">
 	                   				<button class="layui-btn layui-btn-sm" onclick="location.href='addMenu.html'" permission="sys:menu:add">
                                       <i class="layui-icon">&#xe608;</i> 添加
                                     </button>
 	                   			</td>-->
-	                   		</tr> 
+	                   		</tr>
 	                    </table>
 					</div>
                 </header>
-                
+
                 <div>
                     <div class="widget-body no-padding">
                         <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                             <tr>
+                             <tr style="background-color: #FAFAFA !important;">
                                  <th>字典名称</th>
                                  <th>备注</th>
                                  <th>操作</th>
diff --git a/smz-web/pages/work/ownPerson/own-certificate-form.html b/smz-web/pages/work/ownPerson/own-certificate-form.html
index 0eaf630..1f1f39a 100644
--- a/smz-web/pages/work/ownPerson/own-certificate-form.html
+++ b/smz-web/pages/work/ownPerson/own-certificate-form.html
@@ -11,7 +11,7 @@
     <script type="text/javascript" src="../../../js/jq.js"></script>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px">
 <form class="layui-form" id="formDemo" action="" onsubmit=" return false">
     <input type="hidden" id="id" name="id">
     <input type="hidden" id="ids" name="ids">
@@ -67,4 +67,4 @@
 </div>
 </body>
 <script type="text/javascript" src="../../../js/work/ownPerson/own-certificate-form.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/own-certificate-list.html b/smz-web/pages/work/ownPerson/own-certificate-list.html
index a562a63..5daeae7 100644
--- a/smz-web/pages/work/ownPerson/own-certificate-list.html
+++ b/smz-web/pages/work/ownPerson/own-certificate-list.html
@@ -23,11 +23,12 @@
                             <form class="form-inline layui-form" onsubmit="return false">
                                 <div class="form-group">
                                     <div class="layui-inline" >
-                                        <div class="layui-input-inline" style="display: flex;align-items: center;margin-top: 1%">
-                                            <input type="text" class="form-control" placeholder="证件名称" id="keyWord">
-                                            <button id="searchBt" class="layui-btn layui-btn-sm" style="margin-left: 15px"><i class="layui-icon"></i>搜索</button>
+                                        <div class="layui-input-inline" >
+                                            <input type="text" class="layui-input" placeholder="证件名称" id="keyWord">
+
                                         </div>
                                     </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm" >搜索</button>
                                 </div>
                             </form>
                         </td>
@@ -39,7 +40,7 @@
         <div>
             <div class="widget-body no-padding">
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>证件名称</th>
@@ -67,4 +68,4 @@
 <script type="text/javascript" src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/dict.js"></script>
 <script type="text/javascript" src="../../../js/select.js"></script>
-<script type="text/javascript" src="../../../js/work/ownPerson/own-certificate-list.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/ownPerson/own-certificate-list.js"></script>
diff --git a/smz-web/pages/work/ownPerson/own-certificate.html b/smz-web/pages/work/ownPerson/own-certificate.html
index bfc938a..cf25185 100644
--- a/smz-web/pages/work/ownPerson/own-certificate.html
+++ b/smz-web/pages/work/ownPerson/own-certificate.html
@@ -47,14 +47,16 @@
                                                 </div>
                                             </div>
                                             <select id="ryxz" name="ryxz" class="layui-input" style="width: 15%; margin-right: 10px;height: 38px;" lay-search></select>
-                                            <span style="padding-left: 15px">人员姓名：</span> <input type="text" style="height: 38px;width:10%;" id="name" name="name" placeholder="请输入人员姓名" class="form-control">
-                                            <span style="padding-left: 15px">身份证号：</span> <input type="text" style="height: 38px;width:10%; margin-right: 15px" id="idNumber" name="idNumber" placeholder="请输入身份证号" class="form-control">
-                                            <select id="state" name="state">
-                                                <option value="">请选择在职状态</option>
-                                                <option value="1">在职</option>
-                                                <option value="2">离职</option>
-                                            </select>
-                                            <button id="searchBt" class="layui-btn layui-btn-sm" style="margin-left: 15px"><i class="layui-icon">&#xe615;</i>搜索</button>
+                                            <input type="text" style="height: 38px;width:15%; margin-left: 8px;" id="name" name="name" placeholder="请输入人员姓名" class="layui-input">
+                                            <input type="text" style="height: 38px;width:15%; margin-left: 8px;" id="idNumber" name="idNumber" placeholder="请输入身份证号" class="layui-input">
+                                            <div style="margin-left: 8px;">
+                                                <select id="state" name="state" >
+                                                    <option value="">请选择在职状态</option>
+                                                    <option value="1">在职</option>
+                                                    <option value="2">离职</option>
+                                                </select>
+                                            </div>
+                                            <button id="searchBt" class="layui-btn layui-btn-sm" style="margin-left: 15px">搜索</button>
                                         </div>
                                 </div>
                             </form>
@@ -68,7 +70,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th >序号</th>
                         <th >所属单位</th>
@@ -108,4 +110,4 @@
 <script type="text/javascript" src="../../../js/select.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/own-certificate.js"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/ownContractView.html b/smz-web/pages/work/ownPerson/ownContractView.html
index 1875e1c..f4675d4 100644
--- a/smz-web/pages/work/ownPerson/ownContractView.html
+++ b/smz-web/pages/work/ownPerson/ownContractView.html
@@ -6,9 +6,7 @@
     <link rel="stylesheet" type="text/css" href="../../../css/work/person/contract/contractView.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="../../../layui/css/layui.css">
     <script src="../../../js/libs/jquery-3.7.1.min.js"></script>
-    <script src="../../../js/public.js"></script>
 		<script type="text/javascript" src="../../../../public/public.js"></script>
-    <script src="../../../js/publicJs.js"></script>
     <script src="../../../js/filePreview.js"></script>
     <script src="../../../js/work/ownPerson/contractView.js"></script>
 </head>
@@ -23,4 +21,4 @@
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/paySlip.html b/smz-web/pages/work/ownPerson/paySlip.html
index dab9a9b..1728a77 100644
--- a/smz-web/pages/work/ownPerson/paySlip.html
+++ b/smz-web/pages/work/ownPerson/paySlip.html
@@ -49,26 +49,26 @@
                             <form class="layui-form" onsubmit="return false">
                                 <div class="">
                                     <div class="layui-input-inline" style="display: flex;align-items: center;">
-                                        <input style="width: 150px;" type="text" name="month" class="layui-input" autocomplete="off" id="month" placeholder="请输入月份" lay-key="1">
-                                        <select id="typeName" name="typeName"  class="form-control input-sm" lay-verify="required" lay-search="" ></select>
+                                        <input style="width: 150px; margin-right: 8px;" type="text" name="month" class="layui-input" autocomplete="off" id="month" placeholder="请输入月份" lay-key="1">
+                                        <select id="typeName" name="typeName" lay-search="" ></select>
                                         <input type="text" style="height: 38px;margin: 0px;width:10%;margin-left: 10px;" id="orgName" name="orgName" placeholder="请输用工单位" class="form-control">
                                         <input type="text" style="height: 38px;margin: 0px;width:10%;margin-left: 10px;" id="idNumber" name="proName" placeholder="请输入身份证" class="form-control">
                                         <input type="text" style="height: 38px;margin: 0px;width:10%;margin-left: 10px;" id="name" name="name" placeholder="输入人员姓名" class="form-control">
 
-                                        <button id="searchBt" style="margin-left: 10px;" class="layui-btn layui-btn-sm" permission="sys:workerOn:query"><i class="layui-icon">&#xe615;</i>搜索</button>
+                                        <button id="searchBt" style="margin-left: 10px;" class="layui-btn layui-btn-sm" permission="sys:workerOn:query">搜索</button>
                                         <input id="articleImageFile" name="excelFile" type="file" class="form-control" style="width: 200px; display: inline;margin-left: 2px;padding: 2px 12px;" />
-                                        <input id="saveZipButton" type="button" style="width: 60px;height: 30px;margin-left: 10px;padding: 2px 0px;" value="导入" />
+                                        <input id="saveZipButton" type="button" class="layui-btn layui-btn-sm" value="导入" style="margin-left: 2px;" />
                                         <input type="file" id="import-excel" name="image" style="display: none;"/>
                                         <button class="layui-btn layui-btn-sm" onclick="downPaySlip()" style="margin-left: 2px;">
-                                            <i class="layui-icon">&#xe601;</i> 模板下载
+                                            模板下载
                                         </button>
 
                                         <button class="layui-btn layui-btn-sm" onclick="exportBtn()"
-                                                style="margin-left: 2px;"><i class="layui-icon">&#xe640;</i>导出
+                                                style="margin-left: 2px;">导出
                                         </button>
 
                                         <button class="layui-btn layui-btn-sm" onclick="delPaySlipBtn()"
-                                                style="margin-left: 2px;"><i class="layui-icon">&#xe640;</i>删除
+                                                style="margin-left: 2px;">删除
                                         </button>
 
 <!--                                        <button id="exportBt" onclick="exportPaySlipBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>-->
@@ -85,7 +85,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="display nowrap" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class="thText">序号</th>
                         <th class="thText">姓名</th>
@@ -162,4 +162,4 @@
 <script type="text/javascript" src="../../../js/plugin/datatables/dataTables.fixedColumns.min.js"></script>
 <!--引入下拉选js-->
 <script type="text/javascript" src="../../../js/select.js"></script>
-<script type="text/javascript" src="../../../js/work/ownPerson/paySlip.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/ownPerson/paySlip.js" defer="defer"></script>
diff --git a/smz-web/pages/work/ownPerson/workerBenefits.html b/smz-web/pages/work/ownPerson/workerBenefits.html
index c9d8d03..e8b32c7 100644
--- a/smz-web/pages/work/ownPerson/workerBenefits.html
+++ b/smz-web/pages/work/ownPerson/workerBenefits.html
@@ -50,7 +50,7 @@
                                             <option value="2">离职</option>
                                         </select>
 
-                                        <button id="searchBt" style="margin-left: 10px;margin-top: 7px;" class="layui-btn layui-btn-sm" permission="sys:workerBenefits:query"><i class="layui-icon">&#xe615;</i>搜索</button>
+                                        <button id="searchBt" style="margin-left: 10px;margin-top: 7px;" class="layui-btn layui-btn-sm" permission="sys:workerBenefits:query">搜索</button>
                                     </div>
                                 </div>
                             </form>
@@ -65,7 +65,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>所属单位</th>
@@ -101,4 +101,4 @@
 <script type="text/javascript" src="../../../js/companyTree.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerBenefits.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/workerBenefitsList.html b/smz-web/pages/work/ownPerson/workerBenefitsList.html
index ba8ea23..b94ed01 100644
--- a/smz-web/pages/work/ownPerson/workerBenefitsList.html
+++ b/smz-web/pages/work/ownPerson/workerBenefitsList.html
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="../../../css/ztree/zTreeStyle/zTreeStyle.css" type="text/css">
     <style>
         .layui-form-select .layui-edge {
-            margin-top: 1px!important;
+            margin-top: 17px!important;
         }
     </style>
 </head>
@@ -24,26 +24,33 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="layui-form" onsubmit="return false">
-                                <div class="layui-inline">
-                                    <div class="layui-input-inline" style="display: flex;align-items: center;">
-                                        <input type="text" style="width: 14%; margin-top: 5px;" class="form-control" readonly placeholder="请选择日期" id="startTime">
-                                        <span>~</span>
-                                        <input type="text" style="width: 14%; margin-top: 5px;" class="form-control" readonly placeholder="请选择日期" id="endTime" value='@DateTime.Now.ToString("yyyy-MM-dd")'>
-                                        &nbsp;
-                                        <select id="reportType" name="reportType"  class="form-control input-sm" lay-verify="required" lay-search="" ></select>
-
-                                        <button id="searchBt" style="margin-left: 10px; margin-top: 5px;" class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-
-                                        <button class="layui-btn layui-btn-sm" onclick="inserts()" style="margin-top: 5px;" >
-                                            <i class="layui-icon">&#xe608;</i> 添加
-                                        </button>
-
-                                        <input type="hidden" id="hidMinListDate" value="2021-01-01" />
-                                        <input type="hidden" id="hidMaxListDate" value='2099-12-31' />
+                            <form class="form-inline layui-form" onsubmit="return false">
+                                <div class="form-group">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" id="test6" class="layui-input"
+                                                   placeholder="请选择日期范围" readonly>
+                                            <input type="hidden" id="hidMinListDate" value="2021-01-01"/>
+                                            <input type="hidden" id="hidMaxListDate"
+                                                   value='@DateTime.Now.ToString("yyyy-MM-dd")'/>
+                                        </div>
                                     </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="reportType" name="reportType" lay-search="" ></select>
+                                        </div>
+                                    </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm" style="margin-top: 8px;">搜索</button>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 8px;" >
+                                <div class="layui-input-inline">
+                                    <button class="layui-btn layui-btn-sm" onclick="inserts()" >
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
 
                     </tr>
@@ -55,7 +62,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>申报日期</th>
@@ -86,4 +93,4 @@
 <script type="text/javascript" src="../../../js/commonUtils.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerBenefitsList.js"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/workerContractManagementList.html b/smz-web/pages/work/ownPerson/workerContractManagementList.html
index 2a6a846..67c30df 100644
--- a/smz-web/pages/work/ownPerson/workerContractManagementList.html
+++ b/smz-web/pages/work/ownPerson/workerContractManagementList.html
@@ -97,18 +97,7 @@
                                             </div>
                                         </div>
 
-                                        <button id="searchBt" style="margin-left: 10px;height: 38px" class="layui-btn layui-btn-sm" permission="sys:workerOn:query"><i class="layui-icon">&#xe615;</i>搜索</button>
-
-
-
-                                        <button style="display: none" class="layui-btn layui-btn-sm" onclick="insertWorkerOn()" permission="sys:workerOn:add">
-                                            <i class="layui-icon">&#xe608;</i> 续签
-                                        </button>
-
-
-
-
-                                        <button id="exportBt" style="display: none" onclick="exportWorkerOnBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>合同下载</button>
+                                        <button id="searchBt" style="margin-left: 10px;height: 38px" class="layui-btn layui-btn-sm" permission="sys:workerOn:query">搜索</button>
                                     </div>
                                 </div>
                             </form>
@@ -122,7 +111,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="display nowrap" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class='th'>
                             <input id="checkall" type="checkbox" class="checkall"/>
@@ -168,4 +157,4 @@
 <script type="text/javascript" src="../../../js/plugin/datatables/dataTables.fixedColumns.min.js"></script>
 <!--引入下拉选js-->
 <script type="text/javascript" src="../../../js/select.js"></script>
-<script type="text/javascript" src="../../../js/work/ownPerson/workerContractManagementList.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/ownPerson/workerContractManagementList.js" defer="defer"></script>
diff --git a/smz-web/pages/work/ownPerson/workerContractManagementRecords.html b/smz-web/pages/work/ownPerson/workerContractManagementRecords.html
index eab8cba..3b9199d 100644
--- a/smz-web/pages/work/ownPerson/workerContractManagementRecords.html
+++ b/smz-web/pages/work/ownPerson/workerContractManagementRecords.html
@@ -43,7 +43,7 @@
         <div>
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>合同类型</th>
@@ -76,4 +76,4 @@
 <script type="text/javascript" src="../../../js/select.js"></script>
 <script type="text/javascript" src="../../../js/dict.js"></script>
 <script type="text/javascript" src="../../../js/commonUtils.js"></script>
-<script type="text/javascript" src="../../../js/work/ownPerson/workerContractManagementRecords.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/ownPerson/workerContractManagementRecords.js" defer="defer"></script>
diff --git a/smz-web/pages/work/ownPerson/workerDepart.html b/smz-web/pages/work/ownPerson/workerDepart.html
index a7bd39e..cdbcf61 100644
--- a/smz-web/pages/work/ownPerson/workerDepart.html
+++ b/smz-web/pages/work/ownPerson/workerDepart.html
@@ -48,42 +48,63 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="layui-form" onsubmit="return false">
-                                <div class="layui-inline">
-                                    <div class="layui-input-inline" style="display: flex; margin-left: -14.5%;">
-                                        <select id="ssdw" name="ssdw" class="form-control input-sm" lay-verify="required" lay-search=""></select>
+                            <form class="form-inline layui-form" onsubmit="return false">
+                                <div class="form-group" style="display: flex;">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="ssdw" name="ssdw" lay-search=""></select>
+                                        </div>
+                                    </div>
 
-                                        <div style="border: 0.5px solid #E6E6E6;height: 38px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
-                                            <input id="orgName" type="text" style="border: 0px;margin-top: 10px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
-                                            <input type="hidden" id="orgId" name="orgId" value="" >
-                                            <input type="hidden" id="companyId" name="companyId" value="" >
-                                            <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
-                                            <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
-                                                <ul id="orgTree" class="ztree accountOrgTree"></ul>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <div style="border: 0.5px solid #E6E6E6;height: 38px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
+                                                <input id="orgName" type="text" style="border: 0px;margin-top: 10px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
+                                                <input type="hidden" id="orgId" name="orgId" value="" >
+                                                <input type="hidden" id="companyId" name="companyId" value="" >
+                                                <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
+                                                <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
+                                                    <ul id="orgTree" class="ztree accountOrgTree"></ul>
+                                                </div>
                                             </div>
                                         </div>
-
-                                        <input type="text" style="height: 37px;margin: 0px;" id="name" name="name" placeholder="请输入人员姓名" class="form-control">
-
-                                        <input type="text" style="height: 37px;margin: 0px;margin-left: 10px;margin-right: 10px;" id="idNumber" name="idNumber" placeholder="请输入身份证号" class="form-control">
-
-                                        <select id="offType" name="offType" >
-                                            <option value="">请选择离职类型</option>
-                                            <option value="1">个人离职</option>
-                                            <option value="2">辞退</option>
-                                            <option value="3">待确认</option>
-                                        </select>
-
-                                        <button id="searchBt" style="margin-left: 10px;" class="layui-btn layui-btn-sm" permission="sys:workerDepart:query"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                        <button class="layui-btn layui-btn-sm" onclick="insertWorkerOff()" permission="sys:workerDepart:add">
-                                            <i class="layui-icon">&#xe608;</i> 离职办理
-                                        </button>
-
-                                        <button id="exportBt" onclick="exportWorkerDepartBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
-
                                     </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" id="name" name="name" placeholder="请输入人员姓名" class="layui-input">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" style="height: 37px;margin: 0px;margin-left: 10px;margin-right: 10px;" id="idNumber" name="idNumber" placeholder="请输入身份证号" class="layui-input">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline" style="margin-left: 16px;">
+                                        <div class="layui-input-inline">
+                                            <select id="offType" name="offType" >
+                                                <option value="">请选择离职类型</option>
+                                                <option value="1">个人离职</option>
+                                                <option value="2">辞退</option>
+                                                <option value="3">待确认</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:workerDepart:query" style="margin-left: 8px;margin-top: 0.3%;">搜索</button>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="display: flex ;margin-top: 5px">
+                                <div class="layui-input-inline" >
+                                    <button class="layui-btn layui-btn-sm" onclick="insertWorkerOff()" permission="sys:workerDepart:add">
+                                        离职办理
+                                    </button>
+                                    <button id="exportBt" onclick="exportWorkerDepartBtn()" class="layui-btn layui-btn-sm" style="margin-left: 0px;">导出</button>
+                                </div>
+                            </div>
+
                         </td>
 
                     </tr>
@@ -95,7 +116,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="display nowrap" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class="thText">序号</th>
 
@@ -171,4 +192,4 @@
 
 <script type="text/javascript" src="../../../js/work/ownPerson/workerDepart.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/workerDepartFaceContrast.html b/smz-web/pages/work/ownPerson/workerDepartFaceContrast.html
index 4409915..ce4a5bc 100644
--- a/smz-web/pages/work/ownPerson/workerDepartFaceContrast.html
+++ b/smz-web/pages/work/ownPerson/workerDepartFaceContrast.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="../../../css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" media="screen" href="../../../css/dataTables.bootstrap.min.css">
     <link rel="stylesheet" type="text/css" media="screen" href="../../../layui/css/layui.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/basic.css">
+<!--    <link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/basic.css">-->
     <link rel="stylesheet" href="../../../css/ztree/zTreeStyle/zTreeStyle.css" type="text/css">
 </head>
 <body>
@@ -17,48 +17,87 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="layui-form" onsubmit="return false">
-                                <div class="layui-inline">
-                                    <div class="layui-input-inline" style="display: flex;align-items: center;">
-                                        <select id="ssdw" name="ssdw" class="layui-input" lay-verify="required" lay-search></select>
+                            <form class="form-inline layui-form" onsubmit="return false">
+                                <div class="form-group">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="ssdw" name="ssdw" lay-search></select>
+                                        </div>
+                                    </div>
 
-                                        <div style="border: 0.5px solid #E6E6E6;height: 30px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
-                                            <input id="orgName" type="text" style="border: 0px;margin-top: 6px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
-                                            <input type="hidden" id="orgId" name="orgId" value="" >
-                                            <input type="hidden" id="companyId" name="companyId" value="" >
-                                            <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
-                                            <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
-                                                <ul id="orgTree" class="ztree accountOrgTree"></ul>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <div style="border: 0.5px solid #E6E6E6;height: 36px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
+                                                <input id="orgName" type="text" style="border: 0px;margin-top: 10px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
+                                                <input type="hidden" id="orgId" name="orgId" value="" >
+                                                <input type="hidden" id="companyId" name="companyId" value="" >
+                                                <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
+                                                <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
+                                                    <ul id="orgTree" class="ztree accountOrgTree"></ul>
+                                                </div>
                                             </div>
                                         </div>
+                                    </div>
 
-                                        <select id="rylx" name="rylx"  class="form-control input-sm" lay-verify="required" lay-search="" ></select>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="rylx" name="rylx" lay-search="" ></select>
+                                        </div>
+                                    </div>
 
-                                        <select id="state" name="state" >
-                                            <option value="">请选择在职状态</option>
-                                            <option value="1">在职</option>
-                                            <option value="2">离职</option>
-                                        </select>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="state" name="state" >
+                                                <option value="">请选择在职状态</option>
+                                                <option value="1">在职</option>
+                                                <option value="2">离职</option>
+                                            </select>
+                                        </div>
+                                    </div>
 
-                                        <input type="text" style="height: 30px;margin: 0px;width:10%;margin-left: 10px;" id="proName" name="proName" placeholder="请输入工程名称" class="form-control">
-                                        <input type="text" style="height: 30px;margin: 0px;width:10%;margin-left: 10px;" id="name" name="name" placeholder="输入人员姓名" class="form-control">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" id="proName" name="proName" placeholder="请输入工程名称" class="layui-input">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input type="text" id="name" name="name" placeholder="输入人员姓名" class="layui-input">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <input type="text" id="test6" class="layui-input"
+                                                   placeholder="请选择日期范围" readonly>
+
+                                            <input type="hidden" id="hidMinListDate" value="2021-01-01"/>
+                                            <input type="hidden" id="hidMaxListDate"
+                                                   value='@DateTime.Now.ToString("yyyy-MM-dd")'/>
+                                        </div>
+                                    </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:faceContrast:query">搜索</button>
+                                </div>
+                                    <!--<div class="layui-input-inline" style="display: flex;align-items: center;">
 
 
                                         <input type="text" style="width: 10%;" class="form-control" readonly placeholder="请选择日期" id="startTime">
                                         <span>~</span>
                                         <input type="text" style="width: 10%;" class="form-control" readonly placeholder="请选择日期" id="endTime" value='@DateTime.Now.ToString("yyyy-MM-dd")'>
-
-                                        &nbsp;<button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:faceContrast:query"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                        <button id="exportBt" onclick="exportBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
-
-
-                                        <button id="faceBt" onclick="faceBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>人脸照片信息变更申请</button>
-
                                         <input type="hidden" id="hidMinListDate" value="2021-01-01" />
                                         <input type="hidden" id="hidMaxListDate" value='@DateTime.Now.ToString("yyyy-MM-dd")' />
                                     </div>
-                                </div>
+                                </div>-->
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-inline">
+                                    <button id="exportBt" onclick="exportBtn()" class="layui-btn layui-btn-sm">导出</button>
+
+                                    <button id="faceBt" onclick="faceBtn()" class="layui-btn layui-btn-sm">人脸照片信息变更申请</button>
+
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -69,7 +108,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>所属单位</th>
@@ -109,4 +148,4 @@
 <script type="text/javascript" src="../../../js/select.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerDepartFaceContrast.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/workerDepartFaceContrastDetail.html b/smz-web/pages/work/ownPerson/workerDepartFaceContrastDetail.html
index 5247223..70e1279 100644
--- a/smz-web/pages/work/ownPerson/workerDepartFaceContrastDetail.html
+++ b/smz-web/pages/work/ownPerson/workerDepartFaceContrastDetail.html
@@ -19,7 +19,6 @@
     <script src="../../../js/bootstrap-table/bootstrap-table.js" type="text/javascript" charset="utf-8"></script>
     <script src="../../../js/bootstrap-table/locale/bootstrap-table-zh-CN.js" type="text/javascript" charset="utf-8"></script>
     <script src="../../../js/jedate/jedate.js" type="text/javascript"></script>
-    <script src="../../../js/public.js"></script>
     <script type="text/javascript" src="../../../js/my/permission.js"></script>
     <script type="text/javascript" src="../../../js/commonUtils.js"></script>
     <script src="../../../js/work/ownPerson/workerDepartFaceContrastDetail.js"></script>
@@ -28,9 +27,12 @@
 <div id="title">考勤详情</div>
 <div id="content">
     <div id="dataTitle">
-        <input id="startTime" type="text" placeholder="只显示年月"  readonly /><span id="span">~</span>
-        <input id="endTime" type="text" placeholder="只显示年月"  readonly />
-        <button id="query" onclick="querys()"></button>
+        <input type="hidden" id="hidMinListDate" value="2021-01-01"/>
+        <input type="hidden" id="hidMaxListDate"
+               value='@DateTime.Now.ToString("yyyy-MM-dd")'/>
+
+        <input id="test6" class="test6" type="text" placeholder="请选择日期范围"  readonly />
+        <button id="query" onclick="querys()">查询</button>
         <div id="dataCount"></div>
     </div>
     <div id="left">
diff --git a/smz-web/pages/work/ownPerson/workerDepartRecordOld.html b/smz-web/pages/work/ownPerson/workerDepartRecordOld.html
index 3d0b9c1..c2bb8f6 100644
--- a/smz-web/pages/work/ownPerson/workerDepartRecordOld.html
+++ b/smz-web/pages/work/ownPerson/workerDepartRecordOld.html
@@ -25,7 +25,7 @@
         <div>
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>通知书</th>
@@ -56,4 +56,4 @@
 <script type="text/javascript" src="../../../js/commonUtils.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerDepartRecordOld.js"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/ownPerson/workerOn.html b/smz-web/pages/work/ownPerson/workerOn.html
index a261610..d2bca6e 100644
--- a/smz-web/pages/work/ownPerson/workerOn.html
+++ b/smz-web/pages/work/ownPerson/workerOn.html
@@ -37,6 +37,20 @@
             color: #000000;
         }
 
+        table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd{
+            background-color: #fff;
+        }
+
+        table.dataTable.display tbody tr.odd>.sorting_1, table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{
+            background-color: #fff;
+        }
+
+        table.dataTable.display tbody tr:hover>.sorting_2, table.dataTable.order-column.hover tbody tr:hover>.sorting_2{
+            background-color: #fff;
+        }
+        table.dataTable.display tbody tr:hover>.sorting_3, table.dataTable.order-column.hover tbody tr:hover>.sorting_3{
+            background-color: #fff;
+        }
     </style>
 </head>
 <body>
@@ -47,50 +61,70 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="layui-form" onsubmit="return false">
-                                <div class="layui-inline">
-                                    <div class="layui-input-inline" style="display: flex;align-items: center;">
-                                        <select id="ssdw" name="ssdw" class="form-control input-sm" lay-verify="required" lay-search=""></select>
-
-                                        <div style="border: 0.5px solid #E6E6E6;height: 38px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
-                                            <input id="orgName" type="text" style="border: 0px;margin-top: 10px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
-                                            <input type="hidden" id="orgId" name="orgId" value="" >
-                                            <input type="hidden" id="companyId" name="companyId" value="" >
-                                            <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
-                                            <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
-                                                <ul id="orgTree" class="ztree accountOrgTree"></ul>
-                                            </div>
+                            <form class="form-inline layui-form" onsubmit="return false">
+                                <div class="form-group" style="display: flex;justify-content: flex-start;">
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline" >
+                                            <select id="ssdw" name="ssdw" lay-search=""></select>
                                         </div>
-
-                                        <select id="rylx" name="rylx"  class="form-control input-sm" lay-verify="required" lay-search="" ></select>
-                                        <input type="text" style="height: 38px;margin: 0px;width:10%;margin-left: 10px;" id="proName" name="proName" placeholder="请输入工程名称" class="form-control">
-                                        <input type="text" style="height: 38px;margin: 0px;width:10%;margin-left: 10px;" id="name" name="name" placeholder="输入人员姓名" class="form-control">
-
-                                        <button id="searchBt" style="margin-left: 10px;" class="layui-btn layui-btn-sm" permission="sys:workerOn:query"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                        <button class="layui-btn layui-btn-sm" onclick="insertWorkerOn()" permission="sys:workerOn:add">
-                                            <i class="layui-icon">&#xe608;</i> 添加
-                                        </button>
-                                        <input id="articleImageFile" name="excelFile" type="file" class="form-control" style="width: 200px; display: inline;margin-left: 2px;padding: 2px 12px;" />
-                                        <input id="saveZipButton" type="button" style="width: 60px;height: 30px;margin-left: 10px;padding: 2px 0px;" value="导入" />
-                                        <input type="file" id="import-excel" name="image" style="display: none;"/>
-                                        <button class="layui-btn layui-btn-sm" onclick="downWorker()" style="margin-left: 2px;">
-                                            <i class="layui-icon">&#xe601;</i> 模板下载
-                                        </button>
-                                        <button id="exportBt" onclick="exportWorkerOnBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
-                                        <button id="batch" onclick="batchBtn()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe642;</i>批量</button>
                                     </div>
 
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline" >
+                                            <div style="border: 0.5px solid #E6E6E6;height: 38px;text-indent: 10px;margin-left: 10px; margin-right: 8px;">
+                                                <input id="orgName" type="text" style="border: 0px;margin-top: 10px" placeholder="请选择用工单位" jyValidate="required" readonly value="" class="FormElement ui-widget-content ui-corner-all" onclick="showRole(); return false;"/>
+                                                <input type="hidden" id="orgId" name="orgId" value="" >
+                                                <input type="hidden" id="companyId" name="companyId" value="" >
+                                                <a href="#" title="清空" onclick="emptyRole(); return false;" class="lrspace3 aBtnNoTD" data-toggle="modal"><i class='icon-remove bigger-120 red'></i></a>
+                                                <div id='orgContent' class="menuContent ztreeMC" style="display: none; position: absolute;z-index: 99999;background-color: #F2F2F2;">
+                                                    <ul id="orgTree" class="ztree accountOrgTree"></ul>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline" >
+                                            <select id="rylx" name="rylx"  lay-search="" ></select>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline" >
+                                            <input type="text"  id="proName" name="proName" placeholder="请输入工程名称" class="layui-input" style="margin-left: 8px;">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline" >
+                                            <input type="text" id="name" name="name" placeholder="输入人员姓名" class="layui-input" style="margin-left: 16px;">
+                                        </div>
+                                    </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:workerOn:query" style="margin-left: 24px;margin-top: 0.3%">搜索</button>
+                                </div>
+
                                     <div class="layui-input-inline" style="display: flex;align-items: center;margin-top: 0.5%;">
+                                        <button class="layui-btn layui-btn-sm" onclick="insertWorkerOn()" permission="sys:workerOn:add">
+                                            添加
+                                        </button>
+
+                                        <input id="articleImageFile" name="excelFile" type="file" class="layui-input" style="width: 200px; display: inline;margin-left: 2px;padding: 2px 12px;" />
+                                        <input id="saveZipButton" type="button"  class="layui-btn layui-btn-sm" value="导入" style="margin-left: 4px;" />
+                                        <input type="file" id="import-excel" name="image" style="display: none;"/>
+                                        <button class="layui-btn layui-btn-sm" onclick="downWorker()" style="margin-left: 2px;">
+                                            模板下载
+                                        </button>
+                                        <button id="exportBt" onclick="exportWorkerOnBtn()" class="layui-btn layui-btn-sm">导出</button>
+                                        <button id="batch" onclick="batchBtn()" class="layui-btn layui-btn-sm">批量</button>
 
 
                                         <input id="articleImageFileBatch" name="articleImageFileBatch" type="file" class="form-control" style="width: 200px; display: inline;margin-left: 2px;padding: 2px 12px;" />
-                                        <input id="saveZipButtonBatch" type="button" style="width: 100px;height: 30px;margin-left: 10px;padding: 2px 0px;" value="批量导入" />
+                                        <input id="saveZipButtonBatch" type="button" class="layui-btn layui-btn-sm" value="批量导入" style="margin-left: 4px;" />
                                         <input type="file" id="import-excel-Batch" name="image" style="display: none;"/>
                                         <button class="layui-btn layui-btn-sm" onclick="downWorkerBatch()" style="margin-left: 2px;">
-                                            <i class="layui-icon">&#xe601;</i> 批量模板修改下载
+                                            批量模板修改下载
                                         </button>
                                     </div>
-                                </div>
                             </form>
                         </td>
                     </tr>
@@ -102,7 +136,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="display nowrap" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class="thText">序号</th>
                         <th class="thText">姓名</th>
@@ -168,4 +202,4 @@
 <script type="text/javascript" src="../../../js/plugin/datatables/dataTables.fixedColumns.min.js"></script>
 <!--引入下拉选js-->
 <script type="text/javascript" src="../../../js/select.js"></script>
-<script type="text/javascript" src="../../../js/work/ownPerson/workerOn.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/ownPerson/workerOn.js" defer="defer"></script>
diff --git a/smz-web/pages/work/ownPerson/workerOnContractForm.html b/smz-web/pages/work/ownPerson/workerOnContractForm.html
index 879e8f8..46113c3 100644
--- a/smz-web/pages/work/ownPerson/workerOnContractForm.html
+++ b/smz-web/pages/work/ownPerson/workerOnContractForm.html
@@ -20,7 +20,7 @@
     </style>
 </head>
 <body>
-<div >
+<div style="padding:0 24px 0 24px;">
     <form class="layui-form"  action="" onsubmit=" return false">
         <input type="hidden" id="id" name="id">
         <input type="hidden" id="phone" name="phone">
@@ -72,21 +72,21 @@
                 <input type="text" name="idNumber" id="idNumber" lay-verify="required|idCard" class="layui-input" onchange="calculateAge()">
             </div>
         </div>
-        <div class="layui-input-inline">
+        <div class="layui-input-inline" style="margin-top: 12px;">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 联系电话</label>
-            <div class="layui-input-block">
+            <div class="layui-input-block" >
                 <input type="text" name="lxdh" id="lxdh" required  lay-verify="required|phone" class="layui-input" >
             </div>
         </div>
 
 
-        <div class="layui-input-inline">
+        <div class="layui-input-inline" style="margin-top: 12px;">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 年龄</label>
             <div class="layui-input-block">
                 <input type="text" name="age" id="age" required  lay-verify="required|age" class="layui-input" >
             </div>
         </div>
-        <div class="layui-input-inline" style="width: 292px;">
+        <div class="layui-input-inline" style="width: 292px;margin-top: 12px;">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 性别</label>
             <div class="layui-input-block">
                 <select id="sex" name="sex" >
@@ -95,14 +95,14 @@
                 </select>
             </div>
         </div>
-        <div class="layui-input-inline" style="width: 292px;">
+        <div class="layui-input-inline" style="width: 292px;margin-top: 12px;">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 员工性质</label>
             <div class="layui-input-block">
                 <select  name="ryxz" id="ryxz"  lay-verify="required|ryxz"  class="layui-select" lay-search="">
                 </select>
             </div>
         </div>
-        <div class="layui-input-inline">
+        <div class="layui-input-inline" style="margin-top: 12px;">
             <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 具体岗位</label>
             <div class="layui-input-block">
                 <input type="text" name="gw" id="gw" required  lay-verify="required" maxlength="20" class="layui-input">
@@ -248,7 +248,7 @@
 
             <div class="layui-input-inline">
                 <label class="layui-form-label"> 紧急联系人电话</label>
-                <div class="layui-input-block">
+                <div class="layui-input-block" style="margin-top: 15px;">
                     <input type="text" name="jjlxrdh" id="jjlxrdh" required  lay-verify="phones"  maxlength="11" class="layui-input" >
                 </div>
             </div>
@@ -272,4 +272,4 @@
 <script type="text/javascript" src="../../../js/companyTree.js"></script>
 <script type="text/javascript" src="../../../js/select.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerOnContractForm.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/ownPerson/workerOnForm.html b/smz-web/pages/work/ownPerson/workerOnForm.html
index 6bdf80b..6df220d 100644
--- a/smz-web/pages/work/ownPerson/workerOnForm.html
+++ b/smz-web/pages/work/ownPerson/workerOnForm.html
@@ -20,7 +20,7 @@
     </style>
 </head>
 <body>
-<div >
+<div style="padding:0 24px 0 24px;">
     <form class="layui-form"  action="" onsubmit=" return false">
     <input type="hidden" id="id" name="id">
     <input type="hidden" id="phone" name="phone">
@@ -72,7 +72,7 @@
             <input type="text" name="idNumber" id="idNumber" lay-verify="required|idCard" class="layui-input" onchange="calculateAge()">
         </div>
     </div>
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="margin-top: 12px;">
         <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 联系电话</label>
         <div class="layui-input-block">
             <input type="text" name="lxdh" id="lxdh" required  lay-verify="required|phone" class="layui-input" >
@@ -80,13 +80,13 @@
     </div>
 
 
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="margin-top: 12px;">
         <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 年龄</label>
         <div class="layui-input-block">
             <input type="text" name="age" id="age" required  lay-verify="required|age" class="layui-input" >
         </div>
     </div>
-    <div class="layui-input-inline" style="width: 292px;">
+    <div class="layui-input-inline" style="width: 292px;margin-top: 12px;">
         <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 性别</label>
         <div class="layui-input-block">
             <select id="sex" name="sex" >
@@ -95,14 +95,14 @@
             </select>
         </div>
     </div>
-    <div class="layui-input-inline" style="width: 292px;">
+    <div class="layui-input-inline" style="width: 292px;margin-top: 12px;">
         <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 员工性质</label>
         <div class="layui-input-block">
             <select  name="ryxz" id="ryxz"  lay-verify="required|ryxz"  class="layui-select" lay-search="">
             </select>
         </div>
     </div>
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="margin-top: 12px;">
         <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 具体岗位</label>
         <div class="layui-input-block">
             <input type="text" name="gw" id="gw" required  lay-verify="required" maxlength="20" class="layui-input">
@@ -246,9 +246,9 @@
             </div>
         </div>
 
-        <div class="layui-input-inline">
+        <div class="layui-input-inline" >
             <label class="layui-form-label"> 紧急联系人电话</label>
-            <div class="layui-input-block">
+            <div class="layui-input-block" style="margin-top: 15px;">
                 <input type="text" name="jjlxrdh" id="jjlxrdh" required  lay-verify="phones"  maxlength="11" class="layui-input" >
             </div>
         </div>
@@ -272,4 +272,4 @@
 <script type="text/javascript" src="../../../js/companyTree.js"></script>
 <script type="text/javascript" src="../../../js/select.js"></script>
 <script type="text/javascript" src="../../../js/work/ownPerson/workerOnForm.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/person/faceContrastDetail.html b/smz-web/pages/work/person/faceContrastDetail.html
index 84c20a5..44c7a77 100644
--- a/smz-web/pages/work/person/faceContrastDetail.html
+++ b/smz-web/pages/work/person/faceContrastDetail.html
@@ -21,7 +21,6 @@
     <script src="../../../js/bootstrap-table/bootstrap-table.js" type="text/javascript" charset="utf-8"></script>
     <script src="../../../js/bootstrap-table/locale/bootstrap-table-zh-CN.js" type="text/javascript" charset="utf-8"></script>
     <script src="../../../js/jedate/jedate.js" type="text/javascript"></script>
-    <script src="../../../js/public.js"></script>
     <script type="text/javascript" src="../../../js/my/permission.js"></script>
     <script type="text/javascript" src="../../../js/commonUtils.js"></script>
     <script src="../../../js/work/person/faceContrastDetail.js"></script>
diff --git a/smz-web/pages/work/salaryAttendance/salaryAttendanceDetails.html b/smz-web/pages/work/salaryAttendance/salaryAttendanceDetails.html
index 35baf4f..67272fe 100644
--- a/smz-web/pages/work/salaryAttendance/salaryAttendanceDetails.html
+++ b/smz-web/pages/work/salaryAttendance/salaryAttendanceDetails.html
@@ -37,7 +37,7 @@
     </style>
 </head>
 <body>
-    <div id="content">
+    <div id="content" style="padding: 0 24px 0 24px">
         <div id="title">
             <div>
                 <img src="../../../img/head.png" width="50"/>
@@ -58,7 +58,7 @@
             </div>
             <div>
                 <div onclick="packageDownload()">
-                    <i class="layui-icon">&#xe601;</i>下载
+                    下载
                 </div>
             </div>
         </div>
@@ -141,7 +141,6 @@
                 </div>
 
                 <div id="more" onclick="moreClick(this)">
-                    <i class="layui-icon">&#xe61a;</i>&nbsp;
                     查&nbsp;看&nbsp;更&nbsp;多
                 </div>
             </div>
@@ -162,4 +161,4 @@
 <script type="text/javascript" src="../../../js/work/salaryAttendance/salaryAttendanceDetails.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/salaryAttendance/salaryAttendanceList.html b/smz-web/pages/work/salaryAttendance/salaryAttendanceList.html
index febabb3..c5805cb 100644
--- a/smz-web/pages/work/salaryAttendance/salaryAttendanceList.html
+++ b/smz-web/pages/work/salaryAttendance/salaryAttendanceList.html
@@ -18,25 +18,45 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="form-inline" onsubmit="return false">
+                            <form class="form-inline layui-form" onsubmit="return false">
                                 <div class="form-group">
-                                    <input id="name" type="text" class="form-control" placeholder="请输入姓名">
-                                    <input id="proName" type="text" class="form-control" placeholder="请输入工程">
-                                    <input id="subName" type="text" class="form-control" placeholder="请输入分包">
-                                    <input type="text" class="form-control" id="months" autocomplete="off"
-                                           placeholder="选择月份范围">
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                            <input id="name" type="text" class="layui-input" placeholder="请输入姓名">
+                                        </div>
+                                    </div>
 
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i
-                                            class="layui-icon">&#xe615;</i>搜索
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                            <input id="proName" type="text" class="layui-input" placeholder="请输入工程">
+                                    </div>
+                                    </div>
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                            <input id="subName" type="text" class="layui-input" placeholder="请输入分包">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
+                                            <input type="text" class="layui-input" id="months" autocomplete="off"
+                                           placeholder="选择月份范围">
+                                        </div>
+                                    </div>
+
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索
                                     </button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i
-                                            class="layui-icon">&#xe666;</i>重置
-                                    </button>
-                                    <button id="exportBt" class="layui-btn layui-btn-sm"><i
-                                            class="layui-icon">&#xe62f;</i>导出数据
+                                    <button id="resetBt" class="layui-btn layui-btn-sm">重置
                                     </button>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-input-inline" >
+                                    <button id="exportBt" class="layui-btn layui-btn-sm">导出数据
+                                    </button>
+                                </div>
+                            </div>
+
                         </td>
                     </tr>
                 </table>
@@ -49,7 +69,7 @@
                 <table id="dt-table"
                        class="table table-striped table-bordered table-hover"
                        style="width: 100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th style="width:1%">序号</th>
                         <th>姓名</th>
@@ -86,4 +106,4 @@
 <script type="text/javascript" src="../../../js/work/salaryAttendance/salaryAttendanceList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/smallSubManagement/adjustRecordForm.html b/smz-web/pages/work/smallSubManagement/adjustRecordForm.html
index cdbb0ce..8aaf6fd 100644
--- a/smz-web/pages/work/smallSubManagement/adjustRecordForm.html
+++ b/smz-web/pages/work/smallSubManagement/adjustRecordForm.html
@@ -21,7 +21,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%;">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>更改类型</th>
@@ -51,4 +51,4 @@
 <script type="text/javascript" src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../../js/commonsystem.js"></script>
-<script type="text/javascript" src="../../../js/work/smallSubManagement/adjustRecordForm.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/smallSubManagement/adjustRecordForm.js" defer="defer"></script>
diff --git a/smz-web/pages/work/smallSubManagement/contentAdjustForm.html b/smz-web/pages/work/smallSubManagement/contentAdjustForm.html
index 731ab65..ce4e803 100644
--- a/smz-web/pages/work/smallSubManagement/contentAdjustForm.html
+++ b/smz-web/pages/work/smallSubManagement/contentAdjustForm.html
@@ -36,10 +36,10 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px;">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
-        <div class="layui-form-item" style="margin-left: 10%;margin-top: 1%">
+        <div class="layui-form-item" style="margin-top: 1%">
 
             <!-- 作业暂定内容 -->
             <div class="layui-form-item form-item">
diff --git a/smz-web/pages/work/smallSubManagement/lumpSum.html b/smz-web/pages/work/smallSubManagement/lumpSum.html
index ba145f6..5b9e287 100644
--- a/smz-web/pages/work/smallSubManagement/lumpSum.html
+++ b/smz-web/pages/work/smallSubManagement/lumpSum.html
@@ -15,7 +15,7 @@
     </style>
 </head>
 <body>
-<div>
+<div style="padding: 0 24px 0 24px">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
         <header style="height: 100%">
             <div align="left">
@@ -36,7 +36,7 @@
                                         </div>
                                     </div>
                                     <button id="searchBt" class="layui-btn layui-btn-sm"
-                                            style="margin-top: -0.3%;"><i class="layui-icon">&#xe615;</i>搜索
+                                            style="margin-top: -0.3%;">搜索
                                     </button>
                                 </div>
                             </form>
@@ -50,7 +50,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%;">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class='th'>
                             <input id="checkall" type="checkbox" class="checkall"/>
@@ -84,4 +84,4 @@
 <script type="text/javascript" src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../../js/commonsystem.js"></script>
-<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSum.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSum.js" defer="defer"></script>
diff --git a/smz-web/pages/work/smallSubManagement/lumpSumAddForm.html b/smz-web/pages/work/smallSubManagement/lumpSumAddForm.html
index 6c671b5..9cd181c 100644
--- a/smz-web/pages/work/smallSubManagement/lumpSumAddForm.html
+++ b/smz-web/pages/work/smallSubManagement/lumpSumAddForm.html
@@ -36,7 +36,7 @@
                                         </div>
                                     </div>
                                     <button id="searchBt" class="layui-btn layui-btn-sm"
-                                            style="margin-top: -0.3%;"><i class="layui-icon">&#xe615;</i>搜索
+                                            style="margin-top: -0.3%;">搜索
                                     </button>
                                 </div>
                             </form>
@@ -50,7 +50,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%;">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th class='th'>
                             <input id="checkall" type="checkbox" class="checkall"/>
@@ -84,4 +84,4 @@
 <script type="text/javascript" src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../../js/commonsystem.js"></script>
-<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSumAddForm.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSumAddForm.js" defer="defer"></script>
diff --git a/smz-web/pages/work/smallSubManagement/lumpSumAddList.html b/smz-web/pages/work/smallSubManagement/lumpSumAddList.html
index 396e9c9..7162015 100644
--- a/smz-web/pages/work/smallSubManagement/lumpSumAddList.html
+++ b/smz-web/pages/work/smallSubManagement/lumpSumAddList.html
@@ -36,16 +36,21 @@
                                         </div>
                                     </div>
                                     <button id="searchBt" class="layui-btn layui-btn-sm"
-                                            style="margin-top: -0.3%;"><i class="layui-icon">&#xe615;</i>搜索
+                                            style="margin-top: -0.3%;">搜索
                                     </button>
 
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm">重置</button>
+
 
-                                    <button class="layui-btn layui-btn-sm" onclick="lumpSumAdd()" permission="sys:SubContractor:query">
-                                        <i class="layui-icon">&#xe608;</i> 添加
-                                    </button>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-input-inline" >
+                                    <button class="layui-btn layui-btn-sm" onclick="lumpSumAdd()" permission="sys:SubContractor:query">
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -56,7 +61,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%;">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>包干工序</th>
@@ -89,4 +94,4 @@
 <script type="text/javascript" src="../../../js/publicJs.js"></script>
 <script type="text/javascript" src="../../../js/bootstrap/bootstrap.min.js"></script>
 <script type="text/javascript" src="../../../js/commonsystem.js"></script>
-<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSumAddList.js" defer="defer"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../../js/work/smallSubManagement/lumpSumAddList.js" defer="defer"></script>
diff --git a/smz-web/pages/work/smallSubManagement/periodAdjustForm.html b/smz-web/pages/work/smallSubManagement/periodAdjustForm.html
index 3b3032e..42c3ea3 100644
--- a/smz-web/pages/work/smallSubManagement/periodAdjustForm.html
+++ b/smz-web/pages/work/smallSubManagement/periodAdjustForm.html
@@ -36,10 +36,10 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px;">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
-        <div class="layui-form-item" style="margin-left: 10%;margin-top: 1%">
+        <div class="layui-form-item" style="margin-top: 1%">
 
             <!-- 计划开始暂定作业日期 -->
             <div class="layui-form-item form-item">
diff --git a/smz-web/pages/work/smallSubManagement/priceAdjustForm.html b/smz-web/pages/work/smallSubManagement/priceAdjustForm.html
index 09593e1..028a7f3 100644
--- a/smz-web/pages/work/smallSubManagement/priceAdjustForm.html
+++ b/smz-web/pages/work/smallSubManagement/priceAdjustForm.html
@@ -36,10 +36,10 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px;">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
-        <div class="layui-form-item" style="margin-left: 10%;margin-top: 1%">
+        <div class="layui-form-item" style="margin-top: 1%">
 
             <!-- 暂定协议价 -->
             <div class="layui-form-item form-item">
diff --git a/smz-web/pages/work/smallSubManagement/smallSubPermission.html b/smz-web/pages/work/smallSubManagement/smallSubPermission.html
index 8f90064..71c3bc6 100644
--- a/smz-web/pages/work/smallSubManagement/smallSubPermission.html
+++ b/smz-web/pages/work/smallSubManagement/smallSubPermission.html
@@ -24,18 +24,23 @@
                         <td>
                             <form class="form-inline layui-form" onsubmit="return false">
                                 <div class="form-group">
-                                    <div class="layui-inline" style="margin-top: 5px;">
-                                        <div class="layui-input-inline" style="margin-top: -0.5%;">
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
                                             <input id="subName" type="text" class="layui-input" placeholder="请输入分包名称">
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <button class="layui-btn layui-btn-sm" onclick="insertSubPermission()" permission="sys:SubContractor:query">
-                                        <i class="layui-icon">&#xe608;</i> 添加
-                                    </button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm">重置</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px">
+                                <div class="layui-input-inline" >
+                                    <button class="layui-btn layui-btn-sm" onclick="insertSubPermission()" permission="sys:SubContractor:query">
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -46,7 +51,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>分包名称</th>
diff --git a/smz-web/pages/work/smallSubManagement/smallSubPermissionForm.html b/smz-web/pages/work/smallSubManagement/smallSubPermissionForm.html
index e500de3..4372e88 100644
--- a/smz-web/pages/work/smallSubManagement/smallSubPermissionForm.html
+++ b/smz-web/pages/work/smallSubManagement/smallSubPermissionForm.html
@@ -22,14 +22,14 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
         <div class="layui-form-item" style="margin-left: 10%;margin-top: 8%">
             <div class="flex-item">
                 <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i> 选择分包:</label>
                 <div class="layui-input-block" style="width: 65%">
-                    <select id="subId" name="subId" class="layui-input" lay-search lay-filter="subId">
+                    <select id="subId" name="subId" class="layui-input" lay-verify="required" lay-search lay-filter="subId">
                     </select>
                 </div>
             </div>
diff --git a/smz-web/pages/work/smallSubManagement/stat/contractStat.html b/smz-web/pages/work/smallSubManagement/stat/contractStat.html
index d64e669..b4f858f 100644
--- a/smz-web/pages/work/smallSubManagement/stat/contractStat.html
+++ b/smz-web/pages/work/smallSubManagement/stat/contractStat.html
@@ -26,17 +26,20 @@
 
 									<div class="layui-inline" >
 										<div class="layui-input-inline" >
-											<input id="contractCode" name="contractCode" type="text" class="form-control" placeholder="请输入合同编号" style="width: 200px;">
+											<input id="contractCode" name="contractCode" type="text" class="layui-input" placeholder="请输入合同编号" style="width: 200px;">
 										</div>
 									</div>
 
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
 
-									<button onclick="resetContract()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-
-									<button id="exportBt" onclick="exportBtnOutContract()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button onclick="resetContract()" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
 								</div>
 							</form>
+							<div class="layui-inline" style="margin-top: 5px;">
+								<div class="layui-input-inline" >
+									<button id="exportBt" onclick="exportBtnOutContract()" class="layui-btn layui-btn-sm">导出</button>
+								</div>
+							</div>
 						</td>
 					</tr>
 				</table>
@@ -49,7 +52,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>小包干合同编号</th>
@@ -83,4 +86,4 @@
 <script type="text/javascript" src="../../../../js/work/smallSubManagement/stat/contractStat.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/smallSubManagement/stat/contractStatView.html b/smz-web/pages/work/smallSubManagement/stat/contractStatView.html
index 74e5798..398b1a6 100644
--- a/smz-web/pages/work/smallSubManagement/stat/contractStatView.html
+++ b/smz-web/pages/work/smallSubManagement/stat/contractStatView.html
@@ -94,17 +94,20 @@
             <div class="search-bar">
                 <select id="gxId" name="gxId" class="layui-input" lay-search="" style="width: 200px;height: 40px;"></select>
                 <button class="layui-btn layui-btn-normal" onclick="searchPosition()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetPosition()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
+
+            </div>
+            <div class="search-bar">
                 <button class="layui-btn layui-btn-primary" onclick="exportPosition()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="position-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>包干工序</th>
@@ -133,17 +136,19 @@
                     <option value="出场">出场</option>
                 </select>
                 <button class="layui-btn layui-btn-normal" onclick="searchStaff()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetStaff()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
+            </div>
+            <div class="search-bar">
                 <button class="layui-btn layui-btn-primary" onclick="exportStaff()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="staff-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>人员姓名</th>
@@ -175,17 +180,19 @@
                 </select>
 
                 <button class="layui-btn layui-btn-normal" onclick="searchRecord()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetRecord()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
+            </div>
+            <div class="search-bar">
                 <button class="layui-btn layui-btn-primary" onclick="exportRecord()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="record-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>更改类型</th>
@@ -200,4 +207,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/smallSubManagement/stat/gxStat.html b/smz-web/pages/work/smallSubManagement/stat/gxStat.html
index e78133b..331c7fa 100644
--- a/smz-web/pages/work/smallSubManagement/stat/gxStat.html
+++ b/smz-web/pages/work/smallSubManagement/stat/gxStat.html
@@ -32,17 +32,21 @@
 
 									<div class="layui-inline" >
 										<div class="layui-input-inline" >
-											<input id="contractCode" name="contractCode" type="text" class="form-control" placeholder="请输入合同编号" style="width: 200px;">
+											<input id="contractCode" name="contractCode" type="text" class="layui-input" placeholder="请输入合同编号" style="width: 200px;">
 										</div>
 									</div>
 
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
 
-									<button onclick="resetGx()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-
-									<button id="exportBt" onclick="exportBtnOutGx()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button onclick="resetGx()" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
 								</div>
 							</form>
+
+							<div class="layui-inline" style="margin-top: 5px;">
+								<div class="layui-input-inline" >
+									<button id="exportBt" onclick="exportBtnOutGx()" class="layui-btn layui-btn-sm">导出</button>
+								</div>
+							</div>
 						</td>
 					</tr>
 				</table>
@@ -55,7 +59,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>工程名称</th>
@@ -89,4 +93,4 @@
 <script type="text/javascript" src="../../../../js/work/smallSubManagement/stat/gxStat.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/smallSubManagement/stat/gxStatView.html b/smz-web/pages/work/smallSubManagement/stat/gxStatView.html
index e43c099..7af8d3a 100644
--- a/smz-web/pages/work/smallSubManagement/stat/gxStatView.html
+++ b/smz-web/pages/work/smallSubManagement/stat/gxStatView.html
@@ -77,7 +77,7 @@
         </div>
         <div class="section-content">
             <table id="process-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>工序绑定日期</th>
                     <th>第一次考勤日期</th>
@@ -98,17 +98,20 @@
             <div class="search-bar">
                 <input type="text" id="userName" name="userName" placeholder="姓名" class="layui-input" style="width: 200px;">
                 <button class="layui-btn layui-btn-normal" onclick="searchPersonnel()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetPersonnel()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
-                </button>
-                <button class="layui-btn layui-btn-primary" onclick="exportPersonnel()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    重置
                 </button>
             </div>
+            <div class="search-bar">
+                <button class="layui-btn layui-btn-primary" onclick="exportPersonnel()">
+                    导出
+                </button>
+            </div>
+
             <table id="personnel-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>人员姓名</th>
@@ -122,4 +125,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/smallSubManagement/stat/personnelStat.html b/smz-web/pages/work/smallSubManagement/stat/personnelStat.html
index b3d3ace..96de007 100644
--- a/smz-web/pages/work/smallSubManagement/stat/personnelStat.html
+++ b/smz-web/pages/work/smallSubManagement/stat/personnelStat.html
@@ -26,29 +26,34 @@
 
 									<div class="layui-inline" >
 										<div class="layui-input-inline" >
-											<input id="userName" name="userName" type="text" class="form-control" placeholder="请输入人员姓名" style="width: 200px;">
+											<input id="userName" name="userName" type="text" class="layui-input" placeholder="请输入人员姓名" style="width: 200px;">
 										</div>
 									</div>
 
 									<div class="layui-inline" >
 										<div class="layui-input-inline" >
-											<input id="postName" name="postName" type="text" class="form-control" placeholder="请输入工种" style="width: 200px;">
+											<input id="postName" name="postName" type="text" class="layui-input" placeholder="请输入工种" style="width: 200px;">
 										</div>
 									</div>
 
 									<div class="layui-inline" >
 										<div class="layui-input-inline" >
-											<input id="contractCode" name="contractCode" type="text" class="form-control" placeholder="请输入合同编号" style="width: 200px;">
+											<input id="contractCode" name="contractCode" type="text" class="layui-input" placeholder="请输入合同编号" style="width: 200px;">
 										</div>
 									</div>
 
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
+
+									<button onclick="resetPersonnel()" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
 
-									<button onclick="resetPersonnel()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
 
-									<button id="exportBt" onclick="exportBtnOutPersonnel()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
 								</div>
 							</form>
+							<div class="layui-inline" style="margin-top: 5px;">
+								<div class="layui-input-inline" >
+									<button id="exportBt" onclick="exportBtnOutPersonnel()" class="layui-btn layui-btn-sm">导出</button>
+								</div>
+							</div>
 						</td>
 					</tr>
 				</table>
@@ -96,4 +101,4 @@
 <script type="text/javascript" src="../../../../js/work/smallSubManagement/stat/personnelStat.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/smallSubManagement/stat/personnelStatView.html b/smz-web/pages/work/smallSubManagement/stat/personnelStatView.html
index 29f33a3..08a98e3 100644
--- a/smz-web/pages/work/smallSubManagement/stat/personnelStatView.html
+++ b/smz-web/pages/work/smallSubManagement/stat/personnelStatView.html
@@ -77,7 +77,7 @@
         </div>
         <div class="section-content">
             <table id="entry-exit-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>小包干合同编号</th>
                     <th>工种</th>
@@ -123,17 +123,19 @@
                 </select>
                 <input type="text" id="date-search" placeholder="选择日期范围" readonly class="layui-input" style="width: 200px;">
                 <button class="layui-btn layui-btn-normal" onclick="searchAttendance()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetAttendance()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
+            </div>
+            <div class="search-bar">
                 <button class="layui-btn layui-btn-primary" onclick="exportAttendance()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="attendance-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>考勤日期</th>
diff --git a/smz-web/pages/work/smallSubManagement/stat/projectStat.html b/smz-web/pages/work/smallSubManagement/stat/projectStat.html
index 511123b..87fb647 100644
--- a/smz-web/pages/work/smallSubManagement/stat/projectStat.html
+++ b/smz-web/pages/work/smallSubManagement/stat/projectStat.html
@@ -23,11 +23,15 @@
 											<select id="proId" name="proId" lay-search=""></select>
 										</div>
 									</div>
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-									<button onclick="resetProject()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
+									<button onclick="resetProject()" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
 								</div>
 							</form>
+							<div class="layui-inline" style="margin-top: 5px;">
+								<div class="layui-input-inline">
+									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm">导出</button>
+								</div>
+							</div>
 						</td>
 					</tr>
 				</table>
@@ -40,7 +44,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>工程名称</th>
@@ -75,4 +79,4 @@
 <script type="text/javascript" src="../../../../js/work/smallSubManagement/stat/projectStat.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/smallSubManagement/stat/projectStatView.html b/smz-web/pages/work/smallSubManagement/stat/projectStatView.html
index c26cf9a..61f62fb 100644
--- a/smz-web/pages/work/smallSubManagement/stat/projectStatView.html
+++ b/smz-web/pages/work/smallSubManagement/stat/projectStatView.html
@@ -72,7 +72,7 @@
         </div>
         <div class="section-content">
             <table id="contract-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>协议编号</th>
                     <th>分包名称（甲方）</th>
@@ -99,17 +99,17 @@
             <div class="search-bar">
                 <select id="gxId" name="gxId"  lay-verify="required" lay-search="" style="width: 200px;height: 40px;border: 1px solid #e6e6e6;border-radius: 2px;"></select>
                 <button class="layui-btn layui-btn-normal" onclick="searchPosition()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetPosition()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="exportPosition()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="position-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>包干工序</th>
@@ -139,17 +139,17 @@
                     <option value="出场">出场</option>
                 </select>
                 <button class="layui-btn layui-btn-normal" onclick="searchStaff()">
-                    <i class="layui-icon layui-icon-search"></i> 查询
+                    查询
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="resetStaff()">
-                    <i class="layui-icon layui-icon-refresh"></i> 重置
+                    重置
                 </button>
                 <button class="layui-btn layui-btn-primary" onclick="exportStaff()">
-                    <i class="layui-icon layui-icon-export"></i> 导出
+                    导出
                 </button>
             </div>
             <table id="staff-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                <thead>
+                <thead style="background-color: #FAFAFA !important;">
                 <tr>
                     <th>序号</th>
                     <th>人员姓名</th>
@@ -167,4 +167,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/smallSubManagement/teamPackageManageList.html b/smz-web/pages/work/smallSubManagement/teamPackageManageList.html
index 6bf274e..7fb936d 100644
--- a/smz-web/pages/work/smallSubManagement/teamPackageManageList.html
+++ b/smz-web/pages/work/smallSubManagement/teamPackageManageList.html
@@ -60,14 +60,11 @@
                                             <input id="teamName" type="text" class="layui-input" placeholder="请输入班组">
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <button id="exportBt" onclick="exportTeamPackage()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
-                                    <button class="layui-btn layui-btn-sm" onclick="insertTeamPackageload()" permission="sys:SubContractor:query">
-                                        <i class="layui-icon">&#xe608;</i> 添加
-                                    </button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
+
                                     <div class="layui-inline">
-                                        <p style="color: red; margin-left: 20px;">
+                                        <p style="color: red; margin-left:220px;">
                                             注意事项：<br>
                                             1.先确认分包商已经设置了小包干权限<br>
                                             2.班组信息已经录入系统<br>
@@ -78,6 +75,14 @@
                                     </div>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: -1.5%;">
+                                <div class="layui-input-inline" >
+                                    <button id="exportBt" onclick="exportTeamPackage()" class="layui-btn layui-btn-sm">导出</button>
+                                    <button class="layui-btn layui-btn-sm" onclick="insertTeamPackageload()" permission="sys:SubContractor:query" style="margin-left: 0px;">
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -88,7 +93,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>协议编号</th>
diff --git a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageForm.html b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageForm.html
index 911cbaa..9017324 100644
--- a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageForm.html
+++ b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageForm.html
@@ -22,7 +22,7 @@
     </style>
 </head>
 <body>
-<div class="layui-form">
+<div class="layui-form" style="padding: 0 24px 0 24px">
     <form class="layui-form" enctype="multipart/form-data" id="" action="">
         <input type="hidden" id="id" name="id">
         <div class="layui-form-item" style="margin-left: 10%;margin-top: 1%">
@@ -34,25 +34,25 @@
                 </div>
             </div>
             <div class="layui-input-inline" style="width: 65%;margin-right: 30%;">
-                <label class="layui-form-label" style="margin-top:5%;"><i class="tip-required" style="color: red;font-size: 20px;">*</i> 包干工序:</label>
+                <label class="layui-form-label" style="margin-top:7%;"><i class="tip-required" style="color: red;font-size: 20px;">*</i> 包干工序:</label>
                 <div class="layui-input-block">
                     <input type="text" name="lumpProcess" id="lumpProcess" required  lay-verify="required" class="layui-input" style="margin-top: 10%;" maxlength="30">
                 </div>
             </div>
             <div class="layui-input-inline" style="width: 65%">
-                <label class="layui-form-label" style="margin-top: 5%;"><i class="tip-required" style="color: red;font-size: 20px;">*</i> 桩位:</label>
+                <label class="layui-form-label" style="margin-top: 7%;"><i class="tip-required" style="color: red;font-size: 20px;">*</i> 桩位:</label>
                 <div class="layui-input-block">
                     <input type="text" name="pilePosition" id="pilePosition" required  lay-verify="required" class="layui-input" style="margin-top: 10%;" maxlength="30">
                 </div>
             </div>
             <div class="layui-input-inline" style="width: 65%">
-                <label class="layui-form-label" style="margin-top: 5%;"> 塔形:</label>
+                <label class="layui-form-label" style="margin-top: 7%;"> 塔形:</label>
                 <div class="layui-input-block">
                     <input type="text" name="towerType" id="towerType" class="layui-input" style="margin-top: 10%;" maxlength="30">
                 </div>
             </div>
             <div class="layui-input-inline" style="width: 65%">
-                <label class="layui-form-label" style="margin-top: 5%;"> 地形:</label>
+                <label class="layui-form-label" style="margin-top: 7%;"> 地形:</label>
                 <div class="layui-input-block">
                     <input type="text" name="terrain" id="terrain" class="layui-input" style="margin-top: 10%;" maxlength="30">
                 </div>
diff --git a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageList.html b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageList.html
index cd52373..b4927b3 100644
--- a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageList.html
+++ b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageList.html
@@ -15,7 +15,7 @@
     </style>
 </head>
 <body>
-<div>
+<div style="padding: 0 24px 0 24px">
     <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
         <header style="height: 100%">
             <div align="left">
@@ -42,20 +42,23 @@
                                             <input id="terrain" type="text" class="layui-input" placeholder="请输入地形">
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <input id="articleImageFile" name="excelFile" type="file" class="form-control" style="width: 300px; display: inline;" />
-                                    <input id="saveZipButton" type="button" style="width: 60px;height: 35px;" value="导入" />
-                                    <input type="file" id="import-excel" name="image" style="display: none;"/>
-                                    <button id="exportBt" onclick="exportTotalProject()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
-                                    <button class="layui-btn layui-btn-sm" onclick="templatedownload()" style="margin-top: 5px;margin-left: 0%;">
-                                        <i class="layui-icon">&#xe601;</i> 模板下载
-                                    </button>
-                                    <button style="margin-top: 5px;" class="layui-btn layui-btn-sm" onclick="insertProWorkload()">
-                                        <i class="layui-icon">&#xe608;</i> 添加
-                                    </button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm">重置</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <input id="articleImageFile" name="excelFile" type="file" class="form-control" style="width: 300px; display: inline;" />
+                                <input id="saveZipButton" type="button" class="layui-btn layui-btn-sm" value="导入" style="margin-top: -10px;" />
+                                <input type="file" id="import-excel" name="image" style="display: none;"/>
+                                <button id="exportBt" onclick="exportTotalProject()" class="layui-btn layui-btn-sm" style="margin-top: -10px;">导出</button>
+                                <button class="layui-btn layui-btn-sm" onclick="templatedownload()" style="margin-left: 0px;margin-top: -10px;">
+                                   模板下载
+                                </button>
+                                <button  class="layui-btn layui-btn-sm" onclick="insertProWorkload()" style="margin-left: 0px;margin-top: -10px;">
+                                    添加
+                                </button>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -66,7 +69,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>项目名称</th>
diff --git a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageOneList.html b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageOneList.html
index 51e899a..512b80b 100644
--- a/smz-web/pages/work/smallSubManagement/totalProWorkloadManageOneList.html
+++ b/smz-web/pages/work/smallSubManagement/totalProWorkloadManageOneList.html
@@ -24,19 +24,24 @@
                         <td>
                             <form class="form-inline layui-form" onsubmit="return false">
                                 <div class="form-group">
-                                    <div class="layui-inline" style="margin-top: 5px;">
-                                        <div class="layui-input-inline" style="margin-top: -0.5%;">
+                                    <div class="layui-inline" >
+                                        <div class="layui-input-inline" >
                                             <select id="proId" name="proId" lay-search>
                                             </select>
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
-                                    <button id="resetBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe666;</i>重置</button>
-                                    <button style="margin-top: 5px;" class="layui-btn layui-btn-sm" onclick="insertProWorkload()">
-                                        <i class="layui-icon">&#xe608;</i> 添加
-                                    </button>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+                                    <button id="resetBt" class="layui-btn layui-btn-sm" style="margin-left: 0px;">重置</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" >
+                                <div class="layui-input-inline" >
+                                    <button style="margin-top: 5px;" class="layui-btn layui-btn-sm" onclick="insertProWorkload()">
+                                        添加
+                                    </button>
+                                </div>
+                            </div>
                         </td>
                     </tr>
                 </table>
@@ -47,7 +52,7 @@
             <div class="widget-body no-padding">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>项目名称</th>
diff --git a/smz-web/pages/work/sysMag/corporationMag.html b/smz-web/pages/work/sysMag/corporationMag.html
index 1789014..4ebf933 100644
--- a/smz-web/pages/work/sysMag/corporationMag.html
+++ b/smz-web/pages/work/sysMag/corporationMag.html
@@ -29,35 +29,36 @@
                     <tr>
                         <td>
                             <form class="form-inline layui-form" onsubmit="return false" id="form">
-                                <div class="form-group" style="margin-left: -1.8%">
-                                    <div class="layui-inline" style="margin-top: 0.5%">
-                                        <label class="layui-form-label">公司:</label>
+                                <div class="form-group" >
+                                    <div class="layui-inline">
                                         <div class="layui-input-inline">
                                             <select id="orgId" name="orgId" lay-search>
                                             </select>
                                         </div>
                                     </div>
-                                    <div class="layui-inline" style="margin-top: 0.5%">
-                                        <label class="layui-form-label">单位类型:</label>
+                                    <div class="layui-inline" >
                                         <div class="layui-input-inline">
                                             <select id="companyTypeId" name="companyTypeId" lay-search>
                                             </select>
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <div class="layui-input-inline" style="margin-top: 1.3%">
+                                        <div class="layui-input-inline" >
                                             <input id="keyWord" type="text" class="layui-input" placeholder="请输入关键字">
                                         </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"
-                                            permission="sys:accessField:query" style="margin-top: 0.7%;"><i
-                                            class="layui-icon">&#xe615;</i>搜索
-                                    </button>
-                                    <button class="layui-btn layui-btn-sm" style="margin-top: 0.7%;" onclick="insertCorporation()">
-                                        <i class="layui-icon">&#xe608;</i>添加
-                                    </button>
+                                    <div class="layui-inline" style="margin-top: 6px;">
+                                        <button id="searchBt" class="layui-btn layui-btn-sm"
+                                                permission="sys:accessField:query"  >搜索
+                                        </button>
+                                    </div>
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 10px;">
+                                <button class="layui-btn layui-btn-sm" onclick="insertCorporation()">
+                                    添加
+                                </button>
+                            </div>
                         </td>
 
                     </tr>
@@ -70,7 +71,7 @@
             <div class="widget-body no-padding" style="margin-top: 1%;">
                 <div id="dt-table-length"></div>
                 <table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th>序号</th>
                         <th>公司名称</th>
@@ -110,4 +111,4 @@
 <script type="text/javascript" src="../../../js/dict.js"></script>
 <script type="text/javascript" src="../../../js/work/sysMag/corporationMag.js" defer="defer"></script>
 <script type="text/javascript">
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/monthWagesForm.html b/smz-web/pages/work/uploadResults/monthWagesForm.html
index 77fbfc8..b16accc 100644
--- a/smz-web/pages/work/uploadResults/monthWagesForm.html
+++ b/smz-web/pages/work/uploadResults/monthWagesForm.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../layui/css/layui.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/proManager.css">
 </head>
-<body>
+<body style="padding: 0 24px 0 24px">
 <div>
 	<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 		<header style="height: 100%">
@@ -33,7 +33,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>文件类型</th>
@@ -65,4 +65,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/monthWagesForm.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/monthWagesList.html b/smz-web/pages/work/uploadResults/monthWagesList.html
index ebdf9a5..5f70962 100644
--- a/smz-web/pages/work/uploadResults/monthWagesList.html
+++ b/smz-web/pages/work/uploadResults/monthWagesList.html
@@ -23,9 +23,9 @@
 											<select id="proId" name="proId" lay-search=""></select>
 										</div>
 									</div>
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-									<button onclick="resetProject()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
+									<button onclick="resetProject()" class="layui-btn layui-btn-sm">重置</button>
+									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm">导出</button>
 								</div>
 							</form>
 						</td>
@@ -40,7 +40,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>工资月份</th>
@@ -79,4 +79,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/monthWagesList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/personWagesForm.html b/smz-web/pages/work/uploadResults/personWagesForm.html
index cbe6bec..e351341 100644
--- a/smz-web/pages/work/uploadResults/personWagesForm.html
+++ b/smz-web/pages/work/uploadResults/personWagesForm.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/proManager.css">
 </head>
 <body>
-<div>
+<div style="padding: 0 24px 0 24px">
 	<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 		<header style="height: 100%">
 			<div align="left">
@@ -33,7 +33,7 @@
 				<table id="dt-table2"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>工资月份</th>
@@ -58,7 +58,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>文件类型</th>
@@ -90,4 +90,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/personWagesForm.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/personWagesList.html b/smz-web/pages/work/uploadResults/personWagesList.html
index d4961a9..8bd30e6 100644
--- a/smz-web/pages/work/uploadResults/personWagesList.html
+++ b/smz-web/pages/work/uploadResults/personWagesList.html
@@ -23,9 +23,9 @@
 											<select id="proId" name="proId" lay-search=""></select>
 										</div>
 									</div>
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-									<button onclick="resetProject()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
+									<button onclick="resetProject()" class="layui-btn layui-btn-sm">重置</button>
+									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm">导出</button>
 								</div>
 							</form>
 						</td>
@@ -40,7 +40,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>人员姓名</th>
@@ -79,4 +79,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/personWagesList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/proWagesForm.html b/smz-web/pages/work/uploadResults/proWagesForm.html
index 026ec82..fb6bf1d 100644
--- a/smz-web/pages/work/uploadResults/proWagesForm.html
+++ b/smz-web/pages/work/uploadResults/proWagesForm.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" type="text/css" media="screen" href="../../../css/work/basic/proManager.css">
 </head>
 <body>
-<div>
+<div style="padding: 0 24px 0 24px">
 	<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 		<header style="height: 100%">
 			<div align="left">
@@ -33,7 +33,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>文件类型</th>
@@ -65,4 +65,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/proWagesForm.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/proWagesList.html b/smz-web/pages/work/uploadResults/proWagesList.html
index b1e38d0..0a1439e 100644
--- a/smz-web/pages/work/uploadResults/proWagesList.html
+++ b/smz-web/pages/work/uploadResults/proWagesList.html
@@ -23,9 +23,9 @@
 											<select id="proId" name="proId" lay-search=""></select>
 										</div>
 									</div>
-									<button id="searchBt"  class="layui-btn layui-btn-sm" ><i class="layui-icon">&#xe615;</i>搜索</button>
-									<button onclick="resetProject()" class="layui-btn layui-btn-sm"><i class="layui-icon layui-icon-refresh"></i>重置</button>
-									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe681;</i>导出</button>
+									<button id="searchBt"  class="layui-btn layui-btn-sm" >搜索</button>
+									<button onclick="resetProject()" class="layui-btn layui-btn-sm">重置</button>
+									<button id="exportBt" onclick="exportBtnOutProject()" class="layui-btn layui-btn-sm">导出</button>
 								</div>
 							</form>
 						</td>
@@ -40,7 +40,7 @@
 				<table id="dt-table"
 					   class="table table-striped table-bordered table-hover"
 					   style="width: 100%">
-					<thead>
+					<thead style="background-color: #FAFAFA !important;">
 					<tr>
 						<th style="width:1%">序号</th>
 						<th>工程名称</th>
@@ -79,4 +79,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/proWagesList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/submitReword.html b/smz-web/pages/work/uploadResults/submitReword.html
index 529f002..9764b7b 100644
--- a/smz-web/pages/work/uploadResults/submitReword.html
+++ b/smz-web/pages/work/uploadResults/submitReword.html
@@ -124,7 +124,7 @@
     </style>
 
 </head>
-<body class="layui-layout-body">
+<body class="layui-layout-body" style="padding: 0 24px 0 24px ;">
     <div style="margin-top: 10%;text-align: center;line-height: 30px;">
         <i class="layui-icon layui-color-green" style="font-size: 66px;color: #7ED96D;">&#x1005;</i>
         <h1>操作成功</h1>
@@ -173,4 +173,4 @@
         <button class="buttonshi" onclick="fou()" id="fou">查看详情</button>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/uploadResults/uploadResultsAddForm.html b/smz-web/pages/work/uploadResults/uploadResultsAddForm.html
index 343fddb..893eeb9 100644
--- a/smz-web/pages/work/uploadResults/uploadResultsAddForm.html
+++ b/smz-web/pages/work/uploadResults/uploadResultsAddForm.html
@@ -41,7 +41,7 @@
         }
     </style>
 </head>
-<body>
+<body style="padding: 0 24px 0 24px;">
 <div align="right" style="margin-right: 2%; margin-top: 1%">
     <input type="hidden" id="rewordNum" name="rewordNum">
     <input type="hidden" id="isCheck" name="isCheck" value="0">
@@ -60,7 +60,7 @@
                 <div class="layui-form-item" style="margin-top: 2%;width: 85%">
                     <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i>月份</label>
                     <div class="layui-input-block" style="width: 26.5%">
-                        <input type="text" name="month" id="month" required lay-verify="required" autocomplete="off" class="layui-input" placeholder="选择月份">
+                        <input type="text" name="month" id="month" lay-verify="required" autocomplete="off" class="layui-input" placeholder="选择月份">
                     </div>
                 </div>
 
@@ -84,10 +84,10 @@
                 <div class="layui-form-item" style="width: 73.5%">
                     <label class="layui-form-label"><i class="tip-required" style="color: red;font-size: 20px">*</i>备注描述</label>
                     <div class="layui-input-block" style="width: 71.2%">
-                        <textarea id="remark" name="remark" required lay-verify="required" class="layui-textarea" maxlength="300" placeholder="输入内容"></textarea>
+                        <textarea id="remark" name="remark" lay-verify="required" class="layui-textarea" maxlength="300" placeholder="输入内容"></textarea>
                     </div>
                 </div>
-                <button id="nextButton" class="layui-btn layui-btn-primary" style="margin-left: 6.7%">下一步</button>
+                <button type="submit" id="nextButton" class="layui-btn layui-btn-primary" style="margin-left: 7.6%">下一步</button>
             </div>
         </div>
     </div>
@@ -165,4 +165,4 @@
 </div>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/smz-web/pages/work/uploadResults/uploadResultsList.html b/smz-web/pages/work/uploadResults/uploadResultsList.html
index ec71df9..ea17b1d 100644
--- a/smz-web/pages/work/uploadResults/uploadResultsList.html
+++ b/smz-web/pages/work/uploadResults/uploadResultsList.html
@@ -16,44 +16,55 @@
                 <table style="width: 100%">
                     <tr>
                         <td>
-                            <form class="form-inline" onsubmit="return false">
+                            <form class="form-inline layui-form" onsubmit="return false">
                                 <div class="form-group">
-                                    <input id="keyWord" name="keyWord" type="text" class="form-control" placeholder="搜索关键词">
-                                    <input name="month" type="text" class="form-control" id="month" autocomplete="off"
-                                           placeholder="选择月份范围">
-
-                                    <div class="layui-input-inline">
-                                        <select id="state" class="form-control" name="state">
-                                            <option value="">核定结果审核状态</option>
-                                            <option value="0">待提交</option>
-                                            <option value="1">待确认</option>
-                                            <option value="2">已驳回</option>
-                                            <option value="3">已确认</option>
-                                        </select>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input id="keyWord" name="keyWord" type="text" class="layui-input" placeholder="搜索关键词">
+                                        </div>
                                     </div>
 
-                                    <div class="layui-input-inline">
-                                        <select id="status" class="form-control" name="status">
-                                            <option value="">流程状态</option>
-                                            <option value="1">进行中</option>
-                                            <option value="2">完结</option>
-                                        </select>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <input name="month" type="text" class="layui-input" id="month" autocomplete="off"
+                                                   placeholder="选择月份范围">
+                                        </div>
                                     </div>
-                                    <button id="searchBt" class="layui-btn layui-btn-sm"><i
-                                            class="layui-icon">&#xe615;</i>搜索
-                                    </button>
-									<button class="layui-btn layui-btn-sm" onclick="addFeaturesInfo()">
-										<i class="layui-icon">&#xe608;</i> 新建
-									</button>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="state" name="state">
+                                                <option value="">核定结果审核状态</option>
+                                                <option value="0">待提交</option>
+                                                <option value="1">待确认</option>
+                                                <option value="2">已驳回</option>
+                                                <option value="3">已确认</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <select id="status" name="status">
+                                                <option value="">流程状态</option>
+                                                <option value="1">进行中</option>
+                                                <option value="2">完结</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <button id="searchBt" class="layui-btn layui-btn-sm">搜索</button>
+
                                 </div>
                             </form>
+                            <div class="layui-inline" style="margin-top: 5px;">
+                                <div class="layui-input-inline">
+                                    <button class="layui-btn layui-btn-sm" onclick="addFeaturesInfo()"> 新建 </button>
+                                    <button class="layui-btn layui-btn-sm" onclick="processView()" style="margin-left: 0px;">
+                                        查看流程
+                                    </button>
+                                </div>
+                            </div>
                         </td>
-						<td align="right">
-							<button class="layui-btn layui-btn-sm" onclick="processView()">
-								查看流程
-							</button>
-						</td>
-
                     </tr>
                 </table>
             </div>
@@ -65,7 +76,7 @@
                 <table id="dt-table"
                        class="table table-striped table-bordered table-hover"
                        style="width: 100%">
-                    <thead>
+                    <thead style="background-color: #FAFAFA !important;">
                     <tr>
                         <th style="width:1%">序号</th>
                         <th>核定编号</th>
@@ -99,4 +110,4 @@
 <script type="text/javascript" src="../../../js/work/uploadResults/uploadResultsList.js"></script>
 <script type="text/javascript">
 
-</script>
\ No newline at end of file
+</script>
diff --git a/smz-web/pages/work/uploadResults/uploadResultsView.html b/smz-web/pages/work/uploadResults/uploadResultsView.html
index 2e38c47..7d6c14f 100644
--- a/smz-web/pages/work/uploadResults/uploadResultsView.html
+++ b/smz-web/pages/work/uploadResults/uploadResultsView.html
@@ -13,10 +13,10 @@
     <title>详情</title>
 
 </head>
-<body>
+<body style="padding: 0 24px 0 24px;">
 <script type="text/html" id="opeator-bar">
-    <button class="layui-btn layui-btn-sm " lay-event="edit"><img src="../../../img/search.png">预览</button>
-    <button class="layui-btn layui-btn-sm " lay-event="del"><img src="../../../img/downloads.png">下载</button>
+    <button class="layui-btn layui-btn-sm " lay-event="edit">预览</button>
+    <button class="layui-btn layui-btn-sm " lay-event="del">下载</button>
 </script>
 
 <div class="title">
@@ -35,23 +35,23 @@
     </div>
     <div>
         <button class="layui-btn layui-bg-blue" style="display: none" id="tijiao" onclick="pass()">
-            <i class="layui-icon layui-icon-edit"></i>
+
             提交
         </button>
         <button class="layui-btn layui-bg-blue" style="display: none" id="xiugai" onclick="update()">
-            <i class="layui-icon layui-icon-edit"></i>
+
             修改
         </button>
         <button class="layui-btn layui-bg-red" style="display: none" id="xianxia" onclick="xianxia()">
-            <i class="layui-icon layui-icon-upload-circle"></i>
+
             线下发放附件上传
         </button>
         <button class="layui-btn layui-bg-blue" style="display: none" id="shanchu" onclick="del()">
-            <i class="layui-icon layui-icon-delete"></i>
+
             删除
         </button>
         <button class="layui-btn layui-bg-blue" onclick="packageDownload()">
-            <i class="layui-icon layui-icon-download-circle"></i>
+
             下载
         </button>
     </div>
@@ -360,4 +360,4 @@
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>