From 3b7d04cd0201c3a037ff40991bebfa12f818aa98 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 31 十月 2022 15:48:49 +0800
Subject: [PATCH] 基础资料，工资报表
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 57
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 56
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 132 +-
WebTM/views/基础资料/公用基础资料/Pay_PeriodInfoSet.html | 55
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 55
WebTM/views/基础资料/公用基础资料/Gy_OrderBackInfo.html | 52
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 55
WebTM/views/工资管理/工资报表/Pay_SingleBalBillEntryReport.html | 8
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 56
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 56
WebTM/views/基础资料/基础资料/Gy_MaintainList.html | 55
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 111 +-
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 55
WebTM/views/工资管理/工资报表/Pay_PayMentSendList.html | 2
WebTM/views/工资管理/工资报表/Pay_WorkTimesPayMentEntryReport.html | 4
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 56
WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html | 132 +-
WebTM/views/基础资料/公用基础资料/Gy_WorkStationList.html | 55
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 59
WebTM/views/基础资料/公用基础资料/Gy_TechParamByProcList.html | 56
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 90 -
WebTM/views/基础资料/基础资料/Gy_MateMould.html | 2
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 113 +-
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 62
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 57
WebTM/views/工资管理/工资报表/Pay_EmpWorkQtyEntryReport.html | 36
WebTM/views/基础资料/基础资料/Gy_RepairList.html | 55
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 55
WebTM/views/基础资料/公用基础资料/Gy_OrderLev.html | 52
WebTM/views/基础资料/公用基础资料/Gy_PackType.html | 62
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 57
WebTM/views/系统管理/会计期间/Xt_AccountPeriodList.html | 52
WebTM/views/工资管理/工资报表/Pay_SingleBalBillSumReport.html | 4
WebTM/views/工资管理/工资报表/Pay_WorkTimesList.html | 2
WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html | 55
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 130 +-
WebTM/views/工资管理/工资报表/Pay_WorkTimesPayMentSumReport.html | 4
WebTM/views/系统管理/公告/GG_NoticeBillList.html | 87 -
WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html | 56
WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 55
WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html | 54
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 63
WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html | 55
WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 107 -
WebTM/views/基础资料/公用基础资料/Gy_ConkType.html | 62
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 55
WebTM/views/基础资料/基础资料/Gy_MateMouldList.html | 62
48 files changed, 1,347 insertions(+), 1,366 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
index d01dd97..561e223 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
@@ -45,92 +45,62 @@
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
</div>
-
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
- <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>
- <div class="layui-col-xs12 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- </div>
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
</div>
</div>
-
- <div class="layui-row layui-form-item">
- <!--<div class="layui-inline">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
</div>
- </div>-->
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row layui-form-item">
+
</div>
</div>
</div>
- <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -321,7 +291,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-120'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkType.html"
index 5571d79..acb6442 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkType.html"
@@ -19,11 +19,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鏁呴殰浠ｇ爜</label>
<div class="layui-input-block">
@@ -40,31 +40,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -139,7 +141,7 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': parent.layui.admin.events.closeThisTabs();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -246,7 +248,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index a6b770c..50c3139 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -24,24 +24,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div style="padding: 10px;">-->
- <!--<div class="layui-col-xs2">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>-->
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
- <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
- </div>-->
- <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
- <!--<div class="layui-row" style="padding:10px 0">-->
- <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
- <div id="treeCurrency" lay-filter="treeCurrency" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="layui-col-xs9 layui-inline">-->
- <!--<div class="layui-row">-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">璐у竵浠ｇ爜</label>
<div class="layui-input-block">
@@ -58,64 +45,38 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <!--</div>-->
- <!--<div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
- <div class="layui-row layui-form-item">
- <!--<div class="layui-inline">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <div class="layui-row layui-form-item">
+
+ </div>
</div>
</div>
</div>
@@ -262,7 +223,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 6f35712..a1c5b2b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -23,6 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -39,31 +44,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -107,7 +114,7 @@
var Organization = sessionStorage["Organization"]
var HModName = "Gy_DepartmentList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID"];
+ var titleData = ["HItemID","HUSEORGID"];
//#endregion
@@ -241,7 +248,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 9312070..218457a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,7 +22,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鑱屽憳浠ｇ爜</label>
<div class="layui-input-block">
@@ -39,31 +43,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -304,7 +310,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index a594f4f..362bbf1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -19,64 +19,69 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
- <!--</div>
- <div class="layui-inline">-->
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HModel" id="HModel">
- </div>
- <!--</div>
- <div class="layui-inline">-->
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -84,13 +89,13 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><iclass="layuiiconlayuiicon-circle"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -124,7 +129,7 @@
var Organization = sessionStorage["Organization"];
var HModName = "Gy_Material";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID","HUnitID","HParentID", "HUSEORGID"];
+ var titleData = ["HItemID","HUnitID","HParentID", "HUSEORGID","HMinPickQty","HEndFlag","HStopFlag"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -208,7 +213,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 500
, page: true
, cellMinWidth: 90
, limit: 50
@@ -291,7 +296,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
index 9d57b82..5e55871 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
@@ -26,7 +26,7 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
<div class="layui-inline">
@@ -45,31 +45,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -311,7 +313,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
index fe6f5fe..efa9ee3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
@@ -26,7 +26,7 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
<div class="layui-inline">
@@ -45,31 +45,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -312,7 +314,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PackType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PackType.html"
index 77ee190..144f343 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PackType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PackType.html"
@@ -19,11 +19,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍖呰浠ｇ爜</label>
<div class="layui-input-block">
@@ -40,31 +40,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -139,7 +141,7 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': parent.layui.admin.events.closeThisTabs();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -253,7 +255,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
index e0c5244..6e73d09 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.html"
@@ -21,7 +21,7 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
<div class="layui-inline">
@@ -40,31 +40,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -127,6 +129,8 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
+ //閫�鍑�
+ case 'btn-exit': parent.layui.admin.events.closeThisTabs();
};
});
//#endregion
@@ -207,7 +211,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index 291d018..584fe25 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -38,96 +38,70 @@
<div class="layui-colla-item">
<div style="padding: 10px;">
<!--<div class="layui-col-xs2">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
+ <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
+ </div>-->
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
-
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
- <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
</div>
- <div class="layui-col-xs12 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- </div>
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
</div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
<div class="layui-row layui-form-item">
- <!--<div class="layui-inline">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+
</div>
</div>
</div>
@@ -388,7 +362,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-130'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
index 6f1c167..c33953a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechParamByProcList.html"
@@ -20,7 +20,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
@@ -37,31 +41,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -308,7 +314,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html"
index 3cafd17..8d25c9f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterList.html"
@@ -20,7 +20,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">宸ヨ壓浠ｇ爜</label>
<div class="layui-input-block">
@@ -37,31 +41,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -306,7 +312,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
index 9566413..7e823c4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
@@ -20,7 +20,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">宸ュ崟浠ｇ爜</label>
<div class="layui-input-block">
@@ -37,31 +41,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -304,7 +310,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 7395d86..6541685 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -19,21 +19,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
- <!--<div style="padding: 10px;">
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
- </div>-->
- <!--<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">-->
- <!--<div class="layui-row" style="padding:10px 0">-->
- <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
- <div id="treeunit" lay-filter="treeunit" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>-->
- <!--<div class="layui-col-xs9 layui-inline">-->
- <!--<div class="layui-row">-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -46,55 +36,37 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">璁￠噺鍗曚綅浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁￠噺鍗曚綅鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <!--</div>-->
- <!--<div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
-
- </div>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -240,7 +212,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 9e00da1..c1c1734 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -19,11 +19,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <!--<div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>-->
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">浠撳簱浠ｇ爜</label>
<div class="layui-input-block">
@@ -40,31 +40,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -144,7 +146,7 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': parent.layui.admin.events.closeThisTabs();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -253,7 +255,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index 89a071a..a094696 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -23,6 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -47,31 +52,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -334,7 +341,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
index 440fe2a..0c9fc65 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkStationList.html"
@@ -24,6 +24,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">宸ヤ綅浠ｇ爜</label>
<div class="layui-input-block">
@@ -40,31 +45,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -244,7 +251,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Pay_PeriodInfoSet.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Pay_PeriodInfoSet.html"
index 75515a5..90da53d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Pay_PeriodInfoSet.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Pay_PeriodInfoSet.html"
@@ -23,6 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">骞翠唤</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -39,31 +44,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -238,7 +245,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
index eb8352f..45a50f9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
@@ -22,6 +22,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -39,31 +44,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -226,7 +233,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
index dd76035..676f314 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
@@ -21,6 +21,11 @@
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏁呴殰鍘熷洜浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -37,36 +42,37 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
</div>
-
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -216,7 +222,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
index 28f12bd..d2dc55d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -29,6 +29,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -45,31 +50,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -249,7 +256,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
index 3e0e1f8..84a1610 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
@@ -29,6 +29,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -45,31 +50,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -249,7 +256,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
index 2cbb9d6..356d66c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMould.html"
@@ -818,7 +818,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
index c610c79..f3a6d50 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MateMouldList.html"
@@ -47,39 +47,8 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
+
<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">妯″叿浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -96,6 +65,33 @@
<label class="layui-form-label">鏂规绫诲瀷</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="鏂规绫诲瀷" id="鏂规绫诲瀷">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
</div>
@@ -371,7 +367,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
index 35112a8..50c0787 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
@@ -29,6 +29,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -45,31 +50,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -249,7 +256,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
index bedf6cd..3f4360c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
@@ -29,6 +29,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -45,31 +50,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -249,7 +256,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 71e12e8..f69e6a5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -23,6 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐝粍浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -47,31 +52,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -273,7 +280,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 27a240c..5742f56 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -851,7 +851,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
index b599b34..0ef4556 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -50,80 +50,82 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-colla-content">
- <div class="layui-inline">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璧勬簮浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
- </div>
- </div>
- </div>
- <div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-colla-content">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璧勬簮浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閮ㄩ棬浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="鐗╂枡鍚嶇О" id="鐗╂枡鍚嶇О">
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璧勬簮鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="璧勬簮鍚嶇О" id="璧勬簮鍚嶇О">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="鐗╂枡鍚嶇О" id="鐗╂枡鍚嶇О">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="閮ㄩ棬鍚嶇О" id="閮ㄩ棬鍚嶇О">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璧勬簮鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="璧勬簮鍚嶇О" id="璧勬簮鍚嶇О">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="閮ㄩ棬鍚嶇О" id="閮ㄩ棬鍚嶇О">
+ </div>
</div>
</div>
</div>
@@ -310,7 +312,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index af248df..e3c572b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -21,7 +21,11 @@
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓嶈壇鍘熷洜浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -38,36 +42,37 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
</div>
-
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -227,7 +232,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 6819bf8..0b7595a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -28,6 +28,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ュ簭浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -52,31 +57,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -284,7 +291,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 7891c58..3fb2d32 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -23,6 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -47,31 +52,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -274,7 +281,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 87c8918..1832915 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -21,7 +21,11 @@
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
<div class="layui-input-block">
@@ -38,36 +42,37 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
</div>
-
<table class="" id="mainTable" lay-filter="mainTable"> </table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -224,7 +229,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 10312c2..343a775 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -21,7 +21,11 @@
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹㈡埛浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -38,37 +42,38 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
+
</div>
-
-
<table class="" id="mainTable" lay-filter="mainTable"> </table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -232,7 +237,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_EmpWorkQtyEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_EmpWorkQtyEntryReport.html"
index ffdb802..e77d575 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_EmpWorkQtyEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_EmpWorkQtyEntryReport.html"
@@ -3,16 +3,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鑱屽憳鏄庣粏鍒嗘瀽</title>
- <!--<meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>-->
<link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
<script src="../../../../layuiadmin/layui/layui.js"></script>
@@ -47,26 +37,6 @@
<input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:190px;">
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
- </div>
- </div>-->
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">-->
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- <!--</select>
- </div>
- </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -453,14 +423,14 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165 }
- , { field: 'hempid', title: 'hempid' }
+ , { field: 'hempid', title: 'hempid', hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 170 }
, { field: '杞﹀瀷', title: '杞﹀瀷', width: 160 }
- , { field: 'hmaterid', title: 'hmaterid', width: 160 }
+ , { field: 'hmaterid', title: 'hmaterid', width: 160, hide: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 215 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 115 }
, { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿' }
- , { field: 'HProcID', title: 'HProcID' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '宸ュ簭', title: '宸ュ簭' }
, { field: '浜ч噺', title: '浜ч噺' }
, { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺' }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayMentSendList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayMentSendList.html"
index 9d514ca..c0fdd1f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayMentSendList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayMentSendList.html"
@@ -216,7 +216,7 @@
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' }
, { field: '宸ュ彿', title: '宸ュ彿', width: 170 }
, { field: '濮撳悕', title: '濮撳悕', width: 160 }
- , { field: 'HNumber', title: 'HNumber', width: 160 }
+ , { field: 'HNumber', title: 'HNumber', width: 160, hide: true }
, { field: '宀椾綅', title: '宀椾綅', width: 215 }
, { field: '鍑哄嫟澶╂暟', title: '鍑哄嫟澶╂暟', width: 115 }
, { field: '璁′欢宸ヨ祫', title: '璁′欢宸ヨ祫' }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillEntryReport.html"
index 4a81ed8..ec92c79 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillEntryReport.html"
@@ -326,15 +326,15 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 170 }
- , { field: 'HEmpID', title: 'HEmpID', width: 170 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 170, hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 160 }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: 'HMaterID', title: 'HMaterID', width: 160 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: 'HProcID', title: 'HProcID', width: 160 }
+ , { field: 'HProcID', title: 'HProcID', width: 160, hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 160 }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 160 }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillSumReport.html"
index 08b476f..dd4bc83 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_SingleBalBillSumReport.html"
@@ -326,9 +326,9 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 170 }
- , { field: 'HEmpID', title: 'HEmpID', width: 170 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 170, hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 160 }
, { field: '璁′欢宸ヨ祫', title: '璁′欢宸ヨ祫', width: 160 }
]]
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesList.html"
index daae308..ccb20bf 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesList.html"
@@ -244,7 +244,7 @@
, { field: '鍏嚭娆℃暟', title: '鍏嚭娆℃暟' }
, { field: '绉佸嚭娆℃暟', title: '绉佸嚭娆℃暟' }
, { field: '鏃峰伐澶╂暟', title: '鏃峰伐澶╂暟' }
- , { field: 'HEmpType', title: 'HEmpType' }
+ , { field: 'HEmpType', title: 'HEmpType', hide: true }
]]
};
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentEntryReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentEntryReport.html"
index 3904a1f..640f942 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentEntryReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentEntryReport.html"
@@ -326,10 +326,10 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 170 }
- , { field: 'HEmpID', title: 'HEmpID', width: 160 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 160 }
, { field: '瀹為檯宸ユ椂', title: '瀹為檯宸ユ椂', width: 215 }
, { field: '璁℃椂鍗曚环', title: '璁℃椂鍗曚环', width: 115 }
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
index 57f018c..62ba596 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
@@ -326,9 +326,9 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 170 }
- , { field: 'HEmpID', title: 'HEmpID', width: 170 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 170, hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 160 }
, { field: '璁℃椂宸ヨ祫', title: '璁℃椂宸ヨ祫', width: 160 }
]]
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
index 852d506..a1539cd 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
@@ -21,7 +21,7 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
<div class="layui-inline">
@@ -34,31 +34,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -239,7 +241,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
index 6213415..60fa129 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
@@ -65,55 +65,50 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <label class="layui-form-label">鍙戦�佷汉</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSendMan" id="HSendMan" style="width:190px;">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙戦�佷汉</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HSendMan" id="HSendMan" style="width:190px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">绱ф�ョ▼搴�</label>
+ <div class="layui-input-block">
+ <select name="HLevel" lay-filter="HLevel" style="width:190px;">
+ <option value="-1" selected="selected">鍏ㄩ儴</option>
+ <option value="0">鏅��</option>
+ <option value="1">绱ф��</option>
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">绱ф�ョ▼搴�</label>
- <div class="layui-input-block">
- <select name="HLevel" lay-filter="HLevel" style="width:190px;">
- <option value="-1" selected="selected">鍏ㄩ儴</option>
- <option value="0">鏅��</option>
- <option value="1">绱ф��</option>
- </select>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
- </div>
</div>
</div>
</div>
@@ -279,7 +274,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 7bf7729..91421e3 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -28,74 +28,61 @@
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
</div>
-
- <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
- <div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs3 layui-inline" style="width: 23%;">
- <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
- </div>
- <div class="layui-col-xs9 layui-inline">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Hmaker" id="Hmaker">
- </div>
- </div>-->
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- </div>
- <div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
- </div>
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
</div>
</div>
- <div class="layui-row layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:0;margin-top:9px;width:90px;">鍗曟嵁绫诲瀷鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row layui-form-item">
+ </div>
</div>
</div>
</div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -237,7 +224,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-125'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index 92bc8be..19bf91a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -39,40 +39,8 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -83,6 +51,33 @@
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
</div>
@@ -219,7 +214,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index 3c76dbf..f90d97f 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -22,7 +22,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍔熻兘浠ｇ爜</label>
<div class="layui-input-block">
@@ -39,31 +43,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -253,7 +259,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
index 1e9482b..501c8e4 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
@@ -21,7 +21,7 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</div>
</div>
<div class="layui-inline">
@@ -34,32 +34,34 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -68,6 +70,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
@@ -194,7 +197,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
, cellMinWidth: 90
, limit: 50
--
Gitblit v1.9.1