From f4a2143e9e976f0016de54c246ab258176ccd45c Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Thu, 18 Dec 2025 15:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=BF=E8=BD=BD=E5=8A=9B-?=
=?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/corporateOrg/CorporateGovernance.js | 68 ++++++++++++++-----
czl-web/js/corporateOrg/ProjectDepartment.js | 41 ++++++++++-
czl-web/js/corporateOrg/branch.js | 36 +++++++++-
czl-web/js/machineTool/MachineToolLibrary.js | 6 +-
czl-web/js/newPro/newProPreArrangementList.js | 8 +--
czl-web/js/personnelPool/branchStaffList.js | 4 +-
czl-web/js/personnelPool/selfOwnedList.js | 6 +-
czl-web/js/personnelPool/subcontractorList.js | 6 +-
czl-web/js/teamset/ownTeamSetList.js | 8 +--
czl-web/js/teamset/subTeamSetList.js | 8 +--
czl-web/js/teamset/untiTeamSetList.js | 8 +--
.../corporateOrg/CorporateGovernance.html | 38 ++++++-----
.../pages/corporateOrg/ProjectDepartment.html | 37 +++++-----
czl-web/pages/corporateOrg/addBranchFrom.html | 6 +-
czl-web/pages/corporateOrg/branch.html | 33 ++++-----
.../pages/machineTool/MachineToolLibrary.html | 10 ++-
czl-web/pages/newpro/historyProList.html | 18 +++--
czl-web/pages/newpro/historyProView.html | 2 +-
czl-web/pages/newpro/newProForm.html | 6 +-
.../newpro/newProPreArrangementList.html | 16 +++--
.../pages/newpro/preReleaseResourceList.html | 18 +++--
.../pages/newpro/preReleaseResourceView.html | 6 +-
czl-web/pages/ownteam/teamBindOrgForm.html | 4 ++
.../pages/personnelPool/branchStaffList.html | 11 ++-
.../pages/personnelPool/selfOwnedList.html | 12 +++-
.../personnelPool/subcontractorList.html | 11 ++-
czl-web/pages/real/personAttendanceList.html | 10 ++-
czl-web/pages/real/personRosterList.html | 12 +++-
czl-web/pages/teamset/ownTeamSetList.html | 10 ++-
czl-web/pages/teamset/subTeamSetList.html | 10 ++-
czl-web/pages/teamset/unitTeamSetList.html | 11 ++-
31 files changed, 336 insertions(+), 144 deletions(-)
diff --git a/czl-web/js/corporateOrg/CorporateGovernance.js b/czl-web/js/corporateOrg/CorporateGovernance.js
index 10b8107..967f412 100644
--- a/czl-web/js/corporateOrg/CorporateGovernance.js
+++ b/czl-web/js/corporateOrg/CorporateGovernance.js
@@ -8,11 +8,11 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
laydate = layui.laydate;
form = layui.form;
if (pers && $.inArray('sysCompanyManage:add', pers) < 0) {
- var addDiv=document.getElementById('addDiv');
- if(addDiv){
- document.getElementById('addDiv').remove();
- }
-
+ var addDiv = document.getElementById('addDiv');
+ if (addDiv) {
+ document.getElementById('addDiv').remove();
+ }
+
}
//渲染table
table.render({
@@ -24,7 +24,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
, cellMinWidth: 80
, cols: [[ //表头
{
- field: 'number', width:120,title: '序号', align: 'center', type: 'numbers'
+ field: 'number', width: 120, title: '序号', align: 'center', type: 'numbers'
}
, {field: 'orgName', align: 'center', title: '公司名称'}
, {field: 'social', align: 'center', title: '统一社会信用代码'}
@@ -32,14 +32,14 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
, {field: 'msvsName', align: 'center', title: '法定代表人姓名 '}
, {field: 'mandates', align: 'center', title: '企业注册日期'}
, {
- fixed: 'right', width:180, title: '操作', align: 'center', templet: d => {
+ fixed: 'right', width: 180, title: '操作', align: 'center', templet: d => {
let text = "";
if ($.inArray('sysCompanyManage:update', pers) >= 0) {
- text +='编辑';
- text +=' | ';
+ text += '编辑';
+ text += ' | ';
}
if ($.inArray('sysCompanyManage:del', pers) >= 0) {
- text +='删除';
+ text += '删除';
}
return text;
}
@@ -78,7 +78,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
var layEvent = obj.event; //获得 lay-event 对应的值
var id = data.id
if (layEvent === 'edit') {
- openForm(id,'修改');
+ openForm(id, '修改');
} else if (layEvent === 'del') {
delHospital(id);
}
@@ -105,7 +105,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
$("#keyWord").val(oldKeyWord);
break;
case "addBtn":
- openForm("",'新增');
+ openForm("", '新增');
break;
case "resetBt":
oldKeyWord = "";
@@ -126,9 +126,9 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
/**
* 新增-修改功能
*/
-function openForm(id,title){
- localStorage.setItem("id",id);
- layerOpenForm(title,"./addGovernanceFrom.html","70%","85%")
+function openForm(id, title) {
+ localStorage.setItem("id", id);
+ layerOpenForm(title, "./addGovernanceFrom.html", "97.5%", "97.5%")
}
/**
@@ -136,11 +136,43 @@ function openForm(id,title){
*/
function delHospital(id) {
layer.confirm('确定要删除吗?', {
- btn : [ '确定', '取消' ]
- }, function() {
- ajaxCommonMethod('/corporate/delFirmById',{'id': id},"删除成功","删除失败");
+ btn: ['确定', '取消']
+ }, function () {
+ ajaxCommonMethod('/corporate/delFirmById', {'id': id}, "删除成功", "删除失败");
layer.close(1);
location.reload();
});
}
+
+$("#searchBt").click(function () {
+ oldKeyWord = $("#keyWord").val();
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getFirmContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: oldKeyWord,
+ } //设定异步数据接口的额外参数
+ });
+ /**二次赋值-- 点击搜索按钮之后会进行一次刷新操作*/
+ $("#keyWord").val(oldKeyWord);
+});
+
+$("#resetBt").click(function () {
+ oldKeyWord = "";
+ $("#keyWord").val("");
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getFirmContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: "",
+ } //设定异步数据接口的额外参数
+ });
+});
+
+
+$("#addBtn").click(function () {
+ openForm("", '新增');
+});
diff --git a/czl-web/js/corporateOrg/ProjectDepartment.js b/czl-web/js/corporateOrg/ProjectDepartment.js
index 78156f0..668c070 100644
--- a/czl-web/js/corporateOrg/ProjectDepartment.js
+++ b/czl-web/js/corporateOrg/ProjectDepartment.js
@@ -13,7 +13,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
if(addDiv){
document.getElementById('addDiv').remove();
}
-
+
}
//渲染table
table.render({
@@ -38,7 +38,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
text +=' | ';
}
if ($.inArray('sysProjectContent:del', pers) >= 0) {
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -152,7 +152,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
*/
function openForm(id,title){
localStorage.setItem("id",id);
- layerOpenForm(title,"./addProjectFrom.html","70%","85%")
+ layerOpenForm(title,"./addProjectFrom.html","97.5%","97.5%")
}
/**
@@ -197,3 +197,38 @@ function getSelect(form,Id) {
});
}
+$("#searchBt").click(function () {
+ oldKeyWord = $("#keyWord").val();
+ oldOrgId = $("#parentId").val();
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getProjectContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: oldKeyWord,
+ parentId: oldOrgId,
+ } //设定异步数据接口的额外参数
+ });
+ /**二次赋值-- 点击搜索按钮之后会进行一次刷新操作*/
+ $("#keyWord").val(oldKeyWord);
+ getSelect(form,oldOrgId);
+});
+
+$("#resetBt").click(function () {
+ oldKeyWord = "";
+ $("#keyWord").val("");
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getProjectContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: "",
+ parentId : ""
+ } //设定异步数据接口的额外参数
+ });
+ getSelect(form,"");
+});
+
+$("#addBtn").click(function () {
+ openForm("",'新增');
+});
diff --git a/czl-web/js/corporateOrg/branch.js b/czl-web/js/corporateOrg/branch.js
index cc7c045..4388f8d 100644
--- a/czl-web/js/corporateOrg/branch.js
+++ b/czl-web/js/corporateOrg/branch.js
@@ -12,7 +12,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
if(addDiv){
document.getElementById('addDiv').remove();
}
-
+
}
//渲染table
table.render({
@@ -139,7 +139,7 @@ layui.use(['table', 'layer', 'laydate', 'jquery', 'form'], function () {
*/
function openForm(id,title){
localStorage.setItem("id",id);
- layerOpenForm(title,"./addBranchFrom.html","70%","85%")
+ layerOpenForm(title,"./addBranchFrom.html","97.5%","97.5%")
}
/**
@@ -155,3 +155,35 @@ function delHospital(id) {
});
}
+
+$("#searchBt").click(function () {
+ oldKeyWord = $("#keyWord").val();
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getMsgContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: oldKeyWord,
+ } //设定异步数据接口的额外参数
+ });
+ /**二次赋值-- 点击搜索按钮之后会进行一次刷新操作*/
+ $("#keyWord").val(oldKeyWord);
+});
+
+$("#resetBt").click(function () {
+ oldKeyWord = "";
+ $("#keyWord").val("");
+ table.reload('menuTable', {
+ url: czl_ht_url + '/corporate/getMsgContent'
+ , method: 'post' //方式默认是get
+ , page: true
+ , where: {
+ keyWord: "",
+ } //设定异步数据接口的额外参数
+ });
+});
+
+$("#addBtn").click(function () {
+ openForm("",'新增');
+});
+
diff --git a/czl-web/js/machineTool/MachineToolLibrary.js b/czl-web/js/machineTool/MachineToolLibrary.js
index 83baa94..3869a95 100644
--- a/czl-web/js/machineTool/MachineToolLibrary.js
+++ b/czl-web/js/machineTool/MachineToolLibrary.js
@@ -114,7 +114,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
}
if ($.inArray('sysTool:del', pers) > 0) {
text +=' | ';
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -213,7 +213,7 @@ function layerOpenProgressView(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
cancel:function (){
table.reload('menuTable', {
@@ -233,4 +233,4 @@ function reloadTip(tip,message,type){
type: type,
message: message
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/newPro/newProPreArrangementList.js b/czl-web/js/newPro/newProPreArrangementList.js
index e8763d9..1640ec7 100644
--- a/czl-web/js/newPro/newProPreArrangementList.js
+++ b/czl-web/js/newPro/newProPreArrangementList.js
@@ -96,7 +96,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
}
if ($.inArray('sysBasicData:del', pers) > 0) {
text +=' | ';
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -160,7 +160,7 @@ function layerOpenProgressView(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
cancel:function (){
localStorage.removeItem("newProId")
@@ -204,7 +204,7 @@ function layerOpenFormForSencond(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
btn: ['确定'],
success: function (layero, index) {
@@ -231,4 +231,4 @@ function reloadTip(tip,message,type){
type: type,
message: message
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/personnelPool/branchStaffList.js b/czl-web/js/personnelPool/branchStaffList.js
index b119c5f..97b91df 100644
--- a/czl-web/js/personnelPool/branchStaffList.js
+++ b/czl-web/js/personnelPool/branchStaffList.js
@@ -259,7 +259,7 @@ function layerOpenProgressView(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
cancel:function (){
table.reload('menuTable', {
@@ -274,4 +274,4 @@ function layerOpenProgressView(title,contentUrl){
});
}
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/personnelPool/selfOwnedList.js b/czl-web/js/personnelPool/selfOwnedList.js
index 1a00c33..755c447 100644
--- a/czl-web/js/personnelPool/selfOwnedList.js
+++ b/czl-web/js/personnelPool/selfOwnedList.js
@@ -100,7 +100,7 @@ layui.use(['table', 'form','notice', 'layNotify','element'], function () {
}
if ($.inArray('sysSelfOwned:del', pers) >= 0) {
text +=' | ';
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -189,7 +189,7 @@ function layerOpenProgressView(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
cancel:function (){
table.reload('menuTable', {
@@ -203,4 +203,4 @@ function layerOpenProgressView(title,contentUrl){
});
}
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/personnelPool/subcontractorList.js b/czl-web/js/personnelPool/subcontractorList.js
index f03dab3..a0cd04c 100644
--- a/czl-web/js/personnelPool/subcontractorList.js
+++ b/czl-web/js/personnelPool/subcontractorList.js
@@ -121,7 +121,7 @@ layui.use(['table', 'form','notice', 'layNotify','element'], function () {
}
if ($.inArray('sysSubcontractor:del', pers) >= 0) {
text +=' | ';
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -214,7 +214,7 @@ function layerOpenProgressView(title,contentUrl){
title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
content: contentUrl,
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
cancel:function (){
table.reload('menuTable', {
@@ -229,4 +229,4 @@ function layerOpenProgressView(title,contentUrl){
});
}
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/teamset/ownTeamSetList.js b/czl-web/js/teamset/ownTeamSetList.js
index 02224f9..37ced62 100644
--- a/czl-web/js/teamset/ownTeamSetList.js
+++ b/czl-web/js/teamset/ownTeamSetList.js
@@ -16,7 +16,7 @@ $("#addBt").click(function(){
type: 2,
title: '新增',
content: 'ownTeamOpen.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -87,7 +87,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
text +=' | ';
}
if ($.inArray('sysOneTeamSet:del', pers) >= 0) {
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -156,7 +156,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
type: 2,
title: '修改',
content: './ownTeamModify.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -246,4 +246,4 @@ function query(){
groupType: teamType,
} //设定异步数据接口的额外参数
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/teamset/subTeamSetList.js b/czl-web/js/teamset/subTeamSetList.js
index 816360e..45992a6 100644
--- a/czl-web/js/teamset/subTeamSetList.js
+++ b/czl-web/js/teamset/subTeamSetList.js
@@ -16,7 +16,7 @@ $("#addBt").click(function(){
type: 2,
title: '新增',
content: 'subTeamOpen.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -87,7 +87,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
text +=' | ';
}
if ($.inArray('sysSubTeamSet:del', pers) >= 0) {
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -156,7 +156,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
type: 2,
title: '修改',
content: './subTeamModify.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -246,4 +246,4 @@ function query(){
groupType: teamType,
} //设定异步数据接口的额外参数
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/js/teamset/untiTeamSetList.js b/czl-web/js/teamset/untiTeamSetList.js
index 489e607..11dc946 100644
--- a/czl-web/js/teamset/untiTeamSetList.js
+++ b/czl-web/js/teamset/untiTeamSetList.js
@@ -16,7 +16,7 @@ $("#addBt").click(function(){
type: 2,
title: '新增',
content: 'untiTeamOpen.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -88,7 +88,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
}
console.log($.inArray('sysTeamSetByType:del', pers))
if ($.inArray('sysTeamSetByType:del', pers) >= 0) {
- text +='删除';
+ text +='删除';
}
return text;
}
@@ -154,7 +154,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () {
type: 2,
title: '修改',
content: './untiTeamModify.html',
- area: ['90%', '95%'],
+ area: ['97.5%', '97.5%'],
maxmin: false,
closeBtn: true,
btn: ['确定', '取消'],
@@ -242,4 +242,4 @@ function query(){
volLevel: volLevelIds,
} //设定异步数据接口的额外参数
});
-}
\ No newline at end of file
+}
diff --git a/czl-web/pages/corporateOrg/CorporateGovernance.html b/czl-web/pages/corporateOrg/CorporateGovernance.html
index d8c3a1c..3adfb3f 100644
--- a/czl-web/pages/corporateOrg/CorporateGovernance.html
+++ b/czl-web/pages/corporateOrg/CorporateGovernance.html
@@ -34,10 +34,29 @@
line-height: 20px;
text-align: right;
}
+
+ thead {
+ background-color: #FAFAFA !important;
+ }
-
@@ -65,18 +84,5 @@
\ No newline at end of file
+
+
diff --git a/czl-web/pages/corporateOrg/ProjectDepartment.html b/czl-web/pages/corporateOrg/ProjectDepartment.html
index 31decf8..63fc7b1 100644
--- a/czl-web/pages/corporateOrg/ProjectDepartment.html
+++ b/czl-web/pages/corporateOrg/ProjectDepartment.html
@@ -37,7 +37,25 @@
-