From b32497eebb0fbb3950fa315ed7a75c8457404744 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 24 十二月 2024 16:28:22 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js | 8 ++-- src/main/webapp/static/js/basQualityTesting/basQualityTesting.js | 8 ++-- src/main/webapp/views/basProcessProcedures/basProcessProcedures.html | 32 ++++++++------- src/main/webapp/views/basQualityTesting/basQualityTesting.html | 32 ++++++++------- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js b/src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js index 7b8f7f3..545d4eb 100644 --- a/src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js +++ b/src/main/webapp/static/js/basProcessProcedures/basProcessProcedures.js @@ -21,10 +21,10 @@ cellMinWidth: 50, height: 'full-120', cols: [[ - {type: 'checkbox'} - ,{field: 'id', align: 'center',title: 'ID'} - ,{field: 'boxSpecs', align: 'center',title: '浠诲姟鍙�'} - ,{field: 'boxType', align: 'center',title: '鍫嗗灈鏈�'} + // {type: 'checkbox'}, + {field: 'id', align: 'center',title: 'ID'} + ,{field: 'boxSpecs', align: 'center',title: '宸ュ簭鍚�'} + ,{field: 'boxType', align: 'center',title: '宸ュ簭鍙�'} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], diff --git a/src/main/webapp/static/js/basQualityTesting/basQualityTesting.js b/src/main/webapp/static/js/basQualityTesting/basQualityTesting.js index a52de1f..f2f8162 100644 --- a/src/main/webapp/static/js/basQualityTesting/basQualityTesting.js +++ b/src/main/webapp/static/js/basQualityTesting/basQualityTesting.js @@ -21,10 +21,10 @@ cellMinWidth: 50, height: 'full-120', cols: [[ - {type: 'checkbox'} - ,{field: 'id', align: 'center',title: 'ID'} - ,{field: 'boxSpecs', align: 'center',title: '浠诲姟鍙�'} - ,{field: 'boxType', align: 'center',title: '鍫嗗灈鏈�'} + // {type: 'checkbox'}, + {field: 'id', align: 'center',title: 'ID'} + ,{field: 'boxSpecs', align: 'center',title: '鐘舵�佸悕'} + ,{field: 'boxType', align: 'center',title: '鐘舵�佸彿'} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], diff --git a/src/main/webapp/views/basProcessProcedures/basProcessProcedures.html b/src/main/webapp/views/basProcessProcedures/basProcessProcedures.html index bd217cc..d91d322 100644 --- a/src/main/webapp/views/basProcessProcedures/basProcessProcedures.html +++ b/src/main/webapp/views/basProcessProcedures/basProcessProcedures.html @@ -17,16 +17,16 @@ <div class="layui-card-body"> <div class="layui-form toolbar" id="search-box"> <div class="layui-form-item"> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 300px"> - <div class="layui-input-inline"> - <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> - </div> - </div> +<!-- <div class="layui-inline">--> +<!-- <div class="layui-input-inline">--> +<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-inline" style="width: 300px">--> +<!-- <div class="layui-input-inline">--> +<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">--> +<!-- </div>--> +<!-- </div>--> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> @@ -50,14 +50,16 @@ <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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> +<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>--> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> </div> </script> <script type="text/html" id="operate"> <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + {{# if (d.id != 1) { }} <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> + {{# } }} </script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> @@ -73,15 +75,15 @@ <div class="layui-row"> <div class="layui-col-md12"> <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="boxSpecs" placeholder="璇疯緭鍏ヤ换鍔″彿" lay-vertype="tips" lay-verify="required"> + <input class="layui-input" name="boxSpecs" 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">宸ュ簭鍙�: </label> <div class="layui-input-block"> - <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ュ爢鍨涙満"> + <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ュ伐搴忓彿"> </div> </div> diff --git a/src/main/webapp/views/basQualityTesting/basQualityTesting.html b/src/main/webapp/views/basQualityTesting/basQualityTesting.html index adf07b5..6320d71 100644 --- a/src/main/webapp/views/basQualityTesting/basQualityTesting.html +++ b/src/main/webapp/views/basQualityTesting/basQualityTesting.html @@ -17,16 +17,16 @@ <div class="layui-card-body"> <div class="layui-form toolbar" id="search-box"> <div class="layui-form-item"> - <div class="layui-inline"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 300px"> - <div class="layui-input-inline"> - <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> - </div> - </div> +<!-- <div class="layui-inline">--> +<!-- <div class="layui-input-inline">--> +<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-inline" style="width: 300px">--> +<!-- <div class="layui-input-inline">--> +<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">--> +<!-- </div>--> +<!-- </div>--> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> @@ -50,14 +50,16 @@ <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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> +<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>--> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> </div> </script> <script type="text/html" id="operate"> <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + {{# if (d.id != 1) { }} <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> + {{# } }} </script> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> @@ -73,15 +75,15 @@ <div class="layui-row"> <div class="layui-col-md12"> <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="boxSpecs" placeholder="璇疯緭鍏ヤ换鍔″彿" lay-vertype="tips" lay-verify="required"> + <input class="layui-input" name="boxSpecs" 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">鐘舵�佸彿: </label> <div class="layui-input-block"> - <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ュ爢鍨涙満"> + <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ョ姸鎬佸彿"> </div> </div> -- Gitblit v1.9.1