From 0f0ce60ef9967f12731ef6e24b23cb77c4ce75ce Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Wed, 21 Feb 2024 11:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/base/domain/TAmentPartyAffairs.java | 10 +++++++
.../com/cyx/web/base/domain/TAmentTrade.java | 10 +++++++
.../templates/base/affairs/affairs.html | 29 +++++++++++++------
.../resources/templates/base/affairs/day.html | 25 +++++++++++-----
.../base/affairs/finishedstatic.html | 4 +++
.../templates/base/affairs/partystyle.html | 29 +++++++++++++------
.../templates/base/affairs/warn.html | 27 ++++++++++++-----
.../templates/base/affairs/year.html | 29 +++++++++++++------
.../resources/templates/base/trade/trade.html | 10 +++++--
.../src/main/resources/templates/main.html | 24 ++++++++++-----
10 files changed, 145 insertions(+), 52 deletions(-)
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
index b2f8d79..b8595b4 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPartyAffairs.java
@@ -22,6 +22,16 @@ public class TAmentPartyAffairs extends BaseEntity
private Long id;
private String start;
+ private String year;
+
+ public String getYear() {
+ return year;
+ }
+
+ public void setYear(String year) {
+ this.year = year;
+ }
+
private String end;
public String getStart() {
diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
index 5d12627..1f83669 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
@@ -28,6 +28,16 @@ public class TAmentTrade extends BaseEntity
private String tradeType;
+ private String year;
+
+ public String getYear() {
+ return year;
+ }
+
+ public void setYear(String year) {
+ this.year = year;
+ }
+
public String getTradeType() {
return tradeType;
}
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index 4baccae..23acbf3 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -35,11 +35,12 @@
-
+
+
+
+
+
+
@@ -89,6 +90,16 @@
var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
+ var year = new Date().getFullYear();
+ $('#year').val(year)
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#year',
+ type: 'year',
+ // value: new Date()
+ });
+ })
if(window.parent.parent){
$("#shotName").val(window.parent.parent._shotName)
@@ -153,7 +164,7 @@
{
field: 'target',
title: '目标项',
- width:150,
+ width:120,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -171,7 +182,7 @@
{
field: 'demand',
title: '目标要求',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -180,7 +191,7 @@
{
field: 'detailed',
title: '工作任务',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -197,7 +208,7 @@
{
field: 'method',
title: '考核方式',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index 9c32a84..717e303 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -34,11 +34,12 @@
-
+
+
+
+
+
+
@@ -94,6 +95,16 @@
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
+ var year = new Date().getFullYear();
+ $('#year').val(year)
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#year',
+ type: 'year',
+ // value: new Date()
+ });
+ })
if(window.parent.parent){
$("#shotName").val(window.parent.parent._shotName)
}else {
@@ -170,7 +181,7 @@
{
field: 'target',
title: '考核内容',
- width:150,
+ width:120,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -188,7 +199,7 @@
{
field: 'demand',
title: '考核目标',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index 36257ef..b9e83bd 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -80,6 +80,10 @@
$("#type0831").val('')
}
+ var year = new Date().getFullYear();
+ var str = year+'-01-01'+' - '+year+'-12-31'
+ $('#laydate-demo-4').val(str)
+
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
index c7e71a8..018e4ce 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -35,11 +35,12 @@
-
+
+
+
+
+
+
@@ -89,6 +90,16 @@
var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
+ var year = new Date().getFullYear();
+ $('#year').val(year)
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#year',
+ type: 'year',
+ // value: new Date()
+ });
+ })
$(document).ready(function () {
$.ajax({
@@ -147,7 +158,7 @@
{
field: 'target',
title: '责任类别',
- width:150,
+ width:120,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -165,7 +176,7 @@
{
field: 'demand',
title: '目标要求',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -174,7 +185,7 @@
{
field: 'detailed',
title: '工作任务',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -191,7 +202,7 @@
{
field: 'method',
title: '考核方式',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/warn.html b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
index f37696b..e019070 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/warn.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/warn.html
@@ -12,11 +12,12 @@
-
-
+
+
+
+
+
+
-
@@ -72,6 +73,16 @@
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
+ var year = new Date().getFullYear();
+ $('#year').val(year)
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#year',
+ type: 'year',
+ // value: new Date()
+ });
+ })
$(document).ready(function () {
$.ajax({
type: "post",
@@ -139,7 +150,7 @@
{
field: 'demand',
title: '目标要求/考核目标',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -148,7 +159,7 @@
{
field: 'method',
title: '标准要求',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -157,7 +168,7 @@
{
field: 'detailed',
title: '工作任务',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index 85f1436..e185b74 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -34,11 +34,12 @@
-
-
+
+
+
+
+
+
-
@@ -93,6 +94,16 @@
var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
var prefix = ctx + "base/affairs";
+ var year = new Date().getFullYear();
+ $('#year').val(year)
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#year',
+ type: 'year',
+ // value: new Date()
+ });
+ })
$(document).ready(function () {
$.ajax({
@@ -164,7 +175,7 @@
{
field: 'target',
title: '考核内容',
- width:150,
+ width:120,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -182,7 +193,7 @@
{
field: 'demand',
title: '考核目标',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -191,7 +202,7 @@
{
field: 'method',
title: '标准要求',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
@@ -200,7 +211,7 @@
{
field: 'detailed',
title: '评分办法',
- width:180,
+ width:150,
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value);
diff --git a/cyx-admin/src/main/resources/templates/base/trade/trade.html b/cyx-admin/src/main/resources/templates/base/trade/trade.html
index 2f11a78..019b947 100644
--- a/cyx-admin/src/main/resources/templates/base/trade/trade.html
+++ b/cyx-admin/src/main/resources/templates/base/trade/trade.html
@@ -80,20 +80,26 @@
+