去掉 员工/设备修改页面的重置，分页0页时的BUG修复

watero-rst-service/src/main/java/com/iamberry/rst/util/ProduceNoUtil.java

@@ -17,7 +17,8 @@ public class ProduceNoUtil {
     //0-9，a-z,A-Z 62个编号
     private final static  String[] NUMBER = {"0","1","2","3","4","5","6","7","8","9",
             "A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",
-            "a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"};
+            "a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"
+    };
 
     //已删除的产品，工序的编号为#
     public final static  String NO_NUMBER = "#";

watero-rst-web/src/main/webapp/WEB-INF/views/base/page_util.ftl

@@ -36,8 +36,13 @@
         </#if>
         </span>
         <#if page.pages lte 5>
-            <#assign begin=1/>
-            <#assign end=page.pages/>
+            <#if (page.pages == 0)>
+                <#assign begin=0/>
+                <#assign end=0/>
+            <#else>
+                <#assign begin=1/>
+                <#assign end=page.pages/>
+            </#if>
         <#else>
             <#assign begin=(page.pageNo - 2)/>
             <#assign end=(page.pageNo + 3)/>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl

@@ -7,15 +7,15 @@
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
-        .my-input{padding: 5px 10px;width: 60%;}
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
+        .my-input{padding: 8px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
         .input-box{margin: 18px 0;}
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
-        .my-textarea{padding: 5px 10px;width: 60%;}
-        .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
-        .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
@@ -27,7 +27,7 @@
     <span class="c-gray en">&gt;</span> 修改设备
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
-<div style="padding: 10px;padding-left: 250px;">
+<div style="padding: 10px; width: 600px;margin: 0 auto;">
     <form class="form-horizontal" action="${path}/admin/equipment/update_device" id="form-admin-add">
         <div class="my-title">设备信息</div>
         <input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>
@@ -43,7 +43,7 @@
             <textarea rows="3" cols="20" name="deviceRemake" id="deviceRemake" class="my-textarea">${device.deviceRemake!}</textarea>
         </div>
         <div>
-            <button type="reset" class="my-btn-reset">重置</button><button type="button" class="my-btn-submit" onclick="update_value();">确认</button>
+            <#--<button type="reset" class="my-btn-reset">重置</button>--><button type="button" class="my-btn-submit" onclick="update_value();">确认</button>
         </div>
     </form>
 </div>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

@@ -150,6 +150,7 @@
         .list-main >li :hover{
             background: #f0f0f0;
         }
+        time > span{font-size: 13px;}
     </style>
 <#include "/base/list_base.ftl">
 </head>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -59,7 +59,7 @@
                 <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc" id="employeeDesc" maxlength="200">${employee.employeeDesc!}</textarea>
             </div>
             <div>
-                <button type="reset" class="my-btn-reset">重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+                <#--<button type="reset" class="my-btn-reset">重置</button>--><button type="submit" class="my-btn-submit">确认提交</button>
             </div>
         </div>
     </form>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -40,12 +40,12 @@
 			</form>
 		</div>
 		<div class="mt-2" style="margin: 20px;">
-			<table class="table table-border table-bordered table-bg table-hover table-sort" style=" width: 50%;margin: 0 auto;">
+			<table class="table table-border table-bordered table-bg table-hover table-sort" style=" width: 57%;margin: 0 auto;">
 				<thead>
 				<tr class="text-c">
-                    <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
-					<th width="10">产品条码</th>
-					<th width="20">操作</th>
+                    <th width="20"><input name='checkbox' type='checkbox' value='' id="all" ></th>
+					<th width="50">产品条码</th>
+					<th width="30">操作</th>
 				</tr>
 				</thead>
 				<tbody id="listid">
@@ -54,25 +54,28 @@
                     <#else >
                         <#assign machineList = page.dataList />
                     </#if>
-					<#list machineList as list>
-						<tr class="text-c" id="${list.machineBarcode }">
-                            <td width="2">
-                                <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' >
-                            </td>
-							<td class="text-c" width="10">${list.machineBarcode }</td>
-							<!-- 遍历操作 -->
-							<td class="td-manage text-c">
-								<a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
-                                <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
-                            </td>
-						</tr>
-					</#list>
+                    <#if machineList?? &&  (machineList?size > 0) >
+                        <#list machineList as list>
+                            <tr class="text-c" id="${list.machineBarcode }">
+                                <td width="2">
+                                    <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' >
+                                </td>
+                                <td class="text-c" width="10">${list.machineBarcode }</td>
+                                <!-- 遍历操作 -->
+                                <td class="td-manage text-c">
+                                    <a onclick="updatePrint('${list.machineBarcode}');" title="修改为已打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe6a7;</i></a>
+                                    <a onclick="barCodePrint('${list.machineBarcode }'+'${list.machineQrcode }'+'${list.machineProduceType }');" title="打印" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe652;</i></a>
+                                </td>
+                            </tr>
+                        </#list>
+                    <#else>
+                         <tr><td colspan="3" class="td-manage text-c" >暂时没有机器需要打印！</td></tr>
+                    </#if>
 				</tbody>
 			</table>
-
             <#if machineIsPrint == 2>
                 <tfoot>
-                    <div style="width: 60%;margin: 0 auto;"><#include "/base/page_util.ftl"></div>
+                    <div style="width: 60%;margin: 0 auto; padding-top: 20px"><#include "/base/page_util.ftl"></div>
                 </tfoot>
             </#if>