From 40c5dcaad03d981dd18d4f3e0c3c577e2ae6e7d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 16:18:08 +0800
Subject: [PATCH] #客户信息搜索相关
---
src/main/webapp/views/locDetl/locDetl.html | 14 ++
src/main/webapp/views/wrkDetl/wrkDetl.html | 14 ++
src/main/resources/mapper/LocDetlMapper.xml | 3
src/main/webapp/views/pakStore/locDetlQuery.html | 42 ++++++
src/main/java/com/zy/asrs/controller/LocOwnerController.java | 14 ++
src/main/webapp/static/js/locDetl/locDetl.js | 27 ++++
src/main/webapp/views/waitPakinLog/waitPakinLog.html | 14 ++
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 14 ++
src/main/webapp/static/js/waitPakin/waitPakin.js | 26 ++++
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 41 ++++++
src/main/webapp/views/waitPakin/waitPakin.html | 14 ++
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 25 ++++
src/main/webapp/static/js/common.js | 3
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 25 ++++
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 25 ++++
15 files changed, 288 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
index 4cbadd7..2d5c6d3 100644
--- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java
+++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
@@ -122,4 +122,18 @@
return R.ok();
}
+ @RequestMapping("/owner/auto/site")
+ @ManagerAuth()
+ public R availableTakeSite(){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<>());
+ for (LocOwner owner : locOwners) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", owner.getId());
+ map.put("desc", owner.getOwner());
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b9b7147..904dd6f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -112,6 +112,9 @@
<if test="batch!=null and batch!='' ">
and a.batch like '%' + #{batch} + '%'
</if>
+ <if test="owner!=null and owner!='' ">
+ and a.owner = #{owner}
+ </if>
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4bc6ce0..8a81efd 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -236,6 +236,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'owner', align: 'center',title: '瀹㈡埛淇℃伅ID', hide: true}
+ ,{field: 'owner$', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -246,7 +247,7 @@
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
+ ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅old', hide: false}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 0b1e265..42f0e3b 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -21,7 +21,8 @@
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
- ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
+ ,{field: 'owner$', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
+ ,{field: 'manu', align: 'center',title: '瀹㈡埛淇℃伅old', hide: false}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
@@ -98,6 +99,7 @@
res.data[_index][data.value] = 'N';
}
});
+ getOutBound();
}
});
@@ -493,6 +495,29 @@
type: 'datetime'
});
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
});
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 03714fd..3c88541 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -14,7 +14,6 @@
html += ">";
return html;
}}
- ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
@@ -72,6 +71,7 @@
res.data[_index][data.value] = 'N';
}
});
+ getOutBound();
}
});
@@ -422,6 +422,30 @@
,range: true
});
+
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index ed21c26..c6411a6 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -15,7 +15,6 @@
html += ">";
return html;
}}
- ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
return cols;
@@ -68,6 +67,7 @@
res.data[_index][data.value] = 'N';
}
});
+ getOutBound();
}
});
@@ -392,6 +392,29 @@
,range: true
});
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index f865d3d..5eb436b 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -6,7 +6,6 @@
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
}
@@ -59,6 +58,7 @@
res.data[_index][data.value] = 'N';
}
});
+ getOutBound();
}
});
@@ -402,6 +402,29 @@
,type: 'datetime'
,range: true
});
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
});
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index 009ee55..6538525 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -6,7 +6,6 @@
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
)
return cols;
@@ -60,6 +59,7 @@
res.data[_index][data.value] = 'N';
}
});
+ getOutBound();
}
});
@@ -394,6 +394,29 @@
,range: true
});
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index bc4604c..3fb7fc0 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -36,6 +36,13 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
@@ -68,10 +75,15 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
</html>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 67f8f58..6c48792 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -71,6 +71,13 @@
<input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
@@ -100,7 +107,11 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
<script>
@@ -125,6 +136,7 @@
var form = layui.form;
var admin = layui.admin;
var tableMerge = layui.tableMerge;
+ var sign=1;
// 鏁版嵁娓叉煋
locDetlTableIns = table.render({
@@ -157,6 +169,10 @@
tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
+ }
+ if(sign === 1){
+ getOutBound();
+ sign++;
}
}
});
@@ -206,6 +222,29 @@
,type: 'datetime'
,range: true
});
+
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
})
function tableReload() {
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index c39f5df..2cb6f1a 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -86,6 +86,13 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
@@ -114,7 +121,11 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
<script>
@@ -138,6 +149,7 @@
var layDate = layui.laydate;
var form = layui.form;
var admin = layui.admin;
+ var sign=1;
// 鏁版嵁娓叉煋
locDetlTableIns = table.render({
@@ -170,6 +182,11 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
+ if(sign === 1){
+ getOutBound();
+ sign++;
+ }
+
}
});
@@ -198,6 +215,29 @@
,type: 'datetime'
,range: true
});
+
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/owner/auto/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#ownerSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
})
function tableReload() {
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 8b052f7..f08d8b3 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -30,6 +30,13 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </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>
@@ -59,10 +66,15 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/waitPakin/waitPakin.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
</html>
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index d9ab69c..fe07143 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -30,6 +30,13 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </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>
@@ -54,10 +61,15 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
</html>
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl.html b/src/main/webapp/views/wrkDetl/wrkDetl.html
index 75eda7a..44daf4d 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl.html
@@ -35,6 +35,13 @@
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -60,10 +67,15 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/wrkDetl/wrkDetl.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
</html>
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 3488808..3abd0e0 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -29,6 +29,13 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner">
+ <option value="">璇烽�夋嫨瀹㈡埛淇℃伅</option>
+ </select>
+ </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>
@@ -55,10 +62,15 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/wrkDetlLog/wrkDetlLog.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1