From d426a65ba84bd4ef3298cb7cda0e9664cc6038e7 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 13 一月 2022 14:23:30 +0800
Subject: [PATCH] #单据类型区分入库单和出库单
---
src/main/webapp/views/item/item.html | 17 ++++----
src/main/webapp/views/projectPlan/projectPlan.html | 41 ++++++++++++--------
src/main/webapp/static/js/item/item.js | 6 ++-
3 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index ff4a8aa..fbd8688 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -32,7 +32,9 @@
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
- ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
+ ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�',
+ templet : "<div>{{layui.util.toDateString(d.startTime$, 'yyyy-MM-dd')}}</div>"
+ }
,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
,{field: 'realStartTime', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
,{field: 'realEndTime', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
@@ -165,7 +167,7 @@
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '椤圭洰淇℃伅',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender();
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 58f5efb..2608c9f 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -88,7 +88,7 @@
<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$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <input id="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">
@@ -100,7 +100,7 @@
<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$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <input id="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">
@@ -118,31 +118,31 @@
<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">
+ <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 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="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="realStartTime" id="realStartTime$" placeholder="鍙┖濉�,绛夊緟鐪熷疄椤圭洰鍚姩鍐嶅～">
+ <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">
- <input class="layui-input" name="realEndTime" id="realEndTime$" placeholder="鍙┖濉�,绛夊緟鐪熷疄椤圭洰缁撴潫鍐嶅～">
+ <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 cool-auto-complete">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <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$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
@@ -170,12 +170,13 @@
<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>
+ <label class="layui-form-label">瀹炴柦鍛ㄦ湡(鏈�): </label>
<div class="layui-input-block">
<input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number">
</div>
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 49cbea1..8b30231 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -65,30 +65,37 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label layui-form-required">椤圭洰ID: </label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩甀D" 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="flowId" class="layui-input" name="flowId" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
- <input id="flowId$" 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="flowIdByflowId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="flowIdByflowIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" id="itemId$" name="itemId$" readonly="readonly">
</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" id="flowId$" name="flowId$" readonly="readonly">
+ </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="flowId" class="layui-input" name="flowId" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">-->
+<!-- <input id="flowId$" 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="flowIdByflowId" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="flowIdByflowIdSelect" 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="weightNum" placeholder="璇疯緭鍏ユ潈閲岻D" lay-vertype="tips"
+ <input class="layui-input" name="weightNum" readonly="readonly" placeholder="璇疯緭鍏ユ潈閲岻D" lay-vertype="tips"
lay-verify="required">
</div>
</div>
--
Gitblit v1.9.1