From 412369afd312125a5f8744b31f5752710f0658de Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 14:16:59 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basWhs/basWhs.js | 4 ++--
src/main/webapp/views/locMast/locMast.html | 29 ++++++++++++++---------------
src/main/webapp/static/js/rowLastno/rowLastno.js | 4 ++--
src/main/webapp/views/basWhs/basWhs_detail.html | 6 +++---
src/main/webapp/static/js/locMast/locMast.js | 2 +-
src/main/webapp/static/js/wrkLastno/wrkLastno.js | 4 ++--
6 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/static/js/basWhs/basWhs.js b/src/main/webapp/static/js/basWhs/basWhs.js
index 5e6054e..41d8802 100644
--- a/src/main/webapp/static/js/basWhs/basWhs.js
+++ b/src/main/webapp/static/js/basWhs/basWhs.js
@@ -91,7 +91,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basWhs_detail.html',
success: function(layero, index){
@@ -207,7 +207,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basWhs_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 0e33edd..ab74e81 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -53,7 +53,7 @@
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index e54f0c9..143e9bb 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -21,15 +21,15 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'whsType', align: 'center',title: '绫诲埆', width:80}
,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
- ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿'}
,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
+ ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold'}
,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
// ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
// ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/wrkLastno/wrkLastno.js b/src/main/webapp/static/js/wrkLastno/wrkLastno.js
index 223b1cc..34e8c01 100644
--- a/src/main/webapp/static/js/wrkLastno/wrkLastno.js
+++ b/src/main/webapp/static/js/wrkLastno/wrkLastno.js
@@ -19,12 +19,12 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'wrkMk', align: 'center',title: '绫诲瀷'}
- ,{field: 'wrkNo', align: 'center',title: '褰撳墠ID'}
,{field: 'sno', align: 'center',title: '璧峰ID'}
+ ,{field: 'wrkNo', align: 'center',title: '褰撳墠ID', style: 'color: #AA3130;font-weight: bold'}
,{field: 'eno', align: 'center',title: '缁堟ID'}
,{field: 'memoM', align: 'center',title: '澶囨敞'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:200}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width:120}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
request: {
diff --git a/src/main/webapp/views/basWhs/basWhs_detail.html b/src/main/webapp/views/basWhs/basWhs_detail.html
index 3703024..6c6918b 100644
--- a/src/main/webapp/views/basWhs/basWhs_detail.html
+++ b/src/main/webapp/views/basWhs/basWhs_detail.html
@@ -14,7 +14,7 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
+ <form id="detail" class="layui-form" style="text-align: center">
<!--
<div class="layui-inline" style="display: none">
<label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
@@ -23,13 +23,13 @@
</div>
</div>
-->
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
<div class="layui-input-inline">
<input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhs')">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
<div class="layui-input-inline">
<input id="whsDesc" class="layui-input" type="text">
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index a468020..3b5c724 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -30,18 +30,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">搴撲綅鐘舵�侊細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="locType" class="layui-input" name="loc_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
@@ -53,9 +41,20 @@
</div>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="whsType" class="layui-input" name="whs_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="whsType$" 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="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <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>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
@@ -76,7 +75,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
<a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
</script>
--
Gitblit v1.9.1