From e502db24d66f5f92bc5a0aca29f03b2fd1cb3d09 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 13:56:47 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basCrnp/basCrnp.js | 15 +++++++--------
src/main/webapp/views/basCrnp/basCrnp.html | 2 +-
src/main/webapp/static/js/basCrnError/basCrnError.js | 4 ++--
src/main/webapp/views/basCrnError/basCrnError.html | 2 +-
src/main/webapp/views/basCrnStatus/basCrnStatus.html | 2 +-
src/main/webapp/views/basCrnp/basCrnp_detail.html | 12 ++++++------
src/main/webapp/static/js/basCrnStatus/basCrnStatus.js | 4 ++--
src/main/webapp/views/basCrnError/basCrnError_detail.html | 6 +++---
src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html | 6 +++---
9 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/basCrnError/basCrnError.js b/src/main/webapp/static/js/basCrnError/basCrnError.js
index dadbb3b..9d2b9bc 100644
--- a/src/main/webapp/static/js/basCrnError/basCrnError.js
+++ b/src/main/webapp/static/js/basCrnError/basCrnError.js
@@ -92,7 +92,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnError_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: 'basCrnError_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
index 8985e8d..f60df23 100644
--- a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
+++ b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
@@ -92,7 +92,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnStatus_detail.html',
success: function(layero, index){
@@ -206,7 +206,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnStatus_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/static/js/basCrnp/basCrnp.js b/src/main/webapp/static/js/basCrnp/basCrnp.js
index 42b487e..eb5fe12 100644
--- a/src/main/webapp/static/js/basCrnp/basCrnp.js
+++ b/src/main/webapp/static/js/basCrnp/basCrnp.js
@@ -12,8 +12,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/basCrnp/list/auth',
page: true,
- limit: 16,
- skin: 'line',
+ limit: 10,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
@@ -35,10 +34,10 @@
,{field: 'crnSts$', align: 'center',title: '鐘舵��'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'crnErr$', align: 'center',title: '寮傚父鐮�'}
- ,{field: 'frmLocno$', align: 'center',title: '婧愬簱浣�',sort: true, event: 'frmLocno', style: 'cursor:pointer'}
- ,{field: 'toLocno$', align: 'center',title: '鐩爣搴撲綅', sort: true, event: 'toLocno', style: 'cursor:pointer'}
- ,{field: 'frmSta$', align: 'center',title: '婧愮珯', sort: true, event: 'frmSta', style: 'cursor:pointer'}
- ,{field: 'toSta$', align: 'center',title: '鐩爣绔�', sort: true, event: 'toSta', style: 'cursor:pointer'}
+ ,{field: 'frmLocno$', align: 'center',title: '婧愬簱浣�',sort: true}
+ ,{field: 'toLocno$', align: 'center',title: '鐩爣搴撲綅', sort: true}
+ ,{field: 'frmSta$', align: 'center',title: '婧愮珯', sort: true}
+ ,{field: 'toSta$', align: 'center',title: '鐩爣绔�', sort: true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
// ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'text-decoration: underline;cursor:pointer'}
@@ -117,7 +116,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnp_detail.html',
success: function(layero, index){
@@ -232,7 +231,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basCrnp_detail.html',
success: function(layero, index){
diff --git a/src/main/webapp/views/basCrnError/basCrnError.html b/src/main/webapp/views/basCrnError/basCrnError.html
index 5f9787a..4bd7ee8 100644
--- a/src/main/webapp/views/basCrnError/basCrnError.html
+++ b/src/main/webapp/views/basCrnError/basCrnError.html
@@ -22,7 +22,7 @@
</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>
diff --git a/src/main/webapp/views/basCrnError/basCrnError_detail.html b/src/main/webapp/views/basCrnError/basCrnError_detail.html
index 6b966c3..9a17c2b 100644
--- a/src/main/webapp/views/basCrnError/basCrnError_detail.html
+++ b/src/main/webapp/views/basCrnError/basCrnError_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="errorCode" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnError')" lay-verify="required|number">
</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="errName" class="layui-input" type="text">
diff --git a/src/main/webapp/views/basCrnStatus/basCrnStatus.html b/src/main/webapp/views/basCrnStatus/basCrnStatus.html
index aab5f04..b5e642e 100644
--- a/src/main/webapp/views/basCrnStatus/basCrnStatus.html
+++ b/src/main/webapp/views/basCrnStatus/basCrnStatus.html
@@ -22,7 +22,7 @@
</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>
diff --git a/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html b/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html
index df85052..b4b4015 100644
--- a/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html
+++ b/src/main/webapp/views/basCrnStatus/basCrnStatus_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="stsNo" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnStatus')">
</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="stsDesc" class="layui-input" type="text">
diff --git a/src/main/webapp/views/basCrnp/basCrnp.html b/src/main/webapp/views/basCrnp/basCrnp.html
index 110c00e..5e51e99 100644
--- a/src/main/webapp/views/basCrnp/basCrnp.html
+++ b/src/main/webapp/views/basCrnp/basCrnp.html
@@ -108,7 +108,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>
diff --git a/src/main/webapp/views/basCrnp/basCrnp_detail.html b/src/main/webapp/views/basCrnp/basCrnp_detail.html
index 060bb16..87666f3 100644
--- a/src/main/webapp/views/basCrnp/basCrnp_detail.html
+++ b/src/main/webapp/views/basCrnp/basCrnp_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,21 +23,21 @@
</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="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnp')" lay-verify="required|number">
</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">
+ <div class="layui-input-inline" style="text-align: left">
<input id="inEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
</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">
+ <div class="layui-input-inline" style="text-align: left">
<input id="outEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
</div>
</div>
--
Gitblit v1.9.1