From 0efa0c7736c1554ea54de545e91a4577b64603df Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 01 三月 2022 08:29:24 +0800
Subject: [PATCH] .
---
src/main/webapp/static/js/config.js | 4
src/main/resources/mapper/ItemMapper.xml | 34 +
src/main/webapp/static/js/itemBusiness/itemBusiness.js | 301 ++++++++++++
src/main/webapp/static/js/itemManager/itemManager.js | 301 ++++++++++++
src/main/webapp/views/itemManager/itemManager.html | 242 ++++++++++
src/main/java/zy/cloud/wms/manager/entity/Item.java | 257 ++++++++++
src/main/webapp/views/projectPlan/projectPlan.html | 2
src/main/webapp/static/js/hostTable.js | 6
src/main/webapp/views/itemBusiness/itemBusiness.html | 242 ++++++++++
src/main/resources/application.yml | 9
10 files changed, 1,384 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 6dd0f21..f766abb 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -175,9 +175,192 @@
@TableField("project_status")
private Integer projectStatus;
+ /**
+ * 璁㈠崟绫诲瀷
+ */
+ @ApiModelProperty(value= "璁㈠崟绫诲瀷")
+ @TableField("orderDesc")
+ private String orderDesc;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value= "涓氬姟鍛�")
+ @TableField("salesman")
+ private String salesman;
+
+ /**
+ * 鍞墠鏍镐环閲戦
+ */
+ @ApiModelProperty(value= "鍞墠鏍镐环閲戦")
+ @TableField("presaleAmt")
+ private Double presaleAmt;
+
+ /**
+ * 閿�鍞浜よ揣鏈�
+ */
+ @ApiModelProperty(value= "閿�鍞浜よ揣鏈�")
+ @TableField("predeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date predeDate;
+
+ /**
+ * 閿�鍞瀹夎鏈�
+ */
+ @ApiModelProperty(value= "閿�鍞瀹夎鏈�")
+ @TableField("preinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date preinDate;
+
+ /**
+ * 浜у搧閲嶉噺
+ */
+ @ApiModelProperty(value= "浜у搧閲嶉噺")
+ @TableField("weight")
+ private Double weight;
+
+ /**
+ * 鏄惁瀹夎
+ */
+ @ApiModelProperty(value= "瀹夎")
+ @TableField("installMk")
+ private Integer installMk;
+
+ /**
+ * 鏄惁杩愯緭
+ */
+ @ApiModelProperty(value= "杩愯緭")
+ @TableField("deliveryMk")
+ private Integer deliveryMk;
+
+ /**
+ * 瀹㈡埛鑱旂郴浜�
+ */
+ @ApiModelProperty(value= "瀹㈡埛鑱旂郴浜�")
+ @TableField("custMan")
+ private String custMan;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @TableField("custMobile")
+ private String custMobile;
+
+ /**
+ * 鑱旂郴鍦板潃
+ */
+ @ApiModelProperty(value= "鑱旂郴鍦板潃")
+ @TableField("custAdress")
+ private String custAdress;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ @TableField("progressRate")
+ private String progressRate;
+
+ /**
+ * 杞﹁締淇℃伅
+ */
+ @ApiModelProperty(value= "杞﹁締淇℃伅")
+ @TableField("planCarInfo")
+ private String planCarInfo;
+
+ /**
+ * 棰勮鍙戣揣鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮鍙戣揣鏃ユ湡")
+ @TableField("plandeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date plandeDate;
+
+ /**
+ * 瀹為檯鍙戣揣鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯鍙戣揣鏃ユ湡")
+ @TableField("realdeDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realdeDate;
+
+ /**
+ * 棰勮瀹夎鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮瀹夎鏃ユ湡")
+ @TableField("planinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planinDate;
+
+ /**
+ * 瀹為檯瀹夎鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯瀹夎鏃ユ湡")
+ @TableField("realinDate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realinDate;
+
+ /**
+ * 棰勮杩愯垂
+ */
+ @ApiModelProperty(value= "棰勮杩愯垂")
+ @TableField("plandeAmt")
+ private Double plandeAmt;
+
+ /**
+ * 瀹為檯杩愯垂
+ */
+ @ApiModelProperty(value= "瀹為檯杩愯垂")
+ @TableField("realdeAmt")
+ private Double realdeAmt;
+
+ /**
+ * 棰勮瀹夎璐�
+ */
+ @ApiModelProperty(value= "棰勮瀹夎璐�")
+ @TableField("planinAmt")
+ private Double planinAmt;
+
+ /**
+ * 瀹為檯瀹夎璐�
+ */
+ @ApiModelProperty(value= "瀹為檯瀹夎璐�")
+ @TableField("realinAmt")
+ private Double realinAmt;
+
+ /**
+ * 棰勮鍒濋獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮鍒濋獙鏃ユ湡")
+ @TableField("planFADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planFADate;
+
+ /**
+ * 瀹為檯鍒濋獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯鍒濋獙鏃ユ湡")
+ @TableField("realFADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realFADate;
+
+ /**
+ * 棰勮缁堥獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "棰勮缁堥獙鏃ユ湡")
+ @TableField("planLADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date planLADate;
+
+ /**
+ * 瀹為檯缁堥獙鏃ユ湡
+ */
+ @ApiModelProperty(value= "瀹為檯缁堥獙鏃ユ湡")
+ @TableField("realLADate")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date realLADate;
+
public Item() {}
-
-
// Item item = new Item(
// null, // 椤圭洰缂栧彿[闈炵┖]
@@ -476,6 +659,74 @@
this.memo = memo;
}
+ public String getPredeDate$(){
+ if (Cools.isEmpty(this.predeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.predeDate);
+ }
+ public String getPreinDate$(){
+ if (Cools.isEmpty(this.preinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.preinDate);
+ }
-}
+ public String getPlandeDate$(){
+ if (Cools.isEmpty(this.plandeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plandeDate);
+ }
+
+ public String getRealdeDate$(){
+ if (Cools.isEmpty(this.realdeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realdeDate);
+ }
+
+ public String getPlaninDate$(){
+ if (Cools.isEmpty(this.planinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planinDate);
+ }
+
+ public String getRealinDate$(){
+ if (Cools.isEmpty(this.realinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realinDate);
+ }
+
+ public String getPlanFADate$(){
+ if (Cools.isEmpty(this.planFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planFADate);
+ }
+
+ public String getRealFADate$(){
+ if (Cools.isEmpty(this.realFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realFADate);
+ }
+
+ public String getPlanLADate$(){
+ if (Cools.isEmpty(this.planLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planLADate);
+ }
+
+ public String getRealLADate$(){
+ if (Cools.isEmpty(this.realLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realLADate);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 87a0ae0..c89fea0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,11 +14,12 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
- username: sa
- password: Zoneyung@zy56$
+# url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
# username: sa
-# password: sa@123
+# password: Zoneyung@zy56$
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=zypms
+ username: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/ItemMapper.xml b/src/main/resources/mapper/ItemMapper.xml
index a5ba666..9a1ed85 100644
--- a/src/main/resources/mapper/ItemMapper.xml
+++ b/src/main/resources/mapper/ItemMapper.xml
@@ -21,7 +21,39 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
+ <result column="type" property="type" />
+ <result column="real_start_time" property="realStartTime" />
+ <result column="real_end_time" property="realEndTime" />
+ <result column="real_month" property="realMonth" />
+ <result column="duty_department" property="dutyDepartment" />
+ <result column="duty_man" property="dutyMan" />
+ <result column="origin_area" property="originArea" />
+ <result column="project_status" property="projectStatus" />
+ <result column="orderDesc" property="orderDesc" />
+ <result column="salesman" property="salesman" />
+ <result column="presaleAmt" property="presaleAmt" />
+ <result column="predeDate" property="predeDate" />
+ <result column="preinDate" property="preinDate" />
+ <result column="weight" property="weight" />
+ <result column="installMk" property="installMk" />
+ <result column="deliveryMk" property="deliveryMk" />
+ <result column="custMan" property="custMan" />
+ <result column="custMobile" property="custMobile" />
+ <result column="custAdress" property="custAdress" />
+ <result column="progressRate" property="progressRate" />
+ <result column="planCarInfo" property="planCarInfo" />
+ <result column="plandeDate" property="plandeDate" />
+ <result column="realdeDate" property="realdeDate" />
+ <result column="planinDate" property="planinDate" />
+ <result column="realinDate" property="realinDate" />
+ <result column="plandeAmt" property="plandeAmt" />
+ <result column="realdeAmt" property="realdeAmt" />
+ <result column="planinAmt" property="planinAmt" />
+ <result column="realinAmt" property="realinAmt" />
+ <result column="planFADate" property="planFADate" />
+ <result column="realFADate" property="realFADate" />
+ <result column="planLADate" property="planLADate" />
+ <result column="realLADate" property="realLADate" />
</resultMap>
diff --git a/src/main/webapp/static/js/config.js b/src/main/webapp/static/js/config.js
index a017698..4e7e84b 100644
--- a/src/main/webapp/static/js/config.js
+++ b/src/main/webapp/static/js/config.js
@@ -1,2 +1,2 @@
-// var baseurl = 'http://127.0.0.1:8080';
-var baseurl = 'http://47.97.1.152:58080';
\ No newline at end of file
+var baseurl = 'http://127.0.0.1:8080';
+// var baseurl = 'http://47.97.1.152:58080';
\ No newline at end of file
diff --git a/src/main/webapp/static/js/hostTable.js b/src/main/webapp/static/js/hostTable.js
index 8c5c063..e1f440c 100644
--- a/src/main/webapp/static/js/hostTable.js
+++ b/src/main/webapp/static/js/hostTable.js
@@ -12,7 +12,7 @@
var insTb = table.render({
elem: '#originTable',
- url: baseUrl + '/item/list/auth',
+ url: baseUrl + '/host/list/auth',
height: 'full-100',
headers: {token: localStorage.getItem('token')},
request: {
@@ -54,7 +54,7 @@
/* 琛ㄦ牸鎼滅储 */
form.on('submit(originTbReset)', function (data) {
insTb.reload();
- insTb2.reload({where: {item_id: null}, page: {curr: 1}});
+ insTb2.reload({where: {host_id: null}, page: {curr: 1}});
return false;
});
@@ -80,7 +80,7 @@
table.on('row(originTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
- insTb2.reload({where: {item_id: obj.data.id}, page: {curr: 1}});
+ insTb2.reload({where: {host_id: obj.data.id}, page: {curr: 1}});
});
/* 鏄剧ず琛ㄥ崟寮圭獥 */
diff --git a/src/main/webapp/static/js/itemBusiness/itemBusiness.js b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
new file mode 100644
index 0000000..a1794b9
--- /dev/null
+++ b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
@@ -0,0 +1,301 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+
+ elem: '#item',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/item/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'hostId', align: 'center',title: ''}
+ ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true}
+ // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
+
+ // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
+ // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
+ ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
+ ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
+ ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
+ ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
+ ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+ ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
+ ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
+ ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ // console.log(res)
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(item)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(item)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.id;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'item': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/item/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(item)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.id];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '椤圭洰淇℃伅',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佺鐢ㄩ�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(mData) {
+ // console.log(mData)
+ setTimeout(function () {
+ layDate.render({
+ elem: '#startTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['startTime$']):null
+ });
+ layDate.render({
+ elem: '#realStartTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realStartTime$']):null
+ });
+ layDate.render({
+ elem: '#endTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['endTime$']):null
+ });
+ layDate.render({
+ elem: '#realEndTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realEndTime$']):null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['createTime$']):null
+ });
+ layDate.render({
+ elem: '#modifyTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
+ });
+ }, 500);
+
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
new file mode 100644
index 0000000..a1794b9
--- /dev/null
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -0,0 +1,301 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+
+ elem: '#item',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/item/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'hostId', align: 'center',title: ''}
+ ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true}
+ // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
+
+ // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
+ // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
+ ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
+ ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
+ ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
+ ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
+ ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+ ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
+ ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
+ ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ // console.log(res)
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(item)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(item)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.id;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'item': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/item/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(item)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.id];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '椤圭洰淇℃伅',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佺鐢ㄩ�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(mData) {
+ // console.log(mData)
+ setTimeout(function () {
+ layDate.render({
+ elem: '#startTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['startTime$']):null
+ });
+ layDate.render({
+ elem: '#realStartTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realStartTime$']):null
+ });
+ layDate.render({
+ elem: '#endTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['endTime$']):null
+ });
+ layDate.render({
+ elem: '#realEndTime',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realEndTime$']):null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['createTime$']):null
+ });
+ layDate.render({
+ elem: '#modifyTime\\$',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
+ });
+ }, 500);
+
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/itemBusiness/itemBusiness.html b/src/main/webapp/views/itemBusiness/itemBusiness.html
new file mode 100644
index 0000000..5a6f1f1
--- /dev/null
+++ b/src/main/webapp/views/itemBusiness/itemBusiness.html
@@ -0,0 +1,242 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="item" lay-filter="item"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">绂佺敤</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">绂佺敤</a>-->
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/itemBusiness/itemBusiness.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍐呴儴缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="cstmrUuid" class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="cstmrUuid$" name="cstmrUuid$" 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="cstmrUuidBycstmrUuid" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrUuidBycstmrUuidSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realStartTime" id="realStartTime" 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="2">绂佺敤</option>
+ <option value="3">瀹岀粨</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换浜�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(鏈�): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number" lay-verify="required"
+ onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ oninput="if(value>200)value=200;if(value<=0)value=1">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="name" placeholder="璇疯緭鍏ラ」鐩悕绉�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰杩涘害: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="projectStatus" class="layui-input" name="projectStatus" placeholder="璇疯緭鍏ラ」鐩繘搴�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="projectStatus$" name="projectStatus$" 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="projectStatusByprojectStatus" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="projectStatusByprojectStatusSelect" 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="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <!-- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>-->
+ <input id="type$" name="type$" 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="typeBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="typeBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="originArea" placeholder="璇疯緭鍏ョ敓浜у湴" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" 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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">-->
+<!-- <input id="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">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
new file mode 100644
index 0000000..be3ea8c
--- /dev/null
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -0,0 +1,242 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="item" lay-filter="item"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">绂佺敤</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">绂佺敤</a>-->
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/itemManager/itemManager.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍐呴儴缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="cstmrUuid" class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="cstmrUuid$" name="cstmrUuid$" 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="cstmrUuidBycstmrUuid" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrUuidBycstmrUuidSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realStartTime" id="realStartTime" 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="2">绂佺敤</option>
+ <option value="3">瀹岀粨</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换浜�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(鏈�): </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number" lay-verify="required"
+ onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ oninput="if(value>200)value=200;if(value<=0)value=1">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="name" placeholder="璇疯緭鍏ラ」鐩悕绉�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰杩涘害: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="projectStatus" class="layui-input" name="projectStatus" placeholder="璇疯緭鍏ラ」鐩繘搴�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="projectStatus$" name="projectStatus$" 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="projectStatusByprojectStatus" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="projectStatusByprojectStatusSelect" 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="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <!-- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>-->
+ <input id="type$" name="type$" 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="typeBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="typeBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="originArea" placeholder="璇疯緭鍏ョ敓浜у湴" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" 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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">-->
+<!-- <input id="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">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 8fe0831..ef5aeea 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -130,7 +130,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/hostTable.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/itemTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/projectPlan/projectPlan.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js" charset="utf-8"></script>
</body>
--
Gitblit v1.9.1