From 21aa738d9044f2fb2dd817e0f30fb96b598ef9b1 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 09 三月 2022 13:36:26 +0800
Subject: [PATCH] # ycq
---
src/main/webapp/static/js/itemBusiness/itemBusiness.js | 34 +++-
src/main/webapp/static/js/itemManager/itemManager.js | 66 +++++++-
src/main/webapp/views/itemManager/itemManager.html | 91 +++++-------
src/main/java/zy/cloud/wms/manager/entity/Item.java | 97 +++++++++++++
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 11
src/main/webapp/views/itemBusiness/itemBusiness.html | 112 ++++++++-------
src/main/webapp/static/js/item/item.js | 2
7 files changed, 278 insertions(+), 135 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 854eceb..2d2c017 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -79,7 +79,7 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
-
+ item.setType("1");
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
@@ -108,13 +108,14 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
-
+ item.setType("1");
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
- if (item.getRealMonth() < 0){
- throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
- }
+// item.setRealMonth(1);
+// if (item.getRealMonth() < 0){
+// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+// }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.update(item,new EntityWrapper<Item>()
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 f766abb..9341b38 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -531,6 +531,32 @@
}
}
+ public String getInstallMk$(){
+ if (null == this.installMk){ return null; }
+ switch (this.installMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.installMk);
+ }
+ }
+
+ public String getDeliveryMk$(){
+ if (null == this.deliveryMk){ return null; }
+ switch (this.deliveryMk){
+ case 0:
+ return "鍚�";
+ case 1:
+ return "鏄�";
+
+ default:
+ return String.valueOf(this.deliveryMk);
+ }
+ }
+
public void setStatus(Integer status) {
this.status = status;
}
@@ -666,11 +692,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.predeDate);
}
+ public String getPredeDate0$(){
+ if (Cools.isEmpty(this.predeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").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 getPreinDate0$(){
+ if (Cools.isEmpty(this.preinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.preinDate);
}
public String getPlandeDate$(){
@@ -680,11 +720,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plandeDate);
}
+ public String getPlandeDate0$(){
+ if (Cools.isEmpty(this.plandeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").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 getRealdeDate0$(){
+ if (Cools.isEmpty(this.realdeDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realdeDate);
}
public String getPlaninDate$(){
@@ -694,11 +748,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planinDate);
}
+ public String getPlaninDate0$(){
+ if (Cools.isEmpty(this.planinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").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 getRealinDate0$(){
+ if (Cools.isEmpty(this.realinDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realinDate);
}
public String getPlanFADate$(){
@@ -708,11 +776,25 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planFADate);
}
+ public String getPlanFADate0$(){
+ if (Cools.isEmpty(this.planFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").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 getRealFADate0$(){
+ if (Cools.isEmpty(this.realFADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realFADate);
}
public String getPlanLADate$(){
@@ -722,6 +804,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.planLADate);
}
+ public String getPlanLADate0$(){
+ if (Cools.isEmpty(this.planLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.planLADate);
+ }
+
public String getRealLADate$(){
if (Cools.isEmpty(this.realLADate)){
return "";
@@ -729,4 +818,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.realLADate);
}
+ public String getRealLADate0$(){
+ if (Cools.isEmpty(this.realLADate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.realLADate);
+ }
+
+
}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index a1794b9..e40e58d 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -244,7 +244,7 @@
// 鏃堕棿閫夋嫨鍣�
function layDateRender(mData) {
- // console.log(mData)
+ console.log(mData)
setTimeout(function () {
layDate.render({
elem: '#startTime',
diff --git a/src/main/webapp/static/js/itemBusiness/itemBusiness.js b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
index a1794b9..41aa8c3 100644
--- a/src/main/webapp/static/js/itemBusiness/itemBusiness.js
+++ b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
@@ -28,21 +28,23 @@
,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ // ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
-
+ ,{field: 'orderDesc', 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: 'salesman', align: 'center',title: '涓氬姟鍛�'}
+ ,{field: 'presaleAmt', align: 'center',title: '鍞墠鏍镐环閲戦'}
+ ,{field: 'predeDate0$', align: 'center', title: '閿�鍞浜よ揣鏈�'}
+ ,{field: 'preinDate0$', align: 'center', title: '閿�鍞瀹夎鏈�'}
+
+ ,{field: 'weight', align: 'center', title: '浜у搧閲嶉噺'}
,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
- ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
- ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'installMk$', align: 'center', title: '鏄惁瀹夎'}
+ ,{field: 'deliveryMk$', align: 'center', title: '鏄惁杩愯緭'}
+ ,{field: 'custMan', align: 'center',title: '瀹㈡埛鑱旂郴浜�'}
+ ,{field: 'custMobile', align: 'center',title: '瀹㈡埛鑱旂郴鏂瑰紡'}
+ ,{field: 'custAdress', align: 'center',title: '瀹㈡埛鍦板潃'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
@@ -276,6 +278,16 @@
type: 'datetime',
value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
});
+ layDate.render({
+ elem: '#predeDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['predeDate$']):null
+ });
+ layDate.render({
+ elem: '#preinDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['preinDate$']):null
+ });
}, 500);
}
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index a1794b9..eecf503 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -28,21 +28,23 @@
,{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: 'progressRate', align: 'center',title: '杩涘害'}
+ ,{field: 'planCarInfo', 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: 'plandeDate0$', align: 'center',title: '棰勮鍙戣揣鏃ユ湡'}
+ ,{field: 'realdeDate0$', align: 'center',title: '瀹為檯鍙戣揣鏃ユ湡'}
+ ,{field: 'planinDate0$', align: 'center', title: '棰勮瀹夎鏃ユ湡'}
+ ,{field: 'realinDate0$', align: 'center', title: '瀹為檯瀹夎鏃ユ湡'}
+ ,{field: 'plandeAmt', align: 'center', title: '棰勮杩愯垂'}
+ ,{field: 'realdeAmt', align: 'center', title: '瀹為檯杩愯垂'}
+ ,{field: 'planinAmt', align: 'center', title: '棰勮瀹夎璐�'}
+ ,{field: 'realinAmt', align: 'center', title: '瀹為檯瀹夎璐�'}
+ ,{field: 'planFADate0$', align: 'center', title: '棰勮鍒濋獙鏃堕棿'}
+ ,{field: 'realFADate0$', align: 'center',title: '瀹為檯鍒濋獙鏃堕棿'}
+ ,{field: 'planLADate0$', align: 'center', title: '棰勮缁堥獙鏃堕棿'}
+ ,{field: 'realLADate0$', align: 'center',title: '瀹為檯缁堥獙鏃堕棿'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
@@ -276,6 +278,46 @@
type: 'datetime',
value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
});
+ layDate.render({
+ elem: '#planinDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planinDate$']):null
+ });
+ layDate.render({
+ elem: '#plandeDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['plandeDate$']):null
+ });
+ layDate.render({
+ elem: '#planFADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planFADate$']):null
+ });
+ layDate.render({
+ elem: '#planLADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planLADate$']):null
+ });
+ layDate.render({
+ elem: '#realdeDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realdeDate$']):null
+ });
+ layDate.render({
+ elem: '#realinDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realinDate$']):null
+ });
+ layDate.render({
+ elem: '#realFADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realFADate$']):null
+ });
+ layDate.render({
+ elem: '#realLADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realLADate$']):null
+ });
}, 500);
}
diff --git a/src/main/webapp/views/itemBusiness/itemBusiness.html b/src/main/webapp/views/itemBusiness/itemBusiness.html
index 5a6f1f1..4a9800e 100644
--- a/src/main/webapp/views/itemBusiness/itemBusiness.html
+++ b/src/main/webapp/views/itemBusiness/itemBusiness.html
@@ -33,7 +33,7 @@
</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-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>
@@ -63,51 +63,27 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍐呴儴缂栧彿: </label>
+ <label class="layui-form-label layui-form-required">璁㈠崟绫诲瀷鎻忚堪: </label>
<div class="layui-input-block">
- <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�">
+ <input class="layui-input" name="orderDesc" placeholder="璇锋弿杩拌鍗曠被鍨�" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+ <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>
+ <input id="cstmrUuid" class="layui-input" name="salesman" placeholder="璇疯緭鍏ヤ笟鍔″憳" 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>
+ <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="璇疯緭鍏ヨ矗浠讳汉">
+ <input class="layui-input" name="predeDate" id="predeDate" placeholder="璇疯緭鍏ラ攢鍞浜よ揣鏈�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -119,6 +95,35 @@
oninput="if(value>200)value=200;if(value<=0)value=1">
</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="weight" placeholder="璇疯緭鍏ヤ骇鍝侀噸閲�" 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 type="radio" name="deliveryMk" value=1 title="鏄�">
+ <input type="radio" name="deliveryMk" value=0 title="鍚�">
+ </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="custMobile" id="dutyMan$" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" 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="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">
@@ -156,29 +161,30 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <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 class="layui-input" name="presaleAmt" placeholder="璇疯緭鍏ュ敭鍓嶆牳浠烽噾棰�" 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>
+<!-- <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>
+ <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">
+ <input class="layui-input" name="preinDate" id="preinDate" placeholder="璇疯緭鍏ラ瀹夎鏃ユ湡" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label layui-form-required">鏄惁瀹夎: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ <input type="radio" name="installMk" value=1 title="鏄�">
+ <input type="radio" name="installMk" value=0 title="鍚�">
</div>
</div>
@@ -189,18 +195,18 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
+ <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">
+ <input class="layui-input" name="custMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <label class="layui-form-label layui-form-required">瀹㈡埛鍦板潃: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ <input class="layui-input" name="custAdress" id="dutyDepartment$" placeholder="璇疯緭鍏ュ湴鍧�" lay-verify="required">
</div>
</div>
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index be3ea8c..696658b 100644
--- a/src/main/webapp/views/itemManager/itemManager.html
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -33,7 +33,7 @@
</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-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>
@@ -69,54 +69,46 @@
</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>
+ <label class="layui-form-label">棰勮鍙戣揣鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planinDate" id="planinDate" placeholder="璇疯緭鍏ラ璁″彂璐ф棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <label class="layui-form-label">棰勮瀹夎鏃ユ湡: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="plandeDate" id="plandeDate" placeholder="璇疯緭鍏ラ璁″畨瑁呮棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
+ <label class="layui-form-label">棰勮杩愯垂: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realStartTime" id="realStartTime" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
+ <input class="layui-input" name="plandeAmt" placeholder="璇疯緭鍏ラ璁¤繍璐�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
+ <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>
+ <input class="layui-input" name="planinAmt" placeholder="璇疯緭鍏ラ璁″畨瑁呰垂">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换浜�: </label>
+ <label class="layui-form-label">棰勮鍒濋獙鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+ <input class="layui-input" name="planFADate" id="planFADate" placeholder="璇疯緭鍏ラ璁″垵楠屾椂闂�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(鏈�): </label>
+ <label class="layui-form-label">棰勮缁堥獙鏃堕棿: </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">
+ <input class="layui-input" name="planLADate" id="planLADate" placeholder="璇疯緭鍏ラ璁＄粓楠屾椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰勮杞﹁締淇℃伅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planCarInfo" placeholder="璇疯緭鍏ラ璁¤溅杈嗕俊鎭�">
</div>
</div>
</div>
@@ -136,15 +128,9 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰杩涘害: </label>
+ <label class="layui-form-label">杩涘害: </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>
+ <input id="projectStatus" class="layui-input" name="progressRate" placeholder="璇疯緭鍏ヨ繘搴�" lay-vertype="tips">
</div>
</div>
@@ -156,29 +142,22 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <label class="layui-form-label">瀹為檯鍙戣揣鏃ユ湡: </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>
+ <input class="layui-input" name="realdeDate" id="realdeDate" placeholder="璇疯緭鍏ュ疄闄呭彂璐ф棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label">瀹為檯瀹夎鏃ユ湡: </label>
<div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="realinDate" id="realinDate" placeholder="璇疯緭鍏ュ疄闄呭畨瑁呮棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label">瀹為檯杩愯垂: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ <input class="layui-input" name="realdeAmt" placeholder="璇疯緭鍏ュ疄闄呰繍璐�">
</div>
</div>
@@ -189,18 +168,24 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
+ <label class="layui-form-label">瀹為檯瀹夎璐�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="originArea" placeholder="璇疯緭鍏ョ敓浜у湴" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="realinAmt" placeholder="璇疯緭鍏ュ疄闄呭畨瑁呰垂" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <label class="layui-form-label">瀹為檯鍒濋獙鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ <input class="layui-input" name="realFADate" id="realFADate" placeholder="璇疯緭鍏ュ疄闄呭垵楠屾椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁堥獙鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realLADate" id="realLADate" placeholder="璇疯緭鍏ュ疄闄呯粓楠屾椂闂�">
</div>
</div>
--
Gitblit v1.9.1