Parcourir la source

计量草图 以及 在线签署 新功能

Chente il y a 8 ans
Parent
commit
01d7a79c18

+ 84 - 0
admin-caotu.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>纵横计量支付系统</title>
+	<meta name=description content=计量支付>
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/bootstrap.css>
+	<link rel=stylesheet href=css/style.css>
+	<script src=js/jquery-1.9.1.min.js></script>
+	<script src=js/bootstrap.js></script>
+	<script src=js/jl.js></script>
+</head>
+<body>
+<div class="wrapHeader">
+      <h1 class="mainLogo" title="纵横计量支付"></h1>
+      <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+    </div>
+<div class="width960 userInfoPanel clearfix">
+		<p><b>你好,管理员</b>;<a href="#">修改密码</a>&nbsp;<a href="admin-login.html">退出</a></p>
+</div>
+	<div class="warpAdmin">
+		<div class="adminSidebar fL">
+			<ul>
+				<li><a href="admin-addUser.html">系统信息</a></li>
+				<li><a href="admin-sms.html">短信通知</a></li>
+				<li><a href="admin-userlist.html">用户列表</a></li>
+				<li><a href="admin-sign.html">在线签署</a></li>
+				<li><a href="admin-caotu.html" class="now">中间计量草图</a></li>
+				<li><a href="admin-project.html">项目管理</a></li>
+			</ul>
+		</div>
+		<div class="adminContent">
+			<div class="adminMain">
+				<form class="form-horizontal">
+					<fieldset>
+						<legend>在线签署</legend>
+						<!--软件生成报表-->
+						<div class="form-group">
+							<label class="col-sm-2 control-label">软件生成报表</label>
+							<div class="col-sm-3">
+								<div class="btn-group">
+									<button class="btn btn-default" title="开启在线签署">开启</button>
+									<button class="btn btn-danger disabled" disabled="disabled">已关闭</button>
+								</div>
+								<a data-toggle="modal" href="#help1">帮助</a>
+							</div>
+						</div>
+						<div class="form-group">
+							<label class="col-sm-2 control-label">软件生成报表</label>
+							<div class="col-sm-3">
+								<div class="btn-group">
+									<button class="btn btn-success  disabled"  disabled="disabled">已开启</button>
+									<button class="btn btn-default" title="开启在线">关闭</button>
+								</div>
+							</div>
+						</div>
+					</fieldset>
+				</form>
+			</div>
+		</div>
+	</div>
+	<!-- 帮助1弹出 -->
+	<div id="help1" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+		<div class="modal-dialog">
+		<div class="modal-content">
+	    <div class="modal-body">
+	        <div class="alert alert-info">
+				此开关用于开启关闭软件功能入口
+			</div>
+			<div>
+				<img src="images/sign-help4.png">
+			</div>
+	    </div>
+	      <div class="modal-footer">
+	        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+	      </div>
+	  </div>
+	</div>
+	</div>
+
+
+	<script type="text/javascript">autoFlashHeight();</script>
+</body>

BIN
images/sign-help4.png


BIN
images/signtipsimg.png


+ 2 - 1
js/jl.js

@@ -1,6 +1,7 @@
 function autoFlashHeight(){
     var signSide = $(".sign-side").width();
     var viewInfo = $(".view-info").height();
+    var btnBar = $(".btn-bar").height();
     $(".body").height($(window).height());
     $(".mainContainer").height($(window).height()-48 );
     $(".adminContent").height($(window).height()-117 );
@@ -12,7 +13,7 @@ function autoFlashHeight(){
     $(".sign-content").width($(window).width()-signSide-69);
     $(".sign-content-warp").height($(window).height()-30);
     $(".sign-content-warp").width($(window).width());
-    $(".signed-list").height($(window).height()-viewInfo-176);
+    $(".signed-list").height($(window).height()-viewInfo-btnBar-140);
 };
 $(window).resize(autoFlashHeight);
 

+ 1 - 1
s-project-section-detail.html

@@ -92,7 +92,7 @@
       <li class="active">
       <a href="s-project-section-detail.html">标段概况</a>
       </li>
-      <li><a href="s-project-section-intermediate.html">中间计量</a></li>
+      <li><a href="s-project-section-intermediate.html">中间计量草图</a></li>
       </ul>
       <!--导航-->
     <div class="project">

+ 1 - 1
s-project-section-intermediate-detail.html

@@ -78,7 +78,7 @@
 <div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-body">
-        <h4>完成后报表不可修改。</h4>
+        <h4>完成后报表不可修改。</h4>
         <h4>完成草图添加后才可以对该报表发起在线签署。</h4>
         <h4>确认完成草图添加?</h4>
     </div>

+ 6 - 8
s-project-section-intermediate.html

@@ -103,13 +103,11 @@
         <li>
         <a href="s-project-section-detail.html">标段概况</a>
         </li>
-        <li class="active"><a href="s-project-section-measure.html">中间计量</a></li>
+        <li class="active"><a href="s-project-section-measure.html">中间计量草图</a></li>
       </ul>
       <!--导航-->
       <div class="project">
         <ul class="nav nav-pills">
-          <li><select class="form-control"><option>请选择项目</option></select>&nbsp;</li>
-          <li><select class="form-control"><option>请选择标段</option></select>&nbsp;</li>
           <li><select class="form-control"><option>请选择期数</option></select>&nbsp;</li>
         </ul>
         <table class="table">
@@ -135,7 +133,7 @@
             <td width="">报表名</td>
             <td>项目名称-标段名称-第一期</td>
             <td>张三<br>2016-08-01</td>
-            <td><span class="colGreen">完成</span><br>2016-08-01</td>
+            <td><span class="colGreen">完成签署</span><br>2016-08-01</td>
             <td width=""><a class="btn btn-default btn-sm" href="s-project-section-intermediate-detail.html">查看报表</a></td>
           </tr>
           <tr>
@@ -143,14 +141,14 @@
             <td>项目名称-标段名称-第一期</td>
             <td>张三<br>2016-08-01</td>
             <td><span class="colOrange">签署中</span><br></td>
-            <td width=""><a class="btn btn-default btn-sm" href="s-project-section-intermediate-detail.html">查看报表</a>&nbsp;<a class="btn btn-danger btn-sm" href="#del" data-toggle="modal" >删除</a></td>
+            <td width=""><a class="btn btn-default btn-sm" href="s-project-section-intermediate-detail.html">查看报表</a></td>
           </tr>
           <tr>
             <td width="">报表名</td>
             <td>项目名称-标段名称-第一期</td>
-            <td></td>
-            <td><span class="colGreen">完成</span><br>2016-08-01</td>
-            <td width=""><a class="btn btn-default btn-sm" href="s-project-section-intermediate-detail.html">查看报表</a></td>
+            <td>张三<br>2016-08-01</td>
+            <td><span>未发起签署</td>
+            <td width=""><a class="btn btn-default btn-sm" href="s-project-section-intermediate-detail.html">查看报表</a>&nbsp;<a class="btn btn-danger btn-sm" href="#del" data-toggle="modal" >删除</a></td>
           </tr>
           </tbody>
         </table>

+ 16 - 0
sign-list-all.html

@@ -88,6 +88,22 @@
             <td>未发起签署</td>
             <td width=""><a class="btn btn-default btn-sm" href="sign-view-page.html">查看报表</a>&nbsp;<a class="btn btn-danger btn-sm" href="#del" data-toggle="modal" >删除</a></td>
           </tr>
+          <tr>
+            <td width="">报表名</td>
+            <td>项目名称-标段名称-第一期</td>
+            <td>张三<br>2016-08-01</td>
+            <td></td>
+            <td><span class="colRed">终止</span><br>2016-08-01</td>
+            <td width=""><a class="btn btn-default btn-sm" href="sign-view-page.html">查看报表</a>&nbsp;<a class="btn btn-danger btn-sm" href="#del" data-toggle="modal" >删除</a></td>
+          </tr>
+          <tr>
+            <td width="">报表名</td>
+            <td>项目名称-标段名称-第一期</td>
+            <td>张三<br>2016-08-01</td>
+            <td>张三<br>2016-08-01</td>
+            <td><span class="colOrange">退回</span><br>2016-08-01</td>
+            <td width=""><a class="btn btn-default btn-sm" href="sign-view-page.html">查看报表</a></td>
+          </tr>
           </tbody>
         </table>
 				<nav aria-label="Page navigation">

+ 35 - 3
sign-view-signer_sign.html

@@ -76,6 +76,10 @@
               </div>
               <div class="btn-bar">
                   <a  href="#donesign" data-toggle="modal" class="btn btn-success btn-large btn-block">完成签署</a>
+									<div class="clearfix" style="margin-top:15px">
+                  	<a  href="#backsign" data-toggle="modal" class="btn btn-warning btn-large fL">退回签署</a>
+                  	<a  href="#stopsign" data-toggle="modal" class="btn btn-danger btn-large fR">终止签署</a>
+									</div>
               </div>
           </div>
           <div class="sign-content fL">
@@ -125,16 +129,44 @@
 <div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-body">
-        <h4>完成后不可更改,确认完成签署?</h4>
+        <h4>完成后不可更改,由下一位签署人继续签署,确认完成签署?</h4>
     </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-        <button type="button" class="btn btn-success">确认</button>
+        <button type="button" class="btn btn-success">确认完成</button>
+      </div>
+</div>
+</div>
+</div>
+<!-- 退回签署人弹出 -->
+<div id="backsign" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal-dialog">
+  <div class="modal-content">
+    <div class="modal-body">
+        <h4>退回上一签署人重新签署?</h4>
+    </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-warning">确认退回</button>
+      </div>
+</div>
+</div>
+</div>
+<!-- 终止签署人弹出 -->
+<div id="stopsign" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal-dialog">
+  <div class="modal-content">
+    <div class="modal-body">
+        <h4>终止该报表签署?</h4>
+        <h4>终止后,如需要重新发起签署,请在软件重新生成新一份签署报表。</h4>
+    </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+        <button type="button" class="btn btn-danger">确认终止</button>
       </div>
 </div>
 </div>
 </div>
-<!-- 添加签署人弹出 -->
 <script type="text/javascript">autoFlashHeight();</script>
 
 </body>