From 923a4bf299c8ab83a60f86a066c4b0675a0fad4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 19 十一月 2022 09:24:12 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 19 ++++-----
src/main/webapp/views/plan/plan.html | 58 -----------------------------
src/main/resources/application.yml | 10 ++--
3 files changed, 14 insertions(+), 73 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 212dcdc..8e07da0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,12 +9,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
- username: sa
- password: Zoneyung@zy56$
-# url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
# username: sa
-# password: sa@123
+# password: Zoneyung@zy56$
+ url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
+ username: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 74b8f6a..652771d 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -147,16 +147,15 @@
,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'}
,{field: 'uuid', align: 'center',title: '瑙勫垝鍗曚唬鍙�'}
,{field: 'appleTime$', align: 'center',title: '鐢宠鏃ユ湡'}
-
- ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
+ // ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
,{field: 'planner', align: 'center',title: '瑙勫垝鍛�'}
- ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
- ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'}
- ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'}
- ,{field: 'changeTime', align: 'center',title: '鏇存敼娆℃暟'}
- ,{field: 'changeReason', align: 'center',title: '鏇存敼鏂规鍘熷洜'}
- ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'}
- ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'}
+ // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
+ // ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'}
+ // ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'}
+ // ,{field: 'changeTime', align: 'center',title: '鏇存敼娆℃暟'}
+ // ,{field: 'changeReason', align: 'center',title: '鏇存敼鏂规鍘熷洜'}
+ // ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'}
+ // ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'}
// ,{field: 'files', align: 'center',title: '闄勪欢'}
// ,{field: 'settle$', align: 'center',title: '杩涘害'}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
@@ -164,7 +163,7 @@
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '娉ㄩ噴'}
+ ,{field: 'memo', align: 'center',title: '娉ㄩ噴', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index b5592db..586a83b 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -293,12 +293,6 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">闄勪欢: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="files" placeholder="璇疯緭鍏ラ檮浠�">
- </div>
- </div>
- <div class="layui-form-item">
<label class="layui-form-label">杩涘害: </label>
<div class="layui-input-block">
<select name="settle">
@@ -317,58 +311,6 @@
<label class="layui-form-label">瀹℃牳杩涘害: </label>
<div class="layui-input-block">
<input class="layui-input" name="settleMsg" placeholder="璇疯緭鍏ュ鏍歌繘搴�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璇勮: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="comment" placeholder="璇疯緭鍏ヨ瘎璁�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
- <div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" name="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" name="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1