1.9.0正式版本

global/css/style.css

@@ -49,6 +49,9 @@ a:focus {
   color: #005580;
   text-decoration:none;
 }
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+  font-weight: 600
+}
 .taC,td.taC,th.taC{text-align: center;}
 .taR,td.taR,th.taR{text-align:right;}
 .fL{float:left}
@@ -97,7 +100,8 @@ div.userInfo .btn-group .dropdown-menu{
   float:left
 }
 .mainSidebar ul{
-  border-bottom:1px solid #535353
+  border-bottom:1px solid #535353;
+  padding: 0;
 }
 .mainSidebar li{
   text-align:center;
@@ -109,6 +113,10 @@ div.userInfo .btn-group .dropdown-menu{
   right:8px;
   top:8px
 }
+.mainSidebar li .badge-warning{
+  background:#f0ad4e
+}
+
 .mainNav a{
   color:#fff;
   text-decoration:none;
@@ -146,9 +154,10 @@ div.userInfo .btn-group .dropdown-menu{
   padding:0 30px 0
 }
 .mainContent .title h1{
-  font-size:24px;
+  font-size:20px;
   color:#333;
-  font-weight:normal
+  font-weight:normal;
+  margin-top: 10px;
 }
 .mainContent .title {
   padding:10px 0 0 0;
@@ -171,7 +180,7 @@ div.userInfo .btn-group .dropdown-menu{
     right: 0;
 }
 .project {
-  margin:0 0 30px 0;
+  margin:30px 0;
 }
 .projec .odd{
   background:#fcfcfc
@@ -348,6 +357,9 @@ div.userInfo .btn-group .dropdown-menu{
   width:140px;
   margin-top:8px;
 }
+.tableTypeList ul{
+  padding:0;
+}
 .tableTypeList li {
   width:140px;
   overflow: hidden
@@ -566,7 +578,7 @@ left:5px
   background:#fff;
   position:relative;
   float:left;
-  margin:3px 3px 0 0;
+  margin:3px 10px 0 0;
   border-radius:3px
 }
 .avatar li img{
@@ -610,7 +622,6 @@ left:5px
   background:none;
   padding:0 15px;
   height:54px;
-  line-height:54px;
   width:30px
 }
 .avatar li.name {
@@ -785,7 +796,7 @@ left:5px
   margin:0;
   line-height:14px;
   padding:3px 5px 0 10px;
-  color:666;
+  color:#666;
   display:none
 }
 .groupEntry .avatar li.count{
@@ -882,13 +893,13 @@ left:5px
   margin:0 0 5px 0
 }
 .wrapLogin .loginPanel{
-  width:330px;
+  width:400px;
   position: absolute;
   bottom:50%;
   right:50%;
-  padding:10px;
+  padding:10px 20px;
   background:#F8F8F8;
-  margin:0 -165px -100px 0
+  margin:0 -200px -100px 0
 }
 .wrapLogin .loginPanel img{
   margin:0 0 10px 0;
@@ -904,6 +915,9 @@ left:5px
   width:140px;
   padding:10px 10px 10px 0;
 }
+.adminSidebar ul {
+  padding: 0;
+}
 .adminSidebar li{
   margin:0 0 1px 0
 }
@@ -1011,7 +1025,7 @@ left:5px
 .sign-menu .item {
   float:left;
   width:300px;
-  height:120px;
+  height:140px;
   text-align:center;
   font-size:38px;
   border:1px solid #ddd;
@@ -1027,10 +1041,10 @@ left:5px
   margin:0 auto
 }
 .sign-topbar{
-  margin:15px 0 0 0
+  margin:5px 0 0 0
 }
 .sign-page-num {
-  margin:15px 15px 0 0;
+  margin:5px 15px 0 0;
   font-size:18px;
   height:30px;
   line-height: 30px;
@@ -1048,6 +1062,7 @@ left:5px
   border: 9px solid transparent;
   position: relative;
   overflow: hidden;
+  box-sizing: content-box;
 }
 .warp-printer .page{
   margin:0 auto;
@@ -1055,6 +1070,7 @@ left:5px
   border: 9px solid transparent;
   position: relative;
   overflow: hidden;
+  box-sizing: content-box;
 }
 .sign-side{
   width:220px;
@@ -1062,6 +1078,9 @@ left:5px
 .sign-side .view-info{
   border-bottom:1px solid #ddd
 }
+.signed-list ul{
+  overflow-y:auto
+}
 .view-info li{
   padding:10px 5px 10px 65px;
   border-top:1px dashed #ddd
@@ -1078,7 +1097,7 @@ left:5px
   overflow-y: auto;
 }
 .signed-list li{
-  height:48px;
+  height:68px;
   line-height:48px;
   padding:10px 10px 10px 30px;
   border-bottom:1px dashed #ddd;
@@ -1121,7 +1140,8 @@ left:5px
   background:rgba(255,0,0,0.1);
 }
 .user-sign img{
-  width:inherit;
+  /*width:inherit;*/
+  width: 100%;
 }
 .user-sign .img-bar {
   background:#ddd;
@@ -1171,14 +1191,38 @@ left:5px
 .android-code{
   margin:40px 0 80px 0
 }
-.android-code h1{
-  background:url(phone-icon.png) no-repeat 0 0;
-  color:#A4C639
-}
-.ios-code h1{
-  background:url(phone-icon.png) no-repeat 0 -50px;
-  color:#999999
-}
+/*.android-code h1{*/
+  /*background:url(phone-icon.png) no-repeat 0 0;*/
+  /*color:#A4C639*/
+/*}*/
+/*.ios-code h1{*/
+  /*background:url(phone-icon.png) no-repeat 0 -50px;*/
+  /*color:#999999*/
+/*}*/
 .code-img{
   padding-left:40px
 }
+.form-group .necessary {
+  color: #f90000;
+}
+.bg-con-warp{
+  margin-bottom:50px
+}
+.bg-top-btn {
+  right:30px;
+  z-index: 999
+}
+.bg-nav > li.active > a,.bg-nav > li.active > a:hover{
+  background-color: #666
+}
+
+.progress .progress-bar-gary {
+  background-color: #bbb;
+  background-image: -moz-linear-gradient(top, #ccc, #bbb);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ccc), to(#bbb));
+  background-image: -webkit-linear-gradient(top, #ccc, #bbb);
+  background-image: -o-linear-gradient(top, #ccc, #bbb);
+  background-image: linear-gradient(to bottom, #ccc, #bbb);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccc', endColorstr='#bbb', GradientType=0);
+}

protected/class/auth.php

@@ -8,11 +8,12 @@ Doo::loadModel('usession');
 Doo::loadModelAt('ausers', 'admin');
 Doo::loadClass('user');
 Doo::loadModel('uprofile');
+Doo::loadModel('utoken');
 
 class Auth
 {
 
-    private $users, $usession, $user, $uinfo, $ausers, $profile;
+    private $users, $usession, $user, $uinfo, $ausers, $profile,$__token;
 
     public function __construct()
     {
@@ -21,6 +22,7 @@ class Auth
         $this->user = new User();
         $this->ausers = new AUsers();
         $this->profile = new Uprofile();
+        $this->__token = new Utoken();
     }
 
     private function __setcookie($key, $value)
@@ -199,6 +201,75 @@ class Auth
         }
     }
 
+    public function updateToken($uid,$token,$comefrom){
+        $utokenmsg = $this->__token->getOne(array('where' => 'uid='.$uid.' and comefrom='.$comefrom, 'asArray' => TRUE));
+        if(empty($utokenmsg)){
+            $this->__token->uid = $uid;
+            $this->__token->token = $token;
+            $this->__token->addtime = time();
+            $this->__token->endtime = time()+86400;  // 一天有效期
+            $this->__token->comefrom = $comefrom;
+            $this->__token->insert();
+        }else{
+            $this->__token->id = $utokenmsg['id'];
+            $this->__token->token = $token;
+            $this->__token->addtime = time();
+            $this->__token->endtime = time()+86400;  // 一天有效期
+            $this->__token->comefrom = $comefrom;
+            $this->__token->update();
+        }
+    }
+
+    public function getWebToken($uid){
+        $utokenmsg = $this->__token->getOne(array('where' => 'comefrom=1 and uid='.$uid, 'asArray' => TRUE));
+        if(!empty($utokenmsg) && $utokenmsg['endtime'] > time()){
+            return $utokenmsg['token'];
+        }else{
+            return '';
+        }
+    }
+
+    public function getAppToken($uid){
+        $utokenmsg = $this->__token->getOne(array('where' => 'comefrom=3 and uid='.$uid, 'asArray' => TRUE));
+        if(!empty($utokenmsg)){
+            return $utokenmsg['token'];
+        }else{
+            return '';
+        }
+    }
+
+    public function checkLoginByScan($uid,$token){
+        $uinfo = $this->getWebToken($uid);
+        if($uinfo && $uinfo == $token) {
+            $this->uinfo = $this->users->getOne(array('where' => 'uid='.$uid, 'asArray' => TRUE));
+            return TRUE;
+        }
+        return FALSE;
+    }
+
+    public function AppLoginToken($uid,$token){
+        $utokenmsg = $this->__token->getOne(array('where' => 'comefrom=3 and uid='.$uid, 'asArray' => TRUE));
+        if(!empty($utokenmsg)){
+            $this->__token->id = $utokenmsg['id'];
+            $this->__token->token = $token;
+            $this->__token->update();
+        }else{
+            $this->__token->uid = $uid;
+            $this->__token->token = $token;
+            $this->__token->comefrom = 3;
+            $this->__token->insert();
+        }
+    }
+
+    public function CheckAppLoginToken($uid,$token){
+        $uinfo = $this->getAppToken($uid);
+        if($uinfo && $uinfo == $token) {
+            $this->uinfo = $this->users->getOne(array('where' => 'uid='.$uid, 'asArray' => TRUE));
+            return TRUE;
+        }
+        return FALSE;
+    }
+
     private function encryptCookie($value)
     {
         if (!$value) {

protected/class/profile.php

@@ -29,6 +29,21 @@ class Profile
         return $this->uprofile->insert();
     }
 
+    public function ZGinsertProfile($uid = 0, $realname)
+    {
+        if (!isset($uid))
+            return FALSE;
+        $this->uprofile->userid = $uid;
+        $this->uprofile->name = $realname;
+        $this->uprofile->company = '';
+        $this->uprofile->jobs = '';
+        $this->uprofile->phone = '';
+        $this->uprofile->mobile = '';
+        $this->uprofile->qq = '';
+        $this->uprofile->groups = 'vip';
+        return $this->uprofile->insert();
+    }
+
     public function getProWithUid($userid = 0)
     {
         if (!isset($userid))

protected/class/sign.php

@@ -29,7 +29,6 @@ class Signn
     public function getUnSignNum($sql,$uid){
         return $this->_sign->count(array('where' => $sql.' and status="uncheck" AND (`isinter`=0 OR `isinter`=3) AND (`ownuid`='.$uid.' OR tender IN (SELECT pmid FROM jl_measure_audit WHERE auditoruid='.$uid.' GROUP BY auditoruid) OR project IN (SELECT pid FROM jl_project_measure WHERE uid='.$uid.'))', 'asArray' => TRUE));
     }
-
     public function getDoingSignNumbyUid($uid, $sql = ' 1'){
         return $this->_sign->count(array('where' => $sql.' and (status="checking" or status="back") and sid in(select `jl_sign_audit`.sid from `jl_sign_audit` where `jl_sign_audit`.audituid=?)', 'param' => array($uid), 'asArray' => TRUE));
     }
@@ -39,7 +38,7 @@ class Signn
     }
 
 //    public function getSignNum($sql,$uid){
-//        return $this->_sign->count(array('where' => $sql.' and (`ownuid`='.$uid.' OR `audituid`='.$uid.' OR sid IN (SELECT sid FROM jl_sign_audit WHERE jl_sign_audit.audituid='.$uid.'))','asArray' => TRUE));
+//        return $this->_sign->count(array('where' => $sql.' and (`audituid`='.$uid.' OR sid IN (SELECT sid FROM jl_sign_audit WHERE jl_sign_audit.audituid='.$uid.'))','asArray' => TRUE));
 //    }
 
     public function getSignNum($sql){
@@ -199,7 +198,6 @@ class Signn
                 $this->_signauditatt->said = $value['said'];
                 $this->_signauditatt->delete();
             }
-
         }
 
         $this->_sign->sid = $sid;

protected/config/routes.conf.php

@@ -226,6 +226,10 @@ $route['*']['/api/upgrade/v1/set/switch/:onoff'] = array('UpgradeController', 's
 $route['*']['/api/upgrade/v1/set/upgrade/info'] = array('UpgradeController', 'setUpgradeInfo');
 $route['*']['/api/upgrade/v1/get/version/status'] = array('UpgradeController', 'getVersionAndStatus');
 
+//$route['*']['/user/add/:username/:realname'] = array('[admin]UserController', 'ZGaddUser');
+//$route['*']['/service/user'] = array('[admin]ServiceController', 'ZGServer');
+//$route['*']['/service/getwsdl'] = array('[admin]ServiceController', 'getWSDL');
+//$route['*']['/service/testsoap'] = array('[admin]ServiceController', 'testSoap');
 
 // App api
 $route['*']['/api/app/serverlogin'] = array('AppController', 'ServerLogin');
@@ -378,4 +382,25 @@ $route['*']['/sproject/intermediate/view/:sid'] = array('SProjectController', 's
  * 中间计量表添加草图功能开关
  */
 $route['*']['/api/client/intermediate/switch'] = array('ClientController', 'interMediateSwitch');
+
+//手机app扫码登录
+$route['*']['/api/app/scan/validate'] = array('AppController', 'scanValidate');
+$route['*']['/api/app/scan/login'] = array('AppController', 'ScanLogin');
+$route['*']['/api/app/scan/autologin'] = array('AppController', 'autoScanLogin');
+
+// R 中间计量表
+$route['*']['/rproject/:pid/section/:pmid/intermediate'] = array('RProjectController', 'proSectionInterMediate');
+$route['*']['/rproject/:pid/section/:pmid/intermediate/page/:pindex'] = array('RProjectController', 'proSectionInterMediate');
+$route['*']['/rproject/:pid/section/:pmid/phaseno/:mpid/intermediate'] = array('RProjectController', 'proSectionInterMediate');
+$route['*']['/rproject/:pid/section/:pmid/phaseno/:mpid/intermediate/page/:pindex'] = array('RProjectController', 'proSectionInterMediate');
+$route['*']['/rproject/intermediate/view/:sid'] = array('RProjectController', 'signView');
+
+// W 中间计量表
+$route['*']['/project/:pid/section/:pmid/intermediate'] = array('ProjectController', 'proSectionInterMediate');
+$route['*']['/project/:pid/section/:pmid/intermediate/page/:pindex'] = array('ProjectController', 'proSectionInterMediate');
+$route['*']['/project/:pid/section/:pmid/phaseno/:mpid/intermediate'] = array('ProjectController', 'proSectionInterMediate');
+$route['*']['/project/:pid/section/:pmid/phaseno/:mpid/intermediate/page/:pindex'] = array('ProjectController', 'proSectionInterMediate');
+$route['*']['/project/intermediate/view/:sid'] = array('ProjectController', 'signView');
+
+
 ?>

protected/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v1.8.4';
+$config['ver'] = 'v1.9.0';
 

protected/controller/AppController.php

@@ -17,6 +17,7 @@ Doo::loadModel('users');
 Doo::loadClass('itemmeasurenum');
 Doo::loadModelAt('aconfig', 'admin');
 Doo::loadClass('sms');
+Doo::loadClass('Hashids/Hashids');
 
 /**
  * MainController
@@ -26,7 +27,7 @@ Doo::loadClass('sms');
  */
 class AppController extends DooController {
 
-    private $data, $client, $auth, $att, $file, $zip, $actmeasure, $contractact, $project, $profile, $numofperact, $measureauditact, $attfile, $users, $itemfile, $modelconfig, $aconfig, $sms, $itemMeasureNum;
+    private $data, $client, $auth, $att, $file, $zip, $actmeasure, $contractact, $project, $profile, $numofperact, $measureauditact, $attfile, $users, $itemfile, $modelconfig, $aconfig, $sms, $itemMeasureNum, $__hashids;
 
     private $statusArray = array('uncheck' => '1', 'checking' => '2', 'checked' => '3', 'checkno' => '4');
     private $fileTypeArray = array('台帐附件');
@@ -51,6 +52,7 @@ class AppController extends DooController {
         $this->itemMeasureNum = new ItemMeasureNumpofper();
         $this->aconfig = new AConfig();
         $this->sms = new Sms(Doo::conf()->SMS_URL, Doo::conf()->SMS_AUTHKEY);
+        $this->__hashids = new Hashids\Hashids('jlzfuserid', 8);
     }
 
     public function ServerLogin() {
@@ -426,7 +428,7 @@ class AppController extends DooController {
                 $a = file_put_contents(Doo::conf()->SITE_PATH .$virtualPath,$img);
 //                move_uploaded_file($_FILES['sign']["tmp_name"], Doo::conf()->SITE_PATH .$virtualPath);
                 if($a){
-                    $this->profile->setSignPath($this->params['uid'], $virtualPath);
+                    $this->profile->setSignPath($_POST['uid'], $virtualPath);
                     $status = array('status' => TRUE, 'msg' => '');
                     echo json_encode($status, JSON_UNESCAPED_UNICODE);
                     die();
@@ -639,6 +641,77 @@ class AppController extends DooController {
         return $randomCode;
     }
 
+    public function scanValidate(){
+        if(isset($_POST['app']) && $_POST['app'] == 'jlzfAppScanValidate'){
+            $uid = $this->__hashids->decode($_POST['user'])[0];
+            if(!empty($uid) && is_numeric($uid)){
+                if($this->auth->getWebToken($uid) == $_POST['token']){
+                    $userArray = $this->profile->getProWithUid($uid);
+                    $avatarStr = $userArray['avatar'];
+                    if (isset($userArray['userid'])) {
+                        $msgArray = array('uid' => $uid, 'name' => $userArray['name'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr, 'server' => $_SERVER['HTTP_HOST'], 'token' => $_POST['token']);
+                        echo json_encode(array('status' => TRUE, 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                        exit;
+                    }else{
+                        echo json_encode(array('status' => FALSE, 'msg' => '不存在该用户，请联系我们'), JSON_UNESCAPED_UNICODE);
+                        exit;
+                    }
+                }else{
+                    echo json_encode(array('status' => FALSE, 'msg' => '请检查二维码是否正确或过期，重新登录web端获取最新二维码或使用账号密码登录'), JSON_UNESCAPED_UNICODE);
+                    exit;
+                }
+            }
+        }
+        return 'http://a.app.qq.com/o/simple.jsp?pkgname=cn.com.smartcost.jlzf';
+    }
+
+    public function ScanLogin(){
+        if(isset($_POST['app']) && $_POST['app'] == 'jlzfAppScanLogin'){
+            $status = $this->auth->checkLoginByScan($_POST['uid'],$_POST['token']);
+            if($status){
+                $uinfo = $this->auth->getUinfo();
+                $userArray = $this->profile->getProWithUid($uinfo['uid']);
+                $avatarStr = $userArray['avatar'];
+                if (isset($userArray['userid'])) {
+                    $apptoken = sha1($this->create_randomstr() . $uinfo['uid']);
+                    $this->auth->AppLoginToken($uinfo['uid'],$apptoken);
+                    $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr, 'token' => $apptoken);
+                    echo json_encode(array('status' => TRUE, 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                    die;
+                }
+            }else{
+                echo json_encode(array('status' => FALSE, 'msg' => '请检查二维码是否正确或过期，重新登录web端获取最新二维码或使用账号密码登录'), JSON_UNESCAPED_UNICODE);
+                exit;
+            }
+        }
+        return 'http://a.app.qq.com/o/simple.jsp?pkgname=cn.com.smartcost.jlzf';
+    }
+
+    public function autoScanLogin(){
+        if ($this->auth->CheckAppLoginToken($_POST['uid'], $_POST['token'])) {
+            $uinfo = $this->auth->getUinfo();
+            if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
+                echo json_encode(array('status' => FALSE, 'msg' => '账号未启用'), JSON_UNESCAPED_UNICODE);
+                die;
+            }
+            if (isset($uinfo['uid'])) {
+                $userArray = $this->profile->getProWithUid($uinfo['uid']);
+                $avatarStr = $userArray['avatar'];
+                if (isset($userArray['userid'])) {
+//                    $this->auth->setUid($uinfo['uid']);
+                    $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
+                    echo json_encode(array('status' => TRUE, 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                    die;
+                }
+            }
+
+        } else {
+            echo json_encode(array('status' => FALSE, 'msg' => '您的登录信息已过期，请重新登录'), JSON_UNESCAPED_UNICODE);
+            die;
+        }
+    }
+
+
 //    function checkVersion($version)
 //    {
 //        preg_match();

protected/controller/ClientController.php

@@ -20,6 +20,32 @@ Doo::loadClass('sms');
 Doo::loadClass('sign');
 Doo::loadClass('measureconcerner');
 
+//
+//                       _oo0oo_
+//                      o8888888o
+//                      88" . "88
+//                      (| -_- |)
+//                      0\  =  /0
+//                    ___/`---'\___
+//                  .' \|     |// '.
+//                 / \|||  :  |||// \
+//                / _||||| -:- |||||- \
+//               |   | \  -  /// |     |
+//               | \_|  ''\---/''  |_/ |
+//               \  .-\__  '-'  ___/-. /
+//             ___'. .'  /--.--\  `. .'___
+//          ."" '<  `.___\_<|>_/___.' >' "".
+//         | | :  `- \`.;`\ _ /`;.`/ - ` : | |
+//         \  \ `_.   \_ __\ /__ _/   .-` /  /
+//     =====`-.____`.___ \_____/___.-`___.-'=====
+//                       `=---='
+//
+//
+//     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+//               佛祖保佑         永无BUG
+//
+
 /**
  * MainController
  * Feel free to delete the methods and replace them with your own code.
@@ -72,14 +98,14 @@ class ClientController extends DooController
             echo json_encode(array('status' => FALSE, 'msg' => '登录失败，请更新软件。'), JSON_UNESCAPED_UNICODE);
             die;
         }
-        if (isset($_POST['v4name']) && isset($_POST['v4pass']) && !empty($_POST['version'])) {
+        if (!empty($_POST['version'])) {
             try {
                 if ($this->modelconfig->getOne(array('select' => 'onoff', 'asArray' => TRUE))['onoff'] != 1) {
-                    $versionTotal = array_sum(explode('.', $_POST['version']));
+                    $versionTotal = implode("",explode('.', $_POST['version']));
                     $StrJson = ($this->modelconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
                     $jsonObj = json_decode($StrJson, true);
                     if ($jsonObj) {
-                        $versionTotalUp = array_sum(explode('.', $jsonObj['version']));
+                        $versionTotalUp = implode("",explode('.', $jsonObj['version']));
                         $strJson = json_encode(array('status' => 'upgrade', 'msg' => '您的客户端需要升级，请点击确定按钮，下载新版本，并且覆盖安装。', 'url' => $jsonObj['download']), JSON_UNESCAPED_UNICODE);
                         if ($jsonObj['condition'] == 1) {
                             if ($versionTotalUp != $versionTotal) {
@@ -94,24 +120,29 @@ class ClientController extends DooController
                             }
                         }
                     }
-                    if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
-                        $uinfo = $this->auth->getUinfo();
-                        if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
-                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
-                            die;
-                        }
-                        if (isset($uinfo['uid'])) {
-                            $userArray = $this->profile->getProWithUid($uinfo['uid']);
-                            $avatarStr = $userArray['avatar'];
-                            if (isset($userArray['userid'])) {
-                                $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
-                                echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                    if(isset($_POST['v4name']) && isset($_POST['v4pass'])){
+                        if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
+                            $uinfo = $this->auth->getUinfo();
+                            if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
+                                echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
                                 die;
                             }
-                        }
+                            if (isset($uinfo['uid'])) {
+                                $userArray = $this->profile->getProWithUid($uinfo['uid']);
+                                $avatarStr = $userArray['avatar'];
+                                if (isset($userArray['userid'])) {
+                                    $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
+                                    echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                                    die;
+                                }
+                            }
 
-                    } else {
-                        echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                        } else {
+                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                            die;
+                        }
+                    }else{
+                        echo json_encode(array('status' => 'false', 'msg' => '参数错误'), JSON_UNESCAPED_UNICODE);
                         die;
                     }
                 } else {

protected/controller/LoginController.php

@@ -2,6 +2,7 @@
 
 Doo::loadClass('auth');
 Doo::loadClass('profile');
+Doo::loadClass('utoken');
 Doo::loadModelAt('aconfig', 'admin');
 
 /**
@@ -47,10 +48,11 @@ class LoginController extends DooController
                 $this->auth->setUid($retval['uid']);
                 $this->auth->setUemail($retval['uemail']);
                 $_SESSION['token'] = sha1($this->create_randomstr() . $_SESSION['uid']);
+                $this->auth->updateToken($retval['uid'],$_SESSION['token'],1);
                 setcookie('token', $_SESSION['token'], 0, '/', Doo::conf()->APP_URL, FALSE, TRUE);
                 return Doo::conf()->APP_URL . 'project/index';
             } else {
-                $this->data['tips'] = '<div class="alert alert-error"><span data-icon="t" aria-hidden="true"></span> 帐号不存在或者密码错误</div>';
+                $this->data['tips'] = '<div class="alert alert-danger"><span data-icon="t" aria-hidden="true"></span> 帐号或密码错误，请检查输入是否有误。</div>';
             }
         } else {
             if (isset($_POST['uemail']) && isset($_POST['upasswd'])) {
@@ -60,10 +62,11 @@ class LoginController extends DooController
                         $this->auth->setUid($retval['uid']);
                         $this->auth->setUemail($retval['uemail']);
                         $_SESSION['token'] = sha1($this->create_randomstr() . $_SESSION['uid']);
+                        $this->auth->updateToken($retval['uid'],$_SESSION['token'],1);
                         setcookie('token', $_SESSION['token'], 0, '/', Doo::conf()->APP_URL, FALSE, TRUE);
                         return Doo::conf()->APP_URL . 'project/index';
                     } else {
-                        $this->data['tips'] = '<div class="alert alert-error"><span data-icon="t" aria-hidden="true"></span> 帐号不存在或者密码错误</div>';
+                        $this->data['tips'] = '<div class="alert alert-danger"><span data-icon="t" aria-hidden="true"></span> 帐号或密码错误，请检查输入是否有误。</div>';
                     }
                 } else {
                     return Doo::conf()->APP_URL;
@@ -71,12 +74,22 @@ class LoginController extends DooController
             }
         }
 
+        $this->getsoftware();
         $this->data['_token_'] = $this->generateFormHash($this->create_randomstr());
         $this->data['proName'] = $this->aconfig->getOne(array('select' => 'proName', 'asArray' => TRUE))['proName'];
         $this->data['ver'] = DOO::conf()->ver;
         $this->render('login', $this->data);
     }
 
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
+    }
+
     function Signout()
     {
         $this->auth->logout();

protected/controller/ProjectController.php

@@ -74,6 +74,20 @@ class ProjectController extends DooController
         if($this->data['signSwitch'] > 0)
             $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
+        //获取桌面版本
+        $this->getsoftware();
+
+        //草图入口
+        $this->data['imediateSwitch'] = $this->aconfig->getOne(array('select' => 'imediateswitch', 'asArray' => TRUE))['imediateswitch'];
+    }
+
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
     }
 
     /**
@@ -93,6 +107,7 @@ class ProjectController extends DooController
         $this->data['pros'] = $this->project->getAll($this->auth->getUid());
         if (isset($this->data['pros'][0]['pid'])) {
             foreach ($this->data['pros'] as $key => $value) {
+                $this->data['pros'][$key]['index'] = $key%8+1;
                 $this->data['pros'][$key]['numMeasure'] = $this->actmeasure->getMearsureCount($value['pid']);
                 $this->data['pros'][$key]['contracttotal'] = $this->actmeasure->getTotalWithPid($value['pid']);
                 $this->data['pros'][$key]['changTotal'] = $this->numofperact->getChangTotal($value['pid']);
@@ -337,9 +352,9 @@ class ProjectController extends DooController
 					<td class="taR">￥' . $totalmoney . '</td>
 					<td>
 					    <div class="progress">
-						<div class="bar bar-success" style="width: ' . $displayPercentSnTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
-						<div class="bar" style="width:' . $displayPercentCurrTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
-						<div class="bar bar-gary" style="width:' . $displayPercentLessTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
+						<div class="progress-bar progress-bar-success" style="width: ' . $displayPercentSnTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
+						<div class="progress-bar" style="width:' . $displayPercentCurrTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
+						<div class="progress-bar progress-bar-gary" style="width:' . $displayPercentLessTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
 					    </div>
 					</td>
 				    </tr>';
@@ -361,8 +376,8 @@ class ProjectController extends DooController
 					<td width="150"><span aria-hidden="true" data-icon="u"></span> ' . $v['stname'] . '<a id="idt_' . $v['stid'] . '" href="#secoption" data-toggle="modal" title="编辑/查看KEY" stid="' . $v['stid'] . '" proname="' . $v['stname'] . '" key="' . $v['stkey'] . '"><span data-icon="S" aria-hidden="true" class="closePanel" data-placement="bottom" data-toggle="tooltip" data-original-title="查看KEY" style="font-size:18px"></span></a></td>
 					<td width="90">总价：</td><td width="165">￥<b style="font-size:16px">' . $biaoduantotalmoney . '</b></td>
 					<td width="60">完成进度：</td><td><div class="progress">
-						<div class="bar bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
-						<div class="bar bar-danger" style="width:' . $otherprogress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
+						<div class="progress-bar progress-bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
+						<div class="progress-bar progress-bar-danger" style="width:' . $otherprogress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
 					    </div></td>
 				    </tr>
 				</thead>
@@ -431,16 +446,17 @@ class ProjectController extends DooController
         }
 
         // 面包屑导航项目
-        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
-        foreach ($allproArray as $kk => $vv) {
-            if ($vv['pid'] == $this->params['pid']) {
-                $this->data['currproArray'] = $vv;
-            } else {
-                $this->data['allproArray'][] = $vv;
-            }
-        }
+//        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
+//        $this->data['pmid'] = $this->params['pmid'];
+//        $allproArray = $this->project->getAll();
+//        foreach ($allproArray as $kk => $vv) {
+//            if ($vv['pid'] == $this->params['pid']) {
+//                $this->data['currproArray'] = $vv;
+//            } else {
+//                $this->data['allproArray'][] = $vv;
+//            }
+//        }
+        $this->getFav();
 // 面包屑导航合同
         $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
@@ -544,16 +560,17 @@ class ProjectController extends DooController
         }
 
         // 面包屑导航项目
-        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
-        foreach ($allproArray as $kk => $vv) {
-            if ($vv['pid'] == $this->params['pid']) {
-                $this->data['currproArray'] = $vv;
-            } else {
-                $this->data['allproArray'][] = $vv;
-            }
-        }
+//        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
+//        $this->data['pmid'] = $this->params['pmid'];
+//        $allproArray = $this->project->getAll();
+//        foreach ($allproArray as $kk => $vv) {
+//            if ($vv['pid'] == $this->params['pid']) {
+//                $this->data['currproArray'] = $vv;
+//            } else {
+//                $this->data['allproArray'][] = $vv;
+//            }
+//        }
+        $this->getFav();
 // 面包屑导航合同
         $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
@@ -763,18 +780,19 @@ class ProjectController extends DooController
 
     public function proDetail()
     {
-// 面包屑导航项目
-        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
-        foreach ($allproArray as $kk => $vv) {
-            if ($vv['pid'] == $this->params['pid']) {
-                $this->data['currproArray'] = $vv;
-            } else {
-                $this->data['allproArray'][] = $vv;
-            }
-        }
-// 面包屑导航合同
+        // 面包屑导航项目
+//        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
+//        $this->data['pmid'] = $this->params['pmid'];
+//        $allproArray = $this->project->getAll();
+//        foreach ($allproArray as $kk => $vv) {
+//            if ($vv['pid'] == $this->params['pid']) {
+//                $this->data['currproArray'] = $vv;
+//            } else {
+//                $this->data['allproArray'][] = $vv;
+//            }
+//        }
+        $this->getFav();
+        // 面包屑导航合同
         $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         if (isset($measureArray['stid'])) {
@@ -789,7 +807,7 @@ class ProjectController extends DooController
         } else {
             $this->data['currconArray'] = $this->data['allconArray'] = NULL;
         }
-// 面包屑导航标段
+        // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
         $actmeasureArray = $this->actmeasure->getAll();
@@ -899,6 +917,208 @@ class ProjectController extends DooController
     }
 
 
+    /*
+     *
+     * 中间计量表草图列表
+     */
+    public function proSectionInterMediate(){
+
+        //草图功能开关控制
+        if($this->data['imediateSwitch'] == 0){
+            exit('中间计量表草图添加功能未启用...');
+        }
+
+        // 面包屑导航项目
+        $this->getFav();
+        // 面包屑导航合同
+        $conArray = $this->contractact->getAll();
+        $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
+        if (isset($measureArray['stid'])) {
+            foreach ($conArray as $kkk => $vvv) {
+                if ($vvv['stid'] == $measureArray['stid']) {
+                    $this->data['currconArray'] = $vvv;
+                } else {
+                    if ($vvv['pid'] == $this->params['pid'])
+                        $this->data['allconArray'][] = $vvv;
+                }
+            }
+        } else {
+            $this->data['currconArray'] = $this->data['allconArray'] = NULL;
+        }
+        // 面包屑导航标段
+        // 面包屑导航标段
+        $this->data['curractmeasureArray'] = NULL;
+        $this->data['allactmeasureArray'] = [];
+        $actmeasureArray = $this->actmeasure->getAll();
+        foreach ($actmeasureArray as $kkkk => $vvvv) {
+            if ($vvvv['stid'] == $measureArray['stid']) {
+                if (($vvvv['pmid'] == $this->params['pmid'])) {
+                    $this->data['curractmeasureArray'] = $vvvv;
+                } else {
+                    $this->data['allactmeasureArray'][] = $vvvv;
+                }
+            }
+        }
+
+        Doo::loadHelper('DooPager');
+        $pagestr = '';
+        $sqlstr = ' 1';
+//        $this->data['project'] = '';
+//        $this->data['tender'] = '';
+        $this->data['phaseno'] = '';
+        $this->data['nosign'] = '';
+
+        //获取项目信息
+        $searchsql = 'isinter=3';
+//        $itemlist = $this->sign->getSignGroupByProject($searchsql);
+//        if(!empty($itemlist)){
+//            foreach($itemlist as $ik => $iv){
+//                $itemmsg = $this->project->getRowByPid($iv['project']);
+//                $itemlist[$ik]['pname'] = $itemmsg['pname'];
+//            }
+//        }
+
+        if(isset($this->params['pid']) && is_numeric($this->params['pid'])){
+            $pagestr .= '/'.$this->params['pid'];
+            $sqlstr .= ' and project='.$this->params['pid'];
+            //获取标段信息
+//            $tenderlist = $this->sign->getSignGroupByTender($this->params['pid'],$searchsql);
+//            if(!empty($tenderlist)){
+//                foreach($tenderlist as $tk => $tv){
+//                    $tendermsg = $this->actmeasure->getRowByPmid($tv['tender']);
+//                    $tenderlist[$tk]['pmname'] = $tendermsg['pmname'];
+//                }
+//            }
+
+            if(isset($this->params['pmid']) && is_numeric($this->params['pmid'])){
+                $pagestr .= '/section/'.$this->params['pmid'];
+                $sqlstr .= ' and tender='.$this->params['pmid'];
+                //获取期数信息
+                $phasenolist = $this->sign->getSignGroupByPhaseno($this->params['pmid'],$searchsql);
+                if(!empty($phasenolist)){
+                    foreach($phasenolist as $pk => $pv){
+                        $phasenolist[$pk]['numpname'] = $pv['phaseno'];
+                    }
+                }
+
+                if(isset($this->params['mpid']) && is_numeric($this->params['mpid'])){
+                    $this->data['phaseno'] = $this->params['mpid'];
+                    $pagestr .= '/phaseno/'.$this->params['mpid'];
+                    $sqlstr .= ' and phaseno='.$this->params['mpid'];
+                }
+            }
+        }
+
+        $totalArchive = $this->sign->getSignNum($sqlstr.' and '.$searchsql);
+        $pager = new DooPager(Doo::conf()->APP_URL . 'project'.$pagestr.'/intermediate/page', $totalArchive, 10, 100);
+        $pager->setCss('', 'disabled', 'active');
+        if (isset($this->params['pindex']))
+            $pager->paginate(intval($this->params['pindex']));
+        else
+            $pager->paginate(1);
+        if ($pager->limit != ' -10,10')
+            $list = $this->sign->getSignList($sqlstr.' and '.$searchsql,$pager->limit);
+        if(isset($list) && !empty($list)){
+            foreach($list as $k => $v){
+                //获取项目名，标段名，标段期数
+                $project = $this->project->getRowByPid($v['project']);
+                $tender = $this->actmeasure->getRowByPmid($v['tender']);
+//                $phaseno = $this->numofperact->getCurrStatus($v['phaseno']);
+
+                $list[$k]['project'] = $project['pname'];
+                $list[$k]['tender'] = $tender['pmname'];
+//                $list[$k]['phaseno'] = $phaseno['numpname'];
+                $list[$k]['ownname'] = $this->auth->getName($v['ownuid']);
+                $list[$k]['auditname'] = $this->auth->getName($v['audituid']);
+            }
+        }
+
+        $this->data['list'] = isset($list) ? $list : '';
+//        $this->data['itemlist'] = $itemlist;
+//        $this->data['tenderlist'] = isset($tenderlist) ? $tenderlist : '';
+        $this->data['phasenolist'] = isset($phasenolist) ? $phasenolist : '';
+        $this->data['pager'] = $pager->output;
+
+
+        $this->data['pid'] = $this->params['pid'];
+        $this->data['pmid'] = $this->params['pmid'];
+        $this->render('w-project-section-intermediate', $this->data, TRUE);
+    }
+
+
+    /**
+     *
+     * 中间计量表视图
+     */
+    public function signView()
+    {
+        //草图功能开关控制
+        if($this->data['imediateSwitch'] == 0){
+            exit('中间计量表草图添加功能未启用...');die;
+        }
+
+        if(!isset($this->params['sid']) || !is_numeric($this->params['sid'])){
+            exit('没有报表参数');
+        }
+        //获取报表信息
+        $signmsg = $this->sign->getOneSignbysid($this->params['sid']);
+        if(empty($signmsg) || $signmsg['isinter'] != 3){
+            exit('不存在此中间计量表');
+        }
+
+        $backurl = '/project/'.$signmsg['project'].'/section/'.$signmsg['tender'].'/intermediate';
+        //获取项目名，标段名，标段期数
+        $project = $this->project->getRowByPid($signmsg['project']);
+        $tender = $this->actmeasure->getRowByPmid($signmsg['tender']);
+//        $phaseno = $this->numofperact->getCurrStatus($signmsg['phaseno']);
+
+        $signmsg['project'] = $project['pname'];
+        $signmsg['tender'] = $tender['pmname'];
+//        $signmsg['phaseno'] = $phaseno['numpname'];
+
+        //获取签署人列表
+        $signauditlist = $this->sign->getSignAuditList($this->params['sid']);
+        if(!empty($signauditlist)){
+            foreach($signauditlist as $k => $v){
+                //获取签署人头像
+                $signauditlist[$k]['index'] = $k+1;
+                $signauditlist[$k]['avatar'] = $this->auth->getAvatar($v['audituid']);
+            }
+        }
+
+        //获取报表图片
+        $maxwidth = 794; //默认图片最大宽度   a4
+        $maxheight = 1123; //默认图片最大高度  a4
+        if(!empty($signmsg['widhei'])){
+            $widhei = explode('_', $signmsg['widhei']);
+            $style = $widhei[0].'mm '.$widhei[1].'mm';
+        }else{
+            $style = '210mm 297mm';
+        }
+        $signattlist = $this->sign->getSignAttList($this->params['sid']);
+        if(!empty($signattlist)){
+            foreach($signattlist as $sak => $sav){
+                $signattlist[$sak]['auditatt'] = $this->sign->getSignAuditAttList($sav['said']);
+                if($sak == 0){
+                    $imgmsg = getimagesize(Doo::conf()->APP_URL.$sav['filepath']);
+                    $maxwidth = $imgmsg[0];
+                    $maxheight = $imgmsg[1];
+                }
+            }
+        }
+
+        $this->data['signmsg'] = $signmsg;
+        $this->data['auditlist'] = $signauditlist;
+        $this->data['attlist'] = $signattlist;
+        $this->data['backurl'] = $backurl;
+        $this->data['maxwidth'] = $maxwidth;
+        $this->data['maxheight'] = $maxheight;
+        $this->data['style'] = $style;
+
+        $this->render('sign-view-page', $this->data, TRUE);
+    }
+
+
 }
 
 ?>

protected/controller/RProjectController.php

@@ -64,6 +64,21 @@ class RProjectController extends DooController
         //获取需要您签署的数目
         if($this->data['signSwitch'] > 0)
             $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
+
+        //获取桌面版本
+        $this->getsoftware();
+
+        //草图入口
+        $this->data['imediateSwitch'] = $this->aconfig->getOne(array('select' => 'imediateswitch', 'asArray' => TRUE))['imediateswitch'];
+    }
+
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
     }
 
     public function beforeRun($resource, $action)
@@ -103,6 +118,7 @@ class RProjectController extends DooController
                 }
                 $this->data['proArray'][$key]['bcontracttotal'] = number_format($this->data['proArray'][$key]['contracttotal'], 2, '.', ',');
                 $this->data['proArray'][$key]['bchangTotal'] = number_format($this->data['proArray'][$key]['changTotal'], 2, '.', ',');
+                $this->data['proArray'][$key]['index'] = $key%8+1;
             }
         } else {
             $this->data['proArray'] = array();
@@ -172,7 +188,7 @@ class RProjectController extends DooController
                         }
                         $datatmp = $this->measureauditact->getMyAuditStatus2($numStatusArray['pmid'], $numStatusArray['numpname'], $numStatusArray['times'], $this->auth->getUid());
                         if ($datatmp && ($datatmp['mastatus'] == 'checking')) {
-                            $buttonhtml = '<a class="btn btn-warning btn-small" href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/report/' . $numStatusArray['mpid'] . '">开始审批</a>';
+                            $buttonhtml = '<a class="btn btn-warning btn-sm" href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/report/' . $numStatusArray['mpid'] . '">开始审批</a>';
                         } else {
                             $buttonhtml = '（<span class="colOrange">' . $this->statusArray[$numStatusArray['currstatus']] . '</span>）';
                         }
@@ -182,9 +198,9 @@ class RProjectController extends DooController
                                     <td class="taR">￥' . number_format($v['contracttotal'], 2, '.', ',') . '</td>
                                     <td>
                                         <div class="progress">
-                                        <div class="bar bar-success" style="width: ' . $dispstopnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
-                                        <div class="bar" style="width:' . $dispcurrdone . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
-                                        <div class="bar bar-gary" style="width:' . $dispnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
+                                        <div class="progress-bar progress-bar-success" style="width: ' . $dispstopnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
+                                        <div class="progress-bar" style="width:' . $dispcurrdone . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
+                                        <div class="progress-bar progress-bar-gary" style="width:' . $dispnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
                                         </div>
                                     </td>
                                     </tr>';
@@ -295,16 +311,14 @@ class RProjectController extends DooController
 
         // 面包屑导航项目
         $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
-        foreach ($allproArray as $kk => $vv) {
-            if ($vv['pid'] == $this->params['pid']) {
-                $this->data['currproArray'] = $vv;
-            } else {
-                $this->data['allproArray'][] = $vv;
-            }
+
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
         }
-// 面包屑导航合同
+        $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
+        // 面包屑导航合同
         $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         if (isset($measureArray['stid'])) {
@@ -319,16 +333,22 @@ class RProjectController extends DooController
         } else {
             $this->data['currconArray'] = $this->data['allconArray'] = NULL;
         }
-// 面包屑导航标段
+        // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -410,16 +430,14 @@ class RProjectController extends DooController
 
         // 面包屑导航项目
         $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
-        foreach ($allproArray as $kk => $vv) {
-            if ($vv['pid'] == $this->params['pid']) {
-                $this->data['currproArray'] = $vv;
-            } else {
-                $this->data['allproArray'][] = $vv;
-            }
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
         }
-// 面包屑导航合同
+        $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
+
+        // 面包屑导航合同
         $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         if (isset($measureArray['stid'])) {
@@ -434,16 +452,22 @@ class RProjectController extends DooController
         } else {
             $this->data['currconArray'] = $this->data['allconArray'] = NULL;
         }
-// 面包屑导航标段
+        // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -596,15 +620,53 @@ class RProjectController extends DooController
         if (!isset($numStatusArray['currstatus'])) {
             $numStatusArray['currstatus'] = 'uncheck';
         }
-        // 项目名称
+
+        // 面包屑导航项目
+        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
         $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         foreach ($mpidArray as $k1 => $v1) {
             if ($v1['pid'] != $this->params['pid'])
                 $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
         }
         $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
-        $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
+
+        // 面包屑导航合同
+        $conArray = $this->contractact->getAll();
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
+        if (isset($measureArray['stid'])) {
+            foreach ($conArray as $kkk => $vvv) {
+                if ($vvv['stid'] == $measureArray['stid']) {
+                    $this->data['currconArray'] = $vvv;
+                } else {
+                    if ($vvv['pid'] == $this->params['pid'])
+                        $this->data['allconArray'][] = $vvv;
+                }
+            }
+        } else {
+            $this->data['currconArray'] = $this->data['allconArray'] = NULL;
+        }
+        // 面包屑导航标段
+        $this->data['curractmeasureArray'] = NULL;
+        $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
+        $actmeasureArray = $this->actmeasure->getAll();
+        foreach ($actmeasureArray as $kkkk => $vvvv) {
+            if ($vvvv['stid'] == $measureArray['stid']) {
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
+                }
+            }
+        }
+
+        $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
+//        $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         foreach ($this->data['MeasureArray'] as $key => $value) {
             if ($measureArray['contracttotal'] > $value['currdone'] && $value['currdone'] > 0) {
                 $this->data['MeasureArray'][$key]['lessTotal'] = round(($value['currdone'] / $measureArray['contracttotal']) * 100);
@@ -620,7 +682,49 @@ class RProjectController extends DooController
 
     public function proReport()
     {
-        // 面包屑导航
+        // 面包屑导航项目
+        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
+        }
+        $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
+
+        // 面包屑导航合同
+        $conArray = $this->contractact->getAll();
+        $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
+        if (isset($measureArray['stid'])) {
+            foreach ($conArray as $kkk => $vvv) {
+                if ($vvv['stid'] == $measureArray['stid']) {
+                    $this->data['currconArray'] = $vvv;
+                } else {
+                    if ($vvv['pid'] == $this->params['pid'])
+                        $this->data['allconArray'][] = $vvv;
+                }
+            }
+        } else {
+            $this->data['currconArray'] = $this->data['allconArray'] = NULL;
+        }
+        // 面包屑导航标段
+        $this->data['curractmeasureArray'] = NULL;
+        $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
+        $actmeasureArray = $this->actmeasure->getAll();
+        foreach ($actmeasureArray as $kkkk => $vvvv) {
+            if ($vvvv['stid'] == $measureArray['stid']) {
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
+                }
+            }
+        }
 
 
         // 期数列表
@@ -812,6 +916,205 @@ class RProjectController extends DooController
             return $this->sms->sendSms($mobile, $text);
 
     }
+
+    /*
+     *
+     * 中间计量表草图列表
+     */
+    public function proSectionInterMediate(){
+
+        //草图功能开关控制
+        if($this->data['imediateSwitch'] == 0){
+            exit('中间计量表草图添加功能未启用...');
+        }
+
+        // 面包屑导航项目
+        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
+        }
+        $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
+
+        // 面包屑导航合同
+        $conArray = $this->contractact->getAll();
+        $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
+        if (isset($measureArray['stid'])) {
+            foreach ($conArray as $kkk => $vvv) {
+                if ($vvv['stid'] == $measureArray['stid']) {
+                    $this->data['currconArray'] = $vvv;
+                } else {
+                    if ($vvv['pid'] == $this->params['pid'])
+                        $this->data['allconArray'][] = $vvv;
+                }
+            }
+        } else {
+            $this->data['currconArray'] = $this->data['allconArray'] = NULL;
+        }
+        // 面包屑导航标段
+        $this->data['curractmeasureArray'] = NULL;
+        $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
+        $actmeasureArray = $this->actmeasure->getAll();
+        foreach ($actmeasureArray as $kkkk => $vvvv) {
+            if ($vvvv['stid'] == $measureArray['stid']) {
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
+                }
+            }
+        }
+
+        Doo::loadHelper('DooPager');
+        $pagestr = '';
+        $sqlstr = ' 1';
+        $this->data['phaseno'] = '';
+        $this->data['nosign'] = '';
+
+        //获取项目信息
+        $searchsql = 'isinter=3';
+
+        if(isset($this->params['pid']) && is_numeric($this->params['pid'])){
+            $pagestr .= '/'.$this->params['pid'];
+            $sqlstr .= ' and project='.$this->params['pid'];
+            //获取标段信息
+
+            if(isset($this->params['pmid']) && is_numeric($this->params['pmid'])){
+                $pagestr .= '/section/'.$this->params['pmid'];
+                $sqlstr .= ' and tender='.$this->params['pmid'];
+                //获取期数信息
+                $phasenolist = $this->sign->getSignGroupByPhaseno($this->params['pmid'],$searchsql);
+                if(!empty($phasenolist)){
+                    foreach($phasenolist as $pk => $pv){
+                        $phasenolist[$pk]['numpname'] = $pv['phaseno'];
+                    }
+                }
+
+                if(isset($this->params['mpid']) && is_numeric($this->params['mpid'])){
+                    $this->data['phaseno'] = $this->params['mpid'];
+                    $pagestr .= '/phaseno/'.$this->params['mpid'];
+                    $sqlstr .= ' and phaseno='.$this->params['mpid'];
+                }
+            }
+        }
+
+        $totalArchive = $this->sign->getSignNum($sqlstr.' and '.$searchsql);
+        $pager = new DooPager(Doo::conf()->APP_URL . 'rproject'.$pagestr.'/intermediate/page', $totalArchive, 10, 100);
+        $pager->setCss('', 'disabled', 'active');
+        if (isset($this->params['pindex']))
+            $pager->paginate(intval($this->params['pindex']));
+        else
+            $pager->paginate(1);
+        if ($pager->limit != ' -10,10')
+            $list = $this->sign->getSignList($sqlstr.' and '.$searchsql,$pager->limit);
+        if(isset($list) && !empty($list)){
+            foreach($list as $k => $v){
+                //获取项目名，标段名，标段期数
+                $project = $this->project->getRowByPid($v['project']);
+                $tender = $this->actmeasure->getRowByPmid($v['tender']);
+//                $phaseno = $this->numofperact->getCurrStatus($v['phaseno']);
+
+                $list[$k]['project'] = $project['pname'];
+                $list[$k]['tender'] = $tender['pmname'];
+//                $list[$k]['phaseno'] = $phaseno['numpname'];
+                $list[$k]['ownname'] = $this->auth->getName($v['ownuid']);
+                $list[$k]['auditname'] = $this->auth->getName($v['audituid']);
+            }
+        }
+
+        $this->data['list'] = isset($list) ? $list : '';
+        $this->data['phasenolist'] = isset($phasenolist) ? $phasenolist : '';
+        $this->data['pager'] = $pager->output;
+
+        $numStatusArray = $this->numofperact->getLastStatus3($this->params['pid'], $this->params['pmid']);
+        if (!isset($numStatusArray['currstatus'])) {
+            $numStatusArray['currstatus'] = 'uncheck';
+        }
+        $this->data['pid'] = $this->params['pid'];
+        $this->data['pmid'] = $this->params['pmid'];
+        $this->data['mpid'] = $numStatusArray['mpid'];
+        $this->render('r-project-section-intermediate', $this->data, TRUE);
+    }
+
+    /**
+     *
+     * 中间计量表视图
+     */
+    public function signView()
+    {
+        //草图功能开关控制
+        if($this->data['imediateSwitch'] == 0){
+            exit('中间计量表草图添加功能未启用...');die;
+        }
+
+        if(!isset($this->params['sid']) || !is_numeric($this->params['sid'])){
+            exit('没有报表参数');
+        }
+        //获取报表信息
+        $signmsg = $this->sign->getOneSignbysid($this->params['sid']);
+        if(empty($signmsg) || $signmsg['isinter'] != 3){
+            exit('不存在此中间计量表');
+        }
+
+        $backurl = '/rproject/'.$signmsg['project'].'/section/'.$signmsg['tender'].'/intermediate';
+        //获取项目名，标段名，标段期数
+        $project = $this->project->getRowByPid($signmsg['project']);
+        $tender = $this->actmeasure->getRowByPmid($signmsg['tender']);
+//        $phaseno = $this->numofperact->getCurrStatus($signmsg['phaseno']);
+
+        $signmsg['project'] = $project['pname'];
+        $signmsg['tender'] = $tender['pmname'];
+//        $signmsg['phaseno'] = $phaseno['numpname'];
+
+        //获取签署人列表
+        $signauditlist = $this->sign->getSignAuditList($this->params['sid']);
+        if(!empty($signauditlist)){
+            foreach($signauditlist as $k => $v){
+                //获取签署人头像
+                $signauditlist[$k]['index'] = $k+1;
+                $signauditlist[$k]['avatar'] = $this->auth->getAvatar($v['audituid']);
+            }
+        }
+
+        //获取报表图片
+        $maxwidth = 794; //默认图片最大宽度   a4
+        $maxheight = 1123; //默认图片最大高度  a4
+        if(!empty($signmsg['widhei'])){
+            $widhei = explode('_', $signmsg['widhei']);
+            $style = $widhei[0].'mm '.$widhei[1].'mm';
+        }else{
+            $style = '210mm 297mm';
+        }
+        $signattlist = $this->sign->getSignAttList($this->params['sid']);
+        if(!empty($signattlist)){
+            foreach($signattlist as $sak => $sav){
+                $signattlist[$sak]['auditatt'] = $this->sign->getSignAuditAttList($sav['said']);
+                if($sak == 0){
+                    $imgmsg = getimagesize(Doo::conf()->APP_URL.$sav['filepath']);
+                    $maxwidth = $imgmsg[0];
+                    $maxheight = $imgmsg[1];
+                }
+            }
+        }
+
+        $this->data['signmsg'] = $signmsg;
+        $this->data['auditlist'] = $signauditlist;
+        $this->data['attlist'] = $signattlist;
+        $this->data['backurl'] = $backurl;
+        $this->data['maxwidth'] = $maxwidth;
+        $this->data['maxheight'] = $maxheight;
+        $this->data['style'] = $style;
+
+        $this->render('sign-view-page', $this->data, TRUE);
+    }
+
 }
 
 ?>

protected/controller/SProjectController.php

@@ -77,10 +77,22 @@ class SProjectController extends DooController
         if($this->data['signSwitch'] > 0)
             $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
+        //获取桌面版本
+        $this->getsoftware();
+
         //草图入口
         $this->data['imediateSwitch'] = $this->aconfig->getOne(array('select' => 'imediateswitch', 'asArray' => TRUE))['imediateswitch'];
     }
 
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
+    }
+
     public function index()
     {
         $this->data['conArray'] = NULL;
@@ -105,6 +117,7 @@ class SProjectController extends DooController
                 }
                 $this->data['conArray'][$k]['bcontracttotal'] = number_format($this->data['conArray'][$k]['contracttotal'], 2, '.', ',');
                 $this->data['conArray'][$k]['bchangTotal'] = number_format($this->data['conArray'][$k]['changTotal'], 2, '.', ',');
+                $this->data['conArray'][$k]['index'] = $k%8+1;
             }
         }
         $this->render('s-project', $this->data, TRUE);
@@ -123,14 +136,23 @@ class SProjectController extends DooController
 
     public function proSection()
     {
+        $this->data['currproArray'] = $this->data['allproArray'] = NULL;
         $proArray = $this->actmeasure->getGroupProject($this->auth->getUid());
         foreach ($proArray as $v) {
             $pidArray[] = $v['pid'];
         }
         $pidstr = implode(',', $pidArray);
         // 项目名称
-        $this->data['allproArray'] = $this->project->getFewRow($pidstr);
-        $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
+        $allproArray = $this->project->getFewRow($pidstr);
+        // 面包屑导航项目
+        foreach ($allproArray as $kk => $vv) {
+            if ($vv['pid'] == $this->params['pid']) {
+                $this->data['currproArray'] = $vv;
+            } else {
+                $this->data['allproArray'][] = $vv;
+            }
+        }
+
         // 标段按月进度
 //        for ($i = 1; $i <= 7; $i++) {
 //            $monthz[] = date('n月', strtotime('+' . $i . ' months', $this->data['currproArray']['intime']));
@@ -429,8 +451,14 @@ class SProjectController extends DooController
 
         // 面包屑导航项目
         $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
+        $proArray = $this->actmeasure->getGroupProject($this->auth->getUid());
+        foreach ($proArray as $v) {
+            $pidArray[] = $v['pid'];
+        }
+        $pidstr = implode(',', $pidArray);
+        // 项目名称
+        $allproArray = $this->project->getFewRow($pidstr);
+        // 面包屑导航项目
         foreach ($allproArray as $kk => $vv) {
             if ($vv['pid'] == $this->params['pid']) {
                 $this->data['currproArray'] = $vv;
@@ -456,7 +484,6 @@ class SProjectController extends DooController
 // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-//        $actmeasureArray = $this->actmeasure->getAll();
         $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
@@ -545,8 +572,14 @@ class SProjectController extends DooController
 
         // 面包屑导航项目
         $this->data['currproArray'] = $this->data['allproArray'] = NULL;
-        $this->data['pmid'] = $this->params['pmid'];
-        $allproArray = $this->project->getAll();
+        $proArray = $this->actmeasure->getGroupProject($this->auth->getUid());
+        foreach ($proArray as $v) {
+            $pidArray[] = $v['pid'];
+        }
+        $pidstr = implode(',', $pidArray);
+        // 项目名称
+        $allproArray = $this->project->getFewRow($pidstr);
+        // 面包屑导航项目
         foreach ($allproArray as $kk => $vv) {
             if ($vv['pid'] == $this->params['pid']) {
                 $this->data['currproArray'] = $vv;
@@ -572,7 +605,6 @@ class SProjectController extends DooController
 // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-//        $actmeasureArray = $this->actmeasure->getAll();
         $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
@@ -680,7 +712,6 @@ class SProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-//        $actmeasureArray = $this->actmeasure->getAll();
         $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {

protected/controller/ShareController.php

@@ -230,9 +230,9 @@ class ShareController extends DooController
 					<td class="taR">￥' . $totalmoney . '</td>
 					<td>
 					    <div class="progress">
-						<div class="bar bar-success" style="width: ' . $displayPercentSnTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
-						<div class="bar" style="width:' . $displayPercentCurrTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
-						<div class="bar bar-gary" style="width:' . $displayPercentLessTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
+						<div class="progress-bar progress-bar-success" style="width: ' . $displayPercentSnTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
+						<div class="progress-bar" style="width:' . $displayPercentCurrTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
+						<div class="progress-bar progress-bar-gary" style="width:' . $displayPercentLessTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
 					    </div>
 					</td>
 				    </tr>';
@@ -254,8 +254,8 @@ class ShareController extends DooController
 					<td width="150"><span aria-hidden="true" data-icon="u"></span> ' . $v['stname'] . '<a id="idt_' . $v['stid'] . '" href="#secoption" data-toggle="modal" title="编辑/查看KEY" stid="' . $v['stid'] . '" proname="' . $v['stname'] . '" key="' . $v['stkey'] . '"><span data-icon="S" aria-hidden="true" class="closePanel" data-placement="bottom" data-toggle="tooltip" data-original-title="查看KEY" style="font-size:18px"></span></a></td>
 					<td width="90">总价：</td><td width="165">￥<b style="font-size:16px">' . $biaoduantotalmoney . '</b></td>
 					<td width="60">完成进度：</td><td><div class="progress">
-						<div class="bar bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
-						<div class="bar bar-danger" style="width:' . $otherprogress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
+						<div class="progress-bar progress-bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
+						<div class="progress-bar progress-bar-danger" style="width:' . $otherprogress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
 					    </div></td>
 				    </tr>
 				</thead>

protected/controller/SignController.php

@@ -76,6 +76,17 @@ class SignController extends DooController
         //获取需要您签署的数目
         $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
+        //获取桌面版本
+        $this->getsoftware();
+    }
+
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
     }
 
     /**

protected/controller/UserController.php

@@ -13,6 +13,8 @@ Doo::loadClass('sms');
 Doo::loadModelAt('aconfig', 'admin');
 Doo::loadClass('measureauditact');
 Doo::loadClass('sign');
+Doo::loadClass('phpqrcode');
+Doo::loadClass('Hashids/Hashids');
 /* * proDetail
  * MainController
  * Feel free to delete the methods and replace them with your own code.
@@ -23,7 +25,7 @@ Doo::loadClass('sign');
 class UserController extends DooController
 {
 
-    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $numofperact, $user, $ph, $sms, $aconfig;
+    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $numofperact, $user, $ph, $sms, $aconfig, $__hashids;
 
     public function beforeRun($resource, $action)
     {
@@ -57,8 +59,9 @@ class UserController extends DooController
         $this->aconfig = new AConfig();
         $this->measureauditact = new MeasureauditAct();
         $this->sign = new signn();
+        $this->__hashids = new Hashids\Hashids('jlzfuserid', 8);
         $this->data['rootUrl'] = Doo::conf()->APP_URL;
-        $this->data['currChannle'] = 'p';
+        $this->data['currChannle'] = '';
         $this->data['user'] = $this->profile->getProWithUid($this->auth->getUid());
         $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         if (isset($mpidArray[0]['pid'])) {
@@ -77,6 +80,18 @@ class UserController extends DooController
         if($this->data['signSwitch'] > 0)
             $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
+        //获取桌面版本
+        $this->data['version'] = '';
+        $this->getsoftware();
+    }
+
+    function getsoftware(){
+        $StrJson = ($this->aconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
+        $upgradeinfo = json_decode($StrJson, true);
+        if ($upgradeinfo) {
+            $this->data['version'] = $upgradeinfo['version'];
+            $this->data['download'] = $upgradeinfo['download'];
+        }
     }
 
     /**
@@ -551,9 +566,53 @@ class UserController extends DooController
     }
 
     public function appdownload(){
+        $token = $this->auth->getWebToken($this->auth->getUid());
+        if($token == ''){
+            exit('token不存在或已过期，请重新登录 '.DOO::conf()->APP_URL);
+        }
+        //加密uid
+        $uid = $this->__hashids->encode($this->auth->getUid());
+
+        $content = Doo::conf()->APP_URL.'api/app/scan/validate?user='.$uid.'&token='.$token;
+
+        $qrcodeurl = 'global/qrcode/';
+        $filepath = $qrcodeurl.'qrcode_'.$uid.'.png';
+
+        $this->codemake($content,$filepath);
+        $this->data['qrcode'] = $filepath;
         $this->render('edit-app', $this->data, TRUE);
     }
 
+    function codemake($content,$filepath){
+        $value = $content;//二维码内容
+        $errorCorrectionLevel = 'H';//容错级别
+        $matrixPointSize = 3;//生成图片大小
+
+//生成二维码图片
+        QRcode::png($value, $filepath, $errorCorrectionLevel, $matrixPointSize,0);
+//        $logo = 'jb51.png';//准备好的logo图片
+//        $QR = 'qrcode.png';//已经生成的原始二维码图
+//
+//        if ($logo !== FALSE) {
+//            $QR = imagecreatefromstring(file_get_contents($QR));
+//            $logo = imagecreatefromstring(file_get_contents($logo));
+//            $QR_width = imagesx($QR);//二维码图片宽度
+//            $QR_height = imagesy($QR);//二维码图片高度
+//            $logo_width = imagesx($logo);//logo图片宽度
+//            $logo_height = imagesy($logo);//logo图片高度
+//            $logo_qr_width = $QR_width / 5;
+//            $scale = $logo_width/$logo_qr_width;
+//            $logo_qr_height = $logo_height/$scale;
+//            $from_width = ($QR_width - $logo_qr_width) / 2;
+//            //重新组合图片并调整大小
+//            imagecopyresampled($QR, $logo, $from_width, $from_width, 0, 0, $logo_qr_width,
+//                $logo_qr_height, $logo_width, $logo_height);
+//        }
+//输出图片
+//        Header("Content-type: image/png");
+//        ImagePng($QR);
+    }
+
 }
 
 ?>

protected/model/utoken.php

@@ -0,0 +1,28 @@
+<?php
+
+Doo::loadCore('db/DooModel');
+
+/**
+ * 用户表
+ */
+class Utoken extends DooModel
+{
+
+    public $id;
+    public $uid;
+    public $token;
+    public $addtime;
+    public $endtime;
+    public $comefrom;
+    public $_table = 'jl_user_token';
+    public $_primarykey = 'id';
+    public $_fields = array('id', 'uid', 'token', 'addtime', 'endtime', 'comefrom');
+
+    public function __construct()
+    {
+        parent::setupModel(__CLASS__);
+    }
+
+}
+
+?>

protected/module/admin/controller/ItemController.php

@@ -60,7 +60,7 @@ class ItemController extends DooController {
                     $this->mailer->setEmails($_POST['email']);
                     $this->mailer->seteTitle('新账号开通');
                     $this->mailer->setClientName($postArray['realname']);
-                    $signupConfigStr = '<p>开通了计量支付云版的帐号：</p><p>登录帐号（邮箱）：<b><a href="mailto:' . $_POST['email'] . '" target="_blank">' . $_POST['email'] . '</a></b></p><p>登录密码：<b>' . $passwdStr . '</b></p><p>请及时登录并修改您的个人信息及密码。</p>';
+                    $signupConfigStr = '<p>开通了计量支付云版的帐号：</p><p>登录帐号（邮箱）：<b><a href="mailto:' . $_POST['email'] . '" target="_blank">' . $_POST['email'] . '</a></b></p><p>登录密码：<b>' . $passwdStr . '</b></p><p>请及时登录并修改您的个人信息及密码。</p><p><b style="font-size:20px">登录云端，下载桌面软件：</b><br><a href="'.Doo::conf()->APP_URL.'" style="font-size:20px">'.Doo::conf()->APP_URL.'</a></p>';
                     $this->mailer->setContent($signupConfigStr);
                     $this->mailer->send_mail();
                     return Doo::conf()->APP_URL . 'manage/user/list';

protected/module/admin/controller/LoginController.php

@@ -43,8 +43,8 @@ class LoginController extends DooController {
                     setcookie('token', $_SESSION['token'], 0, '/', Doo::conf()->APP_URL, FALSE, TRUE);
                     return Doo::conf()->APP_URL . 'manage/user/list';
                 } else {
-                    $this->data['tips'] = '<div class="alert alert-error">
-			    <span data-icon="t" aria-hidden="true"></span> 帐号不存在或者密码错误
+                    $this->data['tips'] = '<div class="alert alert-danger">
+			    <span data-icon="t" aria-hidden="true"></span> 帐号不存在或者密码错误。
 			</div>';
 //		    die();
                 }

protected/module/admin/view/admin-addUser.html

@@ -24,48 +24,48 @@
                     <form class="form-horizontal" method="post">
                         <fieldset>
                             <legend>添加用户</legend>
-                            <div class="control-group">
-                                <label class="control-label">邮箱（登录使用）</label>
-                                <div class="controls">
-                                    <input type="text" name="email" placeholder="登录系统、找回密码和接收通知">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">邮箱（登录使用）</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="email" placeholder="登录系统、找回密码和接收通知">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">单位（公司）</label>
-                                <div class="controls">
-                                    <input type="text" name="company" placeholder="用户所在单位或公司">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">单位（公司）</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="company" placeholder="用户所在单位或公司">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">职位</label>
-                                <div class="controls">
-                                    <input type="text" name="jobs" placeholder="用户在所单位（公司）职位">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">职位</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="jobs" placeholder="用户在所单位（公司）职位">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">姓名</label>
-                                <div class="controls">
-                                    <input type="text" name="realname" placeholder="输入真实姓名">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">姓名</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="realname" placeholder="输入真实姓名">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">联系电话</label>
-                                <div class="controls">
-                                    <input type="text" name="phone" placeholder="输入电话号码，0000-0000000">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">联系电话</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="phone" placeholder="输入电话号码，0000-0000000">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">备注</label>
-                                <div class="controls">
-                                    <input type="text" name="remark" placeholder="输入备注信息">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">备注</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" name="remark" placeholder="输入备注信息">
                                 </div>
                             </div>
                             <div class="alert alert-info">
                                 添加成功后，系统将会发送一封确认邮件给该用户，邮件中将包含登录密码。
                             </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label"></label>
+                                <div class="col-sm-3">
                                     <input name="submit" type="submit" class="btn btn-normal btn-primary" value="确定添加" />
                                 </div>
                             </div>

protected/module/admin/view/admin-editUser.html

@@ -30,97 +30,97 @@
             <form class="form-horizontal" method="post" enctype="multipart/form-data">
                 <fieldset>
                     <legend>编辑用户</legend>
-                    <div class="control-group">
-                        <label class="control-label">邮箱（登录使用）</label>
-                        <div class="controls">
-                            <input type="text" name="email" value="{{users.uemail}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">邮箱（登录使用）</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="email" value="{{users.uemail}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">单位（公司）</label>
-                        <div class="controls">
-                            <input type="text" name="company" value="{{profile.company}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">单位（公司）</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="company" value="{{profile.company}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">职位</label>
-                        <div class="controls">
-                            <input type="text" name="jobs" value="{{profile.jobs}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">职位</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="jobs" value="{{profile.jobs}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">姓名</label>
-                        <div class="controls">
-                            <input type="text" name="name" value="{{profile.name}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="name" value="{{profile.name}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">联系电话</label>
-                        <div class="controls">
-                            <input type="text" name="phone" value="{{profile.phone}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">联系电话</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="phone" value="{{profile.phone}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">备注</label>
-                        <div class="controls">
-                            <input type="text" name="remark" value="{{profile.remark}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" name="remark" value="{{profile.remark}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">短信通知</label>
-                        <div class="controls">
-                            <input type="text" disabled="disabled" value="{{profile.mobile}}">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">短信通知</label>
+                        <div class="col-sm-3">
+                            <input class="form-control" type="text" disabled="disabled" value="{{profile.mobile}}">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label">电子签名</label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">电子签名</label>
+                        <div class="col-sm-3">
                             <img id="signpic" src="{{rootUrl}}{{profile.signpath}}" width="150px"> <a href="#addsign" data-toggle="modal">更新</a>
                         </div>
                     </div>
-                    <div class="alert alert-error">
+                    <div class="alert alert-danger">
                         <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
                     </div>
-                    <div class="control-group">
-                        <label class="control-label"></label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label"></label>
+                        <div class="col-sm-3">
                             <input type="submit" class="btn btn-normal btn-danger" value="完成编辑"/>
                         </div>
                     </div>
                 </fieldset>
                 <!-- 更新签名 -->
-                <div id="addsign" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3 id="myModalLabel">更新电子签名</h3>
-                    </div>
-                    <div class="modal-body">
-
-                        <div class="form">
-                            <form class="form-horizontal">
-                                <div class="control-group">
-                                    <label class="control-label">上传签名图</label>
-                                    <div class="controls">
-                                        <input type="file" name="sign" id="uploadsign" value="" accept="image/png">
-                                    </div>
-                                </div>
-                                <div class="control-group">
-                                    <label class="control-label"></label>
-                                    <div class="controls text-error">为保证效果，请上传600x300，png格式透明背景签名图</div>
+                <div id="addsign" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                                <h4 class="modal-title">更新电子签名</h4>
+                            </div>
+                            <div class="modal-body">
+                                <div class="form">
+                                    <form class="form-horizontal">
+                                        <div class="form-group">
+                                            <label class="col-sm-2 control-label">上传签名图</label>
+                                            <div class="col-sm-10">
+                                                <input type="file" name="sign" id="uploadsign" value="" accept="image/png">
+                                                <p class="text-danger"><span class="glyphicon glyphicon-warning-sign"></span> 上传签名图大小为：600 x 300</p>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label class="col-sm-2 control-label">生成签名图</label>
+                                            <div class="col-sm-10">
+                                                <p class="help-block"><a href="http://sign.6jlzf.cn" target="_blank" class="btn btn-default">打开 HWPenSign</a></p>
+                                            </div>
+                                        </div>
+                                    </form>
                                 </div>
-                                <div class="control-group">
-                                    <label class="control-label">生成签名图</label>
-                                    <div class="controls">
-                                        <a href="http://sign.6jlzf.cn" target="_blank" class="btn">打开 HWPenSign</a>
-                                    </div>
-                                </div>
-                            </form>
+                            </div>
+                            <div class="modal-footer">
+                                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                                <button class="btn btn-primary" sign-url="" id="updatesignbtn" data-dismiss="modal" aria-hidden="true">更新</button>
+                            </div>
                         </div>
                     </div>
-                    <div class="modal-footer">
-                        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-                        <button class="btn btn-primary" sign-url="" id="updatesignbtn" data-dismiss="modal" aria-hidden="true">更新</button>
-                    </div>
                 </div>
                 <!-- 更新签名 -->
             </form>

protected/module/admin/view/admin-intermediate.html

@@ -25,18 +25,18 @@
 			<fieldset>
 				<legend>中间计量草图</legend>
 				<!--软件生成报表-->
-				<div class="control-group">
-					<label class="control-label">中间计量草图功能</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-2 control-label">中间计量草图功能</label>
+					<div class="col-sm-3">
 						<!-- if {{imediateswitch}} == 0 -->
 						<div class="btn-group">
-							<button class="btn" data-status="on" title="开启中间计量草图">开启</button>
+							<button class="btn btn-default" data-status="on" title="开启中间计量草图">开启</button>
 							<button class="btn btn-danger disabled" data-status="off" disabled="disabled">已关闭</button>
 						</div>
 						<!-- else -->
 						<div class="btn-group">
-							<button class="btn btn-success  disabled" data-status="on"  disabled="disabled">已开启</button>
-							<button class="btn" data-status="off" title="关闭">关闭</button>
+							<button class="btn btn-success disabled" data-status="on"  disabled="disabled">已开启</button>
+							<button class="btn btn-default" data-status="off" title="关闭">关闭</button>
 						</div>
 						<!-- endif -->
 						<a data-toggle="modal" href="#help1">帮助</a>
@@ -48,32 +48,36 @@
 </div>
 </div>
 <!-- 帮助1弹出 -->
-<div id="help1" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-body">
-		<div class="alert alert-info">
-			此开关用于开启关闭中间计量草图功能入口
-		</div>
-		<div>
-			<img src="{{rootUrl}}global/images/intermediate-help1.png">
-			<img src="{{rootUrl}}global/images/intermediate-help2.png">
+<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="{{rootUrl}}global/images/intermediate-help1.png">
+					<img src="{{rootUrl}}global/images/intermediate-help2.png">
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+			</div>
 		</div>
 	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-	</div>
 </div>
 <script type="text/javascript">autoFlashHeight();</script>
 <script>
 	$(function(){
-		$('.control-group .btn').on('click',function(){
+		$('.form-group .btn').on('click',function(){
 			var status = $(this).attr('data-status').split("_");
 			if(!$(this).hasClass('disabled')){
 				if(status[0] == 'on'){
-					$(this).addClass('btn-success').text('已开启');
-					$(this).siblings('button').removeClass('btn-danger').text('关闭');
+					$(this).addClass('btn-success').removeClass('btn-default').text('已开启');
+					$(this).siblings('button').removeClass('btn-danger').addClass('btn-default').text('关闭');
 				}else{
-					$(this).addClass('btn-danger').text('已关闭');
-					$(this).siblings('button').removeClass('btn-success').text('开启');
+					$(this).addClass('btn-danger').removeClass('btn-default').text('已关闭');
+					$(this).siblings('button').removeClass('btn-success').addClass('btn-default').text('开启');
 				}
 				$(this).addClass('disabled').attr('disabled', true);
 				$(this).siblings('button').removeClass('disabled').attr('disabled',false);

protected/module/admin/view/admin-item.html

@@ -59,17 +59,21 @@
             </div>
         </div>
         <!--重置密码-->
-        <div class="modal hide fade" id="sendpw">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h3>重置密码成功</h3>
-            </div>
-            <div class="modal-body">
-                <p>系统已将新密码发送至该用户的登录邮箱：<b id="email"></b></p>
-                <p>如果长时间无法接收到邮件，请确认该邮箱是否可以正常接收邮件；</p>
-                <p>添加 postmaster@zhzd.sendcloud.org 至邮箱白名单，再重新操作<b>重置密码</b>。</p>
-            </div>
-            <div class="modal-footer">
+        <div class="modal fade" id="sendpw">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                        <h4 class="modal-title">重置密码成功</h4>
+                    </div>
+                    <div class="modal-body">
+                        <p>系统已将新密码发送至该用户的登录邮箱：<b id="email"></b></p>
+                        <p>如果长时间无法接收到邮件，请确认该邮箱是否可以正常接收邮件；</p>
+                        <p>添加 postmaster@zhzd.sendcloud.org 至邮箱白名单，再重新操作<b>重置密码</b>。</p>
+                    </div>
+                    <div class="modal-footer">
+                    </div>
+                </div>
             </div>
         </div>
         <!--重置密码-->

protected/module/admin/view/admin-login.html

@@ -20,18 +20,33 @@
             <div class="loginPanel">
                 <form method="post">
                     <input type="hidden" name="tokenform" value="{{_token_}}" />
-                    <div  class="tpa"><b>管理后台</b></div>
+                    <!--<div  class="tpa"><b>管理后台</b></div>-->
+                    <!--<div class="clearfix">-->
+                        <!--<div class="fL">-->
+                            <!--<img src="{{rootUrl}}global/images/avatar-normal.png">-->
+                        <!--</div>-->
+                        <!--<div class="fR">-->
+                            <!--<div><input type="text" name="muser" placeholder="输入管理员帐号" /></div>-->
+                            <!--<input type="password" name="mpasswd" placeholder="密码" />-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <div  class="tpa"><h4>管理后台</h4></div>
                     <div class="clearfix">
-                        <div class="fL">
-                            <img src="{{rootUrl}}global/images/avatar-normal.png">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
+                                <input class="form-control input-lg" placeholder="输入管理员帐号" type="text" name="muser">
+                            </div>
                         </div>
-                        <div class="fR">
-                            <div><input type="text" name="muser" placeholder="输入管理员帐号" /></div>
-                            <input type="password" name="mpasswd" placeholder="密码" />
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
+                                <input class="form-control input-lg" placeholder="输入密码" type="password" name="mpasswd">
+                            </div>
                         </div>
                     </div>
                     <div class="clearfix">
-                        <input type="submit" class="btn btn-normal btn-block btn-warning" href="admin-userlist.html" value="登录后台"/>
+                        <input type="submit" class="btn btn-normal btn-block btn-warning" value="登录后台"/>
                         {{tips}}
                     </div>
                 </form>

protected/module/admin/view/admin-option.html

@@ -23,33 +23,33 @@
                     <form class="form-horizontal" method="post">
                         <fieldset>
                             <legend>修改管理员密码</legend>
-                            <div class="control-group">
-                                <label class="control-label">管理员</label>
-                                <div class="controls">
-                                    <input type="text" value="{{auser.auname}}" disabled>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">管理员</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" value="{{auser.auname}}" disabled>
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">旧密码</label>
-                                <div class="controls">
-                                    <input type="password" name="oldpasswd" placeholder="输入您当前管理员登录密码">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">旧密码</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="password" name="oldpasswd" placeholder="输入您当前管理员登录密码">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">新密码</label>
-                                <div class="controls">
-                                    <input type="password" name="newpasswd" placeholder="输入您需要设置的新密码">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">新密码</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="password" name="newpasswd" placeholder="输入您需要设置的新密码">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">确认新密码</label>
-                                <div class="controls">
-                                    <input type="password" name="renewpasswd" placeholder="再次输入您的新密码">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">确认新密码</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="password" name="renewpasswd" placeholder="再次输入您的新密码">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
+                            <div class="fotm-group">
+                                <label class="col-sm-2 control-label"></label>
+                                <div class="col-sm-3">
                                     <input type="submit" type="button" class="btn btn-normal btn-primary" value="修改" />
                                 </div>
                             </div>

protected/module/admin/view/admin-period.html

@@ -101,78 +101,98 @@
     </div>
 </div>
 <!--不通过-->
-<div class="modal hide fade" id="unpass">
-    <input id="maid" name="maid" value="0" type="hidden"/>
-    <input id="mpid" name="mpid" value="0" type="hidden"/>
-    <input id="numpname" name="numpname" value="0" type="hidden"/>
-    <input id="times" name="times" value="0" type="hidden"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>设置审批不通过</h3>
-    </div>
-    <div class="modal-body">
-        <p>确认是否设置该审批人审批状态为审批不通过？</p>
-    </div>
-    <div class="modal-footer">
-        <button id="btnunpass" class="btn btn-danger">确认</button>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="unpass">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input id="maid" name="maid" value="0" type="hidden"/>
+            <input id="mpid" name="mpid" value="0" type="hidden"/>
+            <input id="numpname" name="numpname" value="0" type="hidden"/>
+            <input id="times" name="times" value="0" type="hidden"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">设置审批不通过</h4>
+            </div>
+            <div class="modal-body">
+                <p>确认是否设置该审批人审批状态为审批不通过？</p>
+            </div>
+            <div class="modal-footer">
+                <button id="btnunpass" class="btn btn-danger">确认</button>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--通过-->
-<div class="modal hide fade" id="pass">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>设置审批通过</h3>
-    </div>
-    <div class="modal-body">
-        <p>确认是否设置该审批人审批状态为审批通过？</p>
-    </div>
-    <div class="modal-footer">
-        <button id="btnpass" class="btn btn-success">确认</button>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="pass">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">设置审批通过</h4>
+            </div>
+            <div class="modal-body">
+                <p>确认是否设置该审批人审批状态为审批通过？</p>
+            </div>
+            <div class="modal-footer">
+                <button id="btnpass" class="btn btn-success">确认</button>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--审批中-->
-<div class="modal hide fade" id="checking">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>设置审批中</h3>
-    </div>
-    <div class="modal-body">
-        <p>确认是否设置该审批人审批状态为审批中？</p>
-    </div>
-    <div class="modal-footer">
-        <button id="btnchecking" class="btn btn-warning">确认</button>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="checking">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">设置审批中</h4>
+            </div>
+            <div class="modal-body">
+                <p>确认是否设置该审批人审批状态为审批中？</p>
+            </div>
+            <div class="modal-footer">
+                <button id="btnchecking" class="btn btn-warning">确认</button>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除本期-->
-<div class="modal hide fade" id="delperiod">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除本期#<span class="times"></span></h3>
-    </div>
-    <div class="modal-body">
-        <p>删除本期#<span class="times"></span>（第<span class="times"></span>次审批）后，将退回至上一次审批。</p>
-        <p>当#1被删除后，将退回至上一期。</p>
-        <p>确认是否删除第<span id="nums"></span>期#<span class="times"></span>？</p>
-    </div>
-    <div class="modal-footer">
-        <button id="btndelete" class="btn btn-danger">确认</button>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="delperiod">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除本期#<span class="times"></span></h4>
+            </div>
+            <div class="modal-body">
+                <p>删除本期#<span class="times"></span>（第<span class="times"></span>次审批）后，将退回至上一次审批。</p>
+                <p>当#1被删除后，将退回至上一期。</p>
+                <p>确认是否删除第<span id="nums"></span>期#<span class="times"></span>？</p>
+            </div>
+            <div class="modal-footer">
+                <button id="btndelete" class="btn btn-danger">确认</button>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除本标段第一期第一次时不可删除-->
-<div class="modal hide fade" id="delperiod2">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除本期#<span class="times"></span>确认</h3>
-    </div>
-    <div class="modal-body">
-        <p>当前标段下为第1期#1审批，不能删除本期，但可返回上一层删除这个标段。</p>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">关闭</button>
+<div class="modal fade" id="delperiod2">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除本期#<span class="times"></span>确认</h4>
+            </div>
+            <div class="modal-body">
+                <p>当前标段下为第1期#1审批，不能删除本期，但可返回上一层删除这个标段。</p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 

protected/module/admin/view/admin-project.html

@@ -52,33 +52,41 @@
 </div>
 
 <!--删除标段不可删除-->
-<div class="modal hide fade" id="delpoj">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除项目确认</h3>
-    </div>
-    <div class="modal-body">
-        <p>项目下还有标段类型，不能删除该项目。</p>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">关闭</button>
+<div class="modal fade" id="delpoj">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>删除项目确认</h3>
+            </div>
+            <div class="modal-body">
+                <p>项目下还有标段类型，不能删除该项目。</p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除标段可删除-->
-<div class="modal hide fade" id="delpoj2">
-    <input id="pid" type="hidden" value="0" name="pid"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除项目确认</h3>
-    </div>
-    <div class="modal-body">
-        <p id="tip"></p>
-        <p>删除后，将无法恢复。</p>
-        <p>请谨慎操作！</p>
-    </div>
-    <div class="modal-footer">
-        <a id="delproject" class="btn btn-danger">确认</a>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="delpoj2">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input id="pid" type="hidden" value="0" name="pid"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除项目确认</h4>
+            </div>
+            <div class="modal-body">
+                <p id="tip"></p>
+                <p>删除后，将无法恢复。</p>
+                <p>请谨慎操作！</p>
+            </div>
+            <div class="modal-footer">
+                <a id="delproject" class="btn btn-danger">确认</a>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <script type="text/javascript">autoFlashHeight();</script>

protected/module/admin/view/admin-restore.html

@@ -51,7 +51,7 @@
         <div class="modal hide fade" id="sendpw">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h3>重置密码成功</h3>
+                <h4 class="modal-title">重置密码成功</h4>
             </div>
             <div class="modal-body">
                 <p>系统已将新密码发送至该用户的登录邮箱：<b id="email"></b></p>

protected/module/admin/view/admin-section.html

@@ -60,63 +60,79 @@
     </div>
 </div>
 <!--删除标段不可删除-->
-<div class="modal hide fade" id="delsection">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除标段确认</h3>
-    </div>
-    <div class="modal-body">
-        <p>标段下还有期数，不能删除该标段。</p>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">关闭</button>
+<div class="modal fade" id="delsection">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除标段确认</h4>
+            </div>
+            <div class="modal-body">
+                <p>标段下还有期数，不能删除该标段。</p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除本期-->
-<div class="modal hide fade" id="delsection2">
-    <input id="pmid" type="hidden" name="pmid" value="0"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除标段确认</h3>
-    </div>
-    <div class="modal-body">
-        <p id="tippro"></p>
-        <p>删除后，将无法恢复。</p>
-        <p>请谨慎操作！</p>
-    </div>
-    <div class="modal-footer">
-        <a id="delsecok" class="btn btn-danger">确认</a>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="delsection2">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input id="pmid" type="hidden" name="pmid" value="0"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除标段确认</h4>
+            </div>
+            <div class="modal-body">
+                <p id="tippro"></p>
+                <p>删除后，将无法恢复。</p>
+                <p>请谨慎操作！</p>
+            </div>
+            <div class="modal-footer">
+                <a id="delsecok" class="btn btn-danger">确认</a>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除标段不可删除-->
-<div class="modal hide fade" id="deltype">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除标段类型确认</h3>
-    </div>
-    <div class="modal-body">
-        <p>标段类型下还有标段，不能删除该标段类型。</p>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">关闭</button>
+<div class="modal fade" id="deltype">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除标段类型确认</h4>
+            </div>
+            <div class="modal-body">
+                <p>标段类型下还有标段，不能删除该标段类型。</p>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!--删除标段可删除-->
-<div class="modal hide fade" id="deltype2">
-    <input id="stid" type="hidden" name="stid" value="0"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>删除标段类型确认</h3>
-    </div>
-    <div class="modal-body">
-        <p id="tip"></p>
-        <p>删除后，将无法恢复。</p>
-        <p>请谨慎操作！</p>
-    </div>
-    <div class="modal-footer">
-        <a id="deltypeok"  class="btn btn-danger">确认</a>
-        <button class="btn" data-dismiss="modal">取消</button>
+<div class="modal fade" id="deltype2">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input id="stid" type="hidden" name="stid" value="0"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">删除标段类型确认</h4>
+            </div>
+            <div class="modal-body">
+                <p id="tip"></p>
+                <p>删除后，将无法恢复。</p>
+                <p>请谨慎操作！</p>
+            </div>
+            <div class="modal-footer">
+                <a id="deltypeok"  class="btn btn-danger">确认</a>
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
     </div>
 </div>
 

protected/module/admin/view/admin-sign.html

@@ -25,18 +25,18 @@
 			<fieldset>
 				<legend>在线签署</legend>
 				<!--软件生成报表-->
-				<div class="control-group">
-					<label class="control-label">软件生成报表</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-2 control-label">软件生成报表</label>
+					<div class="col-sm-3">
 						<!-- if {{reportSwitch}} == 0 -->
 						<div class="btn-group">
-							<button class="btn" data-status="open_report" title="开启在线签署">开启</button>
+							<button class="btn btn-default" data-status="open_report" title="开启在线签署">开启</button>
 							<button class="btn btn-danger disabled" data-status="close_report" disabled="disabled">已关闭</button>
 						</div>
 						<!-- else -->
 						<div class="btn-group">
 							<button class="btn btn-success  disabled" data-status="open_report"  disabled="disabled">已开启</button>
-							<button class="btn" data-status="close_report" title="开启在线">关闭</button>
+							<button class="btn btn-default" data-status="close_report" title="开启在线">关闭</button>
 						</div>
 						<!-- endif -->
 						<a data-toggle="modal" href="#help1">帮助</a>
@@ -44,36 +44,36 @@
 				</div>
 
 				<!--WEB开启在线签署-->
-				<div class="control-group">
-					<label class="control-label">WEB开启在线签署</label>
-					<div class="controls">
+				<div class="form-group">
+					<label class="col-sm-2 control-label">WEB开启在线签署</label>
+					<div class="col-sm-3">
 						<!-- if {{signSwitch}} == 0 -->
 						<div class="btn-group">
-							<button class="btn" data-status="open_sign" title="开启在线签署">开启</button>
+							<button class="btn btn-default" data-status="open_sign" title="开启在线签署">开启</button>
 							<button class="btn btn-danger disabled" data-status="close_sign" disabled="disabled">已关闭</button>
 						</div>
 						<!-- else -->
 						<div class="btn-group">
 							<button class="btn btn-success disabled" data-status="open_sign"  disabled="disabled">已开启</button>
-							<button class="btn" data-status="close_sign" title="开启在线">关闭</button>
+							<button class="btn btn-default" data-status="close_sign" title="开启在线">关闭</button>
 						</div>
 						<!-- endif -->
 						<a data-toggle="modal" href="#help2">帮助</a>
 					</div>
 				</div>
 				<!--要先开启 “WEB开启在线签署”-->
-				<div class="control-group" id="launchsign" <!-- if {{signSwitch}} == 0 -->style="display:none"<!-- endif -->>
-					<label class="control-label">WEB开启发起签署</label>
-					<div class="controls">
+				<div class="form-group" id="launchsign" <!-- if {{signSwitch}} == 0 -->style="display:none"<!-- endif -->>
+					<label class="col-sm-2 control-label">WEB开启发起签署</label>
+					<div class="col-sm-3">
 						<!-- if {{launchsignSwitch}} == 0 -->
 						<div class="btn-group">
-							<button class="btn" data-status="open_launch" title="开启在线签署">开启</button>
+							<button class="btn btn-default" data-status="open_launch" title="开启在线签署">开启</button>
 							<button class="btn btn-danger disabled" data-status="close_launch" disabled="disabled">已关闭</button>
 						</div>
 						<!-- else -->
 						<div class="btn-group">
 							<button class="btn btn-success disabled" data-status="open_launch"  disabled="disabled">已开启</button>
-							<button class="btn" data-status="close_launch" title="开启在线">关闭</button>
+							<button class="btn btn-default" data-status="close_launch" title="开启在线">关闭</button>
 						</div>
 						<!-- endif -->
 						<a data-toggle="modal" href="#help3">帮助</a>
@@ -85,63 +85,75 @@
 </div>
 </div>
 <!-- 帮助1弹出 -->
-<div id="help1" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-body">
-		<div class="alert alert-info">
-			此开关用于开启关闭软件功能入口
-		</div>
-		<div>
-			<img src="{{rootUrl}}global/images/sign-help1.png">
+<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="{{rootUrl}}global/images/sign-help1.png">
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+			</div>
 		</div>
 	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-	</div>
 </div>
 <!-- 帮助2弹出 -->
-<div id="help2" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-body">
-		<div class="alert alert-info">
-			此开关用于开启关闭WEB功能入口
-		</div>
-		<div>
-			<img src="{{rootUrl}}global/images/sign-help2.png">
+<div id="help2" 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">
+					此开关用于开启关闭WEB功能入口
+				</div>
+				<div>
+					<img src="{{rootUrl}}global/images/sign-help2.png">
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+			</div>
 		</div>
 	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-	</div>
 </div>
 <!-- 帮助3弹出 -->
-<div id="help3" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-body">
-		<div class="alert alert-info">
-			此开关用于开启关闭发起签署按钮，如果你想关闭在线签署功能，又希望可以查看历史数据，可以开启本项，关闭“软件生成报表”和“WEB开启在线签署。
-			”
-		</div>
-		<div>
-			<img src="{{rootUrl}}global/images/sign-help3.png">
+<div id="help3" 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">
+					此开关用于开启关闭发起签署按钮，如果你想关闭在线签署功能，又希望可以查看历史数据，可以开启本项，关闭“软件生成报表”和“WEB开启在线签署。
+					”
+				</div>
+				<div>
+					<img src="{{rootUrl}}global/images/sign-help3.png">
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+			</div>
 		</div>
 	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-	</div>
 </div>
 <script type="text/javascript">autoFlashHeight();</script>
 <script>
 	$(function(){
-		$('.control-group .btn').on('click',function(){
+		$('.form-group .btn').on('click',function(){
 			var status = $(this).attr('data-status').split("_");
 			if(!$(this).hasClass('disabled')){
 				if(status[0] == 'open'){
-					$(this).addClass('btn-success').text('已开启');
-					$(this).siblings('button').removeClass('btn-danger').text('关闭');
+					$(this).addClass('btn-success').removeClass('btn-default').text('已开启');
+					$(this).siblings('button').removeClass('btn-danger').addClass('btn-default').text('关闭');
 					if(status[1] == 'sign'){
 						$('#launchsign').show();
 					}
 				}else{
-					$(this).addClass('btn-danger').text('已关闭');
-					$(this).siblings('button').removeClass('btn-success').text('开启');
+					$(this).addClass('btn-danger').removeClass('btn-default').text('已关闭');
+					$(this).siblings('button').addClass('btn-default').removeClass('btn-success').text('开启');
 					if(status[1] == 'sign'){
 						$('#launchsign').hide();
 					}

protected/module/admin/view/admin-sysinfo.html

@@ -24,37 +24,37 @@
                     <form class="form-horizontal" method="post" action="/manage/sys/info">
                         <fieldset>
                             <legend>系统信息</legend>
-                            <div class="control-group">
-                                <label class="control-label">云端版本</label>
-                                <div class="controls">
-                                    <input type="text" value="{{ver}}" disabled>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">云端版本</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" value="{{ver}}" disabled>
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">系统名称</label>
-                                <div class="controls">
-                                    <input name="proname" type="text" placeholder="输入系统名称" value="{{proName}}">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">系统名称</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" name="proname" type="text" placeholder="输入系统名称" value="{{proName}}">
                                     <span id="helpBlock" class="help-block">该名称在登录页等位置显示</span>
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">管理员账号</label>
-                                <div class="controls">
-                                    <input type="text" value="{{aname}}" disabled>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">管理员账号</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" type="text" value="{{aname}}" disabled>
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">管理员邮箱</label>
-                                <div class="controls">
-                                    <input name="aemail" type="text" value="{{aemail}}" placeholder="用于找回密码">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">管理员邮箱</label>
+                                <div class="col-sm-3">
+                                    <input class="form-control" name="aemail" type="text" value="{{aemail}}" placeholder="用于找回密码">
                                 </div>
                             </div>
                             <div class="alert alert-info">
                                 邮箱修改成功后，系统将会发送一封确认邮件给该邮箱地址，请确认邮箱可以正常收取邮件。
                             </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label"></label>
+                                <div class="col-sm-3">
                                     <input type="submit" class="btn btn-normal btn-primary" value="修改"/>
                                 </div>
                             </div>

protected/module/admin/view/admin-userlist.html

@@ -70,7 +70,7 @@
 <div class="modal hide fade" id="sendpw">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>重置密码成功</h3>
+        <h4 class="modal-title">重置密码成功</h4>
     </div>
     <div class="modal-body">
         <p>系统已将新密码发送至该用户的登录邮箱：<b id="email"></b></p>

protected/view/edit-app.html

@@ -27,13 +27,33 @@
 			<div class="form">
 				<legend>下载APP</legend>
 				<div class="app-code-item clearfix">
-					<h1>扫码下载</h1>
+					<h1>扫码下载APP</h1>
 					<div class="code-img"><img src="{{rootUrl}}global/images/android-code.png"></div>
+					<br>
+					<h1>APP扫码快捷登录</h1>
+					<div class="code-img"><a class="btn btn-link" data-toggle="modal" href="#app-help"><span class="glyphicon glyphicon-question-sign"></span> 如何快捷登录</a><br><img src="{{rootUrl}}{{qrcode}}"></div>
 				</div>
 			</div>
 		</div>
 		<!--内容-->
 	</div>
 </div>
+<!-- 弹出帮助 -->
+<div class="modal fade" id="app-help" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title" id="myModalLabel">APP扫码登录</h4>
+			</div>
+			<div class="modal-body">
+				<p>自动填写服务器和账号密码</p>
+			</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>

protected/view/edit-profile-pw.html

@@ -27,29 +27,29 @@
 		    <div class="form">
 			<form class="form-horizontal" method="post">
 			    <legend>修改密码</legend>
-			    <div class="control-group">
-				<label class="control-label" for="inputEmail">旧密码</label>
-				<div class="controls">
-				    <input type="password" name="oldpasswd" placeholder="输入您的当前密码">
-				</div>
+				<div class="form-group">
+					<label class="col-sm-1 control-label" for="inputEmail">旧密码</label>
+					<div class="col-sm-2">
+						<input class="form-control" type="password" name="oldpasswd" placeholder="输入您的当前密码">
+					</div>
 			    </div>
-			    <div class="control-group">
-				<label class="control-label" for="inputEmail">新密码</label>
-				<div class="controls">
-				    <input type="password" name="newpasswd" placeholder="输入您的新密码">
-				</div>
+				<div class="form-group">
+					<label class="col-sm-1 control-label" for="inputEmail">新密码</label>
+					<div class="col-sm-2">
+						<input class="form-control" type="password" name="newpasswd" placeholder="输入您的新密码">
+					</div>
 			    </div>
-			    <div class="control-group">
-				<label class="control-label" for="inputEmail">确认新密码</label>
-				<div class="controls">
-				    <input type="password" name="renewpasswd" placeholder="再输入您的新密码">
-				</div>
+				<div class="form-group">
+					<label class="col-sm-1 control-label" for="inputEmail">确认新密码</label>
+					<div class="col-sm-2">
+						<input class="form-control" type="password" name="renewpasswd" placeholder="再输入您的新密码">
+					</div>
 			    </div>
-			    <div class="control-group">
-				<label class="control-label"></label>
-				<div class="controls">
-				    <input type="submit" class="btn btn-primary" value="确定提交" />
-				</div>
+				<div class="form-group">
+					<label class="col-sm-1 control-label"></label>
+					<div class="col-sm-2">
+				    	<input type="submit" class="btn btn-primary" value="确定提交" />
+					</div>
 			    </div>
 			    </fieldset>
 			</form>

protected/view/edit-profile-sms-edit.html

@@ -27,32 +27,34 @@
             <div class="form">
                 <form class="form-horizontal">
                     <legend>短信通知-修改手机</legend>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">当前手机</label>
-                        <div class="controls">
-                            <input type="text" placeholder="{{uprofile.mobile}}" disabled="">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">当前手机</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" placeholder="{{uprofile.mobile}}" disabled="">
                         </div>
                     </div>
-                    <div id="input_error" class="control-group">
-                        <label class="control-label" for="inputEmail">新手机</label>
-                        <div class="controls">
-                            <input id="mobile" name="mobile" type="text" placeholder="输入您的新手机号码"><span id="help-inline"
-                                                                                                       class="help-inline hide"></span>
+                    <div id="input_error" class="form-group">
+                        <label class="col-sm-1 control-label">新手机</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" id="mobile" name="mobile" type="text" placeholder="输入您的新手机号码"><span id="help-inline"
+                                                                                                       class="help-block" style="display: none"></span>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">短信校验码</label>
-                        <div class="controls">
-                            <input type="text" id="verifycode" name="verifycode" placeholder="输入验证码" maxlength="11"
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">短信校验码</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" id="verifycode" name="verifycode" placeholder="输入验证码" maxlength="11"
                                    class="span2">
                             <!--<button class="btn">获取验证码</button>-->
                             <!--<button class="btn" disabled>重新获取 60s</button>-->
-                            <input type="button" class="btn" id="getting" value="获取验证码">
+                        </div>
+                        <div class="col-sm-2">
+                            <input type="button" class="btn btn-default" id="getting" value="获取验证码">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label"></label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label"></label>
+                        <div class="col-sm-2">
                             <i class="icon-ok icon-white"></i><input type="button" id="addMobile"
                                                                      class="btn btn-primary" value="确定修改"/>
                         </div>
@@ -73,14 +75,14 @@
                 dataType: "json",
                 cache: false,
                 data: {"mobile": $(this).val()},
-                url: "{{rootUrl}}user/profile/check/mobile",
+                url: "{{rootUrl}}user/profile/check/mobile"
             }).done(function (data) {
                 if (data['mobile'] > 0) {
-                    $("#input_error").addClass('error');
+                    $("#input_error").addClass('has-error');
                     $("#help-inline").html('手机号码已被使用');
                     $("#help-inline").show();
                 } else {
-                    $("#input_error").removeClass('error');
+                    $("#input_error").removeClass('has-error');
                     $("#help-inline").hide();
                 }
             });
@@ -108,7 +110,7 @@
         $('#getting').click(function () {
             var btn = $(this);
             if ($("#mobile").val() == '') {
-                $("#input_error").addClass('error');
+                $("#input_error").addClass('has-error');
                 $("#help-inline").html('手机号码不能为空');
                 $("#help-inline").show();
                 return false;
@@ -118,22 +120,22 @@
                 dataType: "json",
                 cache: false,
                 data: {"mobile": $("#mobile").val()},
-                url: "{{rootUrl}}user/profile/check/mobile",
+                url: "{{rootUrl}}user/profile/check/mobile"
             }).done(function (data) {
                 if (data['mobile'] > 0) {
-                    $("#input_error").addClass('error');
+                    $("#input_error").addClass('has-error');
                     $("#help-inline").html('手机号码已被使用');
                     $("#help-inline").show();
                     return false;
                 } else {
-                    $("#input_error").removeClass('error');
+                    $("#input_error").removeClass('has-error');
                     $("#help-inline").hide();
                     $.ajax({
                         type: "POST",
                         dataType: "json",
                         cache: false,
                         data: {"mobile": $("#mobile").val()},
-                        url: "{{rootUrl}}user/profile/sms/send/verify",
+                        url: "{{rootUrl}}user/profile/sms/send/verify"
                     }).done(function (data) {
                     });
                     var count = 60;
@@ -159,7 +161,7 @@
                 dataType: "json",
                 cache: false,
                 data: {"mobile": $("#mobile").val(), "verifycode": $("#verifycode").val()},
-                url: "{{rootUrl}}user/profile/sms/edit",
+                url: "{{rootUrl}}user/profile/sms/edit"
             }).done(function (data) {
                 window.location.reload(true);
             });

protected/view/edit-profile-sms.html

@@ -29,7 +29,7 @@
                     <legend>短信通知</legend>
                     <!-- if {{smsNoticeSwitch}} < 1 -->
                     <!--管理员关闭功能-->
-                    <div class="alert alert-error">
+                    <div class="alert alert-danger">
                         短信通知功能已被关闭。
                     </div>
                     <!--管理员关闭功能-->
@@ -39,24 +39,26 @@
                     <div class="alert alert-info">
                         初次使用，请先添加用于接收通知的手机号码。
                     </div>
-                    <div id="input_error" class="control-group">
-                        <label class="control-label" for="inputEmail">添加手机</label>
-                        <div class="controls">
-                            <input id="mobile" name="mobile" type="text" placeholder="输入您的新手机号码"><span id="help-inline"
-                                                                                                       class="help-inline hide"></span>
+                    <div id="input_error" class="form-group">
+                        <label class="col-sm-1 control-label">添加手机</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" id="mobile" name="mobile" type="text" placeholder="输入您的新手机号码"><span id="help-inline"
+                                                                                                       class="help-block" style="display: none"></span>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">短信校验码</label>
-                        <div class="controls">
-                            <input type="text" id="verifycode" name="verifycode" placeholder="输入验证码" maxlength="11"
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">短信校验码</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" id="verifycode" name="verifycode" placeholder="输入验证码" maxlength="11"
                                    class="span2">
-                            <input type="button" class="btn" id="getting" value="获取验证码">
+                        </div>
+                        <div class="col-sm-2">
+                            <input type="button" class="btn btn-default" id="getting" value="获取验证码">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label"></label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label"></label>
+                        <div class="col-sm-2">
                             <i class="icon-ok icon-white"></i><input type="button" id="addMobile"
                                                                      class="btn btn-primary" value="确定添加"/>
                         </div>
@@ -64,23 +66,23 @@
                     <!--初次使用-->
                     <!-- else -->
                     <!--正常使用-->
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">接收手机</label>
-                        <div class="controls">
-                            <input type="text" value="{{uprofile.mobile}}" disabled="">&nbsp;<a
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">接收手机</label>
+                        <div class="col-sm-2 ">
+                            <input class="form-control" type="text" value="{{uprofile.mobile}}" disabled="">&nbsp;<a
                                 href="{{rootUrl}}user/profile/sms/edit">修改手机</a>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">通知类型</label>
-                        <div class="controls">
-                            <label class="checkbox inline">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">通知类型</label>
+                        <div class="col-sm-5">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" checked value="option1" disabled> 到我审批
                             </label>
-                            <label class="checkbox inline">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" checked value="option1" disabled> 标段审批通过（上报人接收）
                             </label>
-                            <label class="checkbox inline">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" checked value="option1" disabled> 标段审批不通过（上报人接收）
                             </label>
                         </div>
@@ -107,11 +109,11 @@
                 url: "{{rootUrl}}user/profile/check/mobile",
                 success: function(data){
                     if (data["mobile"] > 0) {
-                        $("#input_error").addClass('error');
+                        $("#input_error").addClass('has-error');
                         $("#help-inline").html('手机号码已被使用');
                         $("#help-inline").show();
                     } else {
-                        $("#input_error").removeClass('error');
+                        $("#input_error").removeClass('has-error');
                         $("#help-inline").hide();
                     }
               	}
@@ -140,7 +142,7 @@
         $('#getting').click(function () {
             var btn = $(this);
             if ($("#mobile").val() == '') {
-                $("#input_error").addClass('error');
+                $("#input_error").addClass('has-error');
                 $("#help-inline").html('手机号码不能为空');
                 $("#help-inline").show();
                 return false;
@@ -153,12 +155,12 @@
                 url: "{{rootUrl}}user/profile/check/mobile",
                 success: function(data){
                   if (data["mobile"] > 0) {
-                      $("#input_error").addClass('error');
+                      $("#input_error").addClass('has-error');
                       $("#help-inline").html('手机号码已被使用');
                       $("#help-inline").show();
                       return false;
                   } else {
-                      $("#input_error").removeClass('error');
+                      $("#input_error").removeClass('has-error');
                       $("#help-inline").hide();
                       $.ajax({
                           type: "POST",

protected/view/edit-profile.html

@@ -27,66 +27,63 @@
             <div class="form">
                 <form class="form-horizontal" action="{{rootUrl}}user/profile" method="post">
                     <legend>编辑个人信息</legend>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">头像</label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">头像</label>
+                        <div class="col-sm-2">
                             <img src="{{rootUrl}}{{user.avatar}}"> <a href="{{rootUrl}}user/avatar">更换</a>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">邮箱（登录账号）</label>
-                        <div class="controls">
-                            <input type="text" value="{{uprofile.email}}" disabled="">&nbsp;<a
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">邮箱（登录账号）</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" value="{{uprofile.email}}" disabled="">&nbsp;<a
                                 href="{{rootUrl}}user/repasswd">修改密码</a>
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">姓名</label>
-                        <div class="controls">
-                            <input type="text" name="name" value="{{uprofile.name}}" placeholder="输入您的姓名">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">姓名</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" name="name" value="{{uprofile.name}}" placeholder="输入您的姓名">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">单位(公司)名称</label>
-                        <div class="controls">
-                            <input type="text" name="company" value="{{uprofile.company}}" placeholder="输入您的单位或者公司名称">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">单位(公司)名称</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" name="company" value="{{uprofile.company}}" placeholder="输入您的单位或者公司名称">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">职位</label>
-                        <div class="controls">
-                            <input type="text" name="jobs" value="{{uprofile.jobs}}" placeholder="输入您的职位">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">职位</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" name="jobs" value="{{uprofile.jobs}}" placeholder="输入您的职位">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">联系电话</label>
-                        <div class="controls">
-                            <div class="input-prepend">
-                                <span class="add-on">固话</span>
-                                <input type="text" name="phone" value="{{uprofile.phone}}"
-                                       placeholder="格式：0000-00000000" style="width:167px">
-                            </div>
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">联系电话</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" name="phone" value="{{uprofile.phone}}"
+                                       placeholder="输入您的联系电话（手机）">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">短信通知</label>
-                        <div class="controls">
-                            <div class="input-prepend">
-                                <span class="add-on">手机</span>
-                                <input type="text" disabled="disabled" value="{{uprofile.mobile}}" style="width:167px">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">短信通知</label>
+                        <div class="col-sm-2">
+                            <div class="input-group">
+                                <span class="input-group-addon" id="basic-addon1">手机</span>
+                                <input class="form-control" type="text" disabled="disabled" value="{{uprofile.mobile}}">
                             </div>
                         </div>
                     </div>
 
-                    <div class="control-group">
-                        <label class="control-label" for="inputEmail">QQ</label>
-                        <div class="controls">
-                            <input type="text" name="qq" value="{{uprofile.qq}}" placeholder="输入您的QQ号码">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label">QQ</label>
+                        <div class="col-sm-2">
+                            <input class="form-control" type="text" name="qq" value="{{uprofile.qq}}" placeholder="输入您的QQ号码">
                         </div>
                     </div>
-                    <div class="control-group">
-                        <label class="control-label"></label>
-                        <div class="controls">
+                    <div class="form-group">
+                        <label class="col-sm-1 control-label"></label>
+                        <div class="col-sm-2">
                             <input type="submit" class="btn btn-primary" value="确定提交"><i class="icon-ok icon-white"></i>&nbsp;</input>
                         </div>
                     </div>

protected/view/login.html

@@ -15,26 +15,46 @@
     <body>
         <div class="wrapHeader">
             <h1 title="纵横计量支付" class="mainLogo"></h1>
-            <div class="sysTools"><a href="index.html" title="返回首页" ><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a href="http://smartcost.com.cn" target="_blank" title="纵横官网" ><i class="icon-home icon-white"></i></a></div>
+            <div class="sysTools"><a href="/" title="返回首页" ><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a href="http://smartcost.com.cn" target="_blank" title="纵横官网" ><i class="icon-home icon-white"></i></a></div>
         </div>
         <div class="wrapLogin">
             <form method="post">
                 <input type="hidden" name="tokenform" value="{{_token_}}" />
                 <div class="loginPanel">
-                    <div class="tpa"><b>{{proName}}</b>&nbsp;用户登录</div>
+                    <div  class="tpa"><h4>{{proName}}</h4></div>
+                    <!--<div class="tpa"><b>{{proName}}</b>&nbsp;用户登录</div>-->
                     <div class="clearfix">
-                        <div class="fL">
-                            <img src="{{rootUrl}}global/images/avatar-normal.png">
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
+                                <input class="form-control input-lg" placeholder="输入邮箱" name="uemail" type="text">
+                            </div>
                         </div>
-                        <div class="fR">
-                            <div><span data-original-title="使用您的邮箱进行登录" data-toggle="tooltip" data-placement="bottom"> <input name="uemail" type="text" placeholder="邮箱"></span></div>
-                            <input type="password" name="upasswd" placeholder="密码">
-                            <!--<label class="checkbox"><input type="checkbox">记住我</label>-->
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
+                                <input class="form-control input-lg" placeholder="输入密码" type="password" name="upasswd">
+                            </div>
                         </div>
                     </div>
+                    <!--<div class="clearfix">-->
+                        <!--<div class="fL">-->
+                            <!--<img src="{{rootUrl}}global/images/avatar-normal.png">-->
+                        <!--</div>-->
+                        <!--<div class="fR">-->
+                            <!--<div><span data-original-title="使用您的邮箱进行登录" data-toggle="tooltip" data-placement="bottom"> <input name="uemail" type="text" placeholder="邮箱"></span></div>-->
+                            <!--<input type="password" name="upasswd" placeholder="密码">-->
+                            <!--&lt;!&ndash;<label class="checkbox"><input type="checkbox">记住我</label>&ndash;&gt;-->
+                        <!--</div>-->
+                    <!--</div>-->
                     <div class="clearfix">
-                        <input type="submit" class="btn btn-normal btn-block btn-primary" type="button" data-loading-text="登录中..." value="登录">
+                        <input type="submit" class="btn btn-block btn-primary btn-lg" type="button" data-loading-text="登录中..." value="登录">
                         {{tips}}
+                        <!-- if {{zhisset(version)}} -->
+                        <div class="alert">
+                            <a href="{{download}}">下载桌面软件 v{{version}}</a>
+                        </div>
+                        <!-- endif -->
                     </div>
                 </div>
             </form>

protected/view/r-project-section-detail.html

@@ -22,48 +22,43 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
-                           class="dropdown-toggle">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
                             {{currproArray.pname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allproArray -->
-                            <li><a href="{{rootUrl}}sproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <li><a href="{{rootUrl}}rproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
+                           class="dropdown-toggle">
+                            {{currconArray.stname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allconArray -->
+                            <li><a href="{{rootUrl}}rproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
+                           class="dropdown-toggle">
+                            {{curractmeasureArray.pmname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allactmeasureArray -->
+                            <li>
+                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
+                            <!--				    <li class="divider"></li>
+                                                <li><a href="#">共18标段，查看更多</a></li>-->
                         </ul>
                     </li>
-                    <!--			    <li class="dropdown">
-                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle">
-                                    土建合同<b class="caret"></b>
-                                    </a>
-                                    <ul class="dropdown-menu">
-                                    <li><a href="#">监理合同</a></li>
-                                    <li><a href="#">设计合同</a></li>
-                                    <li><a href="#">机电合同</a></li>
-                                    </ul>
-                                </li>
-                                <li class="dropdown">
-                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle">
-                                    GZ-HJDQ-JL-001<b class="caret"></b>
-                                    </a>
-                                    <ul class="dropdown-menu">
-                                    <li><a href="#">GZ-HJDQ-JL-010</a>
-                                    </li><li><a href="#">GZ-HJDQ-JL-009</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-008</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-007</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-006</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-005</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-004</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-003</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-002</a></li>
-                                    <li><a href="#">GZ-HJDQ-JL-001</a></li>
-                                    <li class="divider"></li>
-                                    <li><a href="#">共18标段，查看更多</a></li>
-                                    </ul>
-                                </li>-->
                 </ul>
             </div>
             <!--导航-->
@@ -74,6 +69,7 @@
                 <li>
                     <a href="/rproject/{{pid}}/section/{{pmid}}/files">附件</a>
                 </li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!-- if {{mpid}}>0 -->
                 <li>
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>

protected/view/r-project-section-files-recover.html

@@ -6,12 +6,12 @@
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
     <link rel=stylesheet href={{rootUrl}}global/css/fixedheadertable.css>
-    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
     <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
     <link rel=stylesheet href="{{rootUrl}}global/css/style.css">
     <script src="{{rootUrl}}global/js/jquery-1.9.1.min.js"></script>
     <script src="{{rootUrl}}global/js/bootstrap.js"></script>
     <script src="{{rootUrl}}global/js/jl.js"></script>
+    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
 </head>
 <body>
 <!-- include "top" -->
@@ -22,31 +22,38 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currproArray.pname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allproArray -->
+                            <li><a href="{{rootUrl}}rproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}rproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/files/recover">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -60,6 +67,7 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!-- if {{mpid}}>0 -->
                 <li>
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
@@ -129,19 +137,13 @@
                         </tbody>
                     </table>
 
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
-                            <!--<li class="disabled"><a href="#">&laquo;</a></li>-->
-                            <!--<li class="active"><a href="#">1</a></li>-->
-                            <!--<li><a href="#">2</a></li>-->
-                            <!--<li><a href="#">3</a></li>-->
-                            <!--<li><a href="#">4</a></li>-->
-                            <!--<li><a href="#">5</a></li>-->
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none">
                     <input type="hidden" id="imnid" value="0"/>
                     <table class="table table-striped">
                         <thead>
@@ -186,52 +188,62 @@
     </div>
 </div>
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件恢复</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">恢复成功。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件恢复</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">恢复成功。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-error">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="del" class="btn btn-danger">确定删除</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="del" class="btn btn-danger">确定删除</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 删除弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del2" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del2" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 删除弹出 -->
 <script type="text/javascript">autoFlashHeight();</script>
 <script type="text/javascript">

protected/view/r-project-section-files.html

@@ -22,10 +22,17 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currproArray.pname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allproArray -->
+                            <li><a href="{{rootUrl}}rproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
                         <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
@@ -46,7 +53,7 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/files">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -60,6 +67,7 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!-- if {{mpid}}>0 -->
                 <li>
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
@@ -68,23 +76,28 @@
             </ul>
             <!--导航-->
             <!--筛选工具-->
+            <br>
             <div class="clearfix">
-                <form class="form-inline">
-                    <select id="numpname" class="span2">
-                        <option value="0">不限期数</option>
-                        <!-- loop groupArray -->
-                        <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
-                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
-                        </option>
-                        <!-- endloop -->
-                    </select>
-                    <select id="uploaduser" class="span2">
-                        <option value="0">上传者</option>
-                        <!-- loop owneridArray -->
-                        <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
-                        <!-- endloop -->
-                    </select>
+                <form class="row">
+                    <div class="col-sm-2">
+                        <select class="form-control" id="numpname" class="span2">
+                            <option value="0">不限期数</option>
+                            <!-- loop groupArray -->
+                            <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
+                            value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                            </option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
+                    <div class="col-sm-2">
+                        <select class="form-control" id="uploaduser" class="span2">
+                            <option value="0">上传者</option>
+                            <!-- loop owneridArray -->
+                            <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
+                            value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
                     <a href="/rproject/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
                 </form>
             </div>
@@ -140,13 +153,13 @@
                         <!-- endloop -->
                         </tbody>
                     </table>
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none;">
                     <table class="table table-striped">
                         <thead>
                         <tr>
@@ -199,92 +212,108 @@
     </div>
 </div>
 <!-- 编辑弹出 -->
-<div id="file-edit" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-edit" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件编辑</h3>
-    </div>
-    <div class="modal-body">
-        <div class="form">
-            <form class="form-horizontal">
-                <input type="hidden" id="upimnid" name="upimnid" value=""/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">文件名称</label>
-                    <div class="controls">
-                        <input name="upfilename" id="upfilename" type="text"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">备注/描述</label>
-                    <div class="controls">
-                        <textarea name="upfiledesc" id="upfiledesc"></textarea>
-                    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件编辑</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form">
+                    <form class="form-horizontal">
+                        <input type="hidden" id="upimnid" name="upimnid" value=""/>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">文件名称</label>
+                            <div class="col-sm-8">
+                                <input class="form-control" name="upfilename" id="upfilename" type="text"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">备注/描述</label>
+                            <div class="col-sm-8">
+                                <textarea class="form-control" name="upfiledesc" id="upfiledesc"></textarea>
+                            </div>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="updateFileDesc" class="btn btn-primary">确定修改</button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="updateFileDesc" class="btn btn-primary">确定修改</button>
-    </div>
 </div>
 <!-- 编辑弹出 -->
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件替换</h3>
-    </div>
-    <div class="modal-body">
-        <div class="form">
-            <form class="form-horizontal">
-                <input type="hidden" name="fid" value="0" id="fid"/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">选择文件</label>
-                    <div class="controls">
-                        <input name="file" id="file" type="file">
-                        <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
-                    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件替换</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form">
+                    <form class="form-horizontal">
+                        <input type="hidden" name="fid" value="0" id="fid"/>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">选择文件</label>
+                            <div class="col-sm-8">
+                                <input name="file" id="file" type="file">
+                                <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
+                            </div>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="btreplacefile" class="btn btn-primary">确定替换</button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="btreplacefile" class="btn btn-primary">确定替换</button>
-    </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>
 <!-- 删除弹出 -->
 <!-- 历史版本弹出 -->
-<div id="file-history" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-history" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <input type="hidden" name="iaid" value="0" id="iaid"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">历史版本</h3>
-    </div>
-    <div id="historyHTML" class="modal-body">
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input type="hidden" name="iaid" value="0" id="iaid"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">历史版本</h4>
+            </div>
+            <div id="historyHTML" class="modal-body">
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>

protected/view/r-project-section-report.html

@@ -22,9 +22,44 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}rproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currproArray.pname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allproArray -->
+                            <li><a href="{{rootUrl}}rproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
+                           class="dropdown-toggle">
+                            {{currconArray.stname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allconArray -->
+                            <li><a href="{{rootUrl}}rproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
+                           class="dropdown-toggle">
+                            {{curractmeasureArray.pmname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allactmeasureArray -->
+                            <li>
+                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                            <!-- endloop -->
+                            <!--				    <li class="divider"></li>
+                                                <li><a href="#">共18标段，查看更多</a></li>-->
+                        </ul>
+                    </li>
+                    <li class="dropdown">
                         <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}" data-toggle="dropdown"
                            class="dropdown-toggle">
                             第{{ToChinaseNum(currnum)}}期<b class="caret"></b>
@@ -45,6 +80,7 @@
                 <li>
                     <a href="/rproject/{{pid}}/section/{{pmid}}/files">附件</a>
                 </li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!-- if {{mpid}}>0 -->
                 <li class="active">
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
@@ -160,51 +196,59 @@
     </div>
 </div>
 <!-- 审批通过 -->
-<div id="reportPass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="reportPass" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">审批通过</h3>
-    </div>
-    <div class="modal-body">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">审批通过</h4>
+            </div>
+            <div class="modal-body">
 
-        <div class="form">
-            <form>
+                <div class="form">
+                    <form>
                 <textarea name="content" id="content" class="form-control" rows="3" placeholder="填写审批通过的意见"
                           style="width:510px"></textarea>
-            </form>
+                    </form>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button class="btn btn-success auditclass" act="p" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
+                        times="{{times}}" id="pass">确认审批通过
+                </button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button class="btn btn-success auditclass" act="p" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
-                times="{{times}}" id="pass">确认审批通过
-        </button>
-    </div>
 </div>
 <!-- 审批通过 -->
 <!-- 审批不通过 -->
-<div id="reportNopass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="reportNopass" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">审批不通过</h3>
-    </div>
-    <div class="modal-body">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">审批不通过</h4>
+            </div>
+            <div class="modal-body">
 
-        <div class="form">
-            <form>
+                <div class="form">
+                    <form>
                 <textarea name="content" id="content" class="form-control" rows="3" placeholder="填写审批不通过的意见"
                           style="width:510px"></textarea>
-            </form>
+                    </form>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button class="btn btn-danger auditclass" act="np" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
+                        times="{{times}}">确认审批不通过
+                </button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button class="btn btn-danger auditclass" act="np" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
-                times="{{times}}">确认审批不通过
-        </button>
-    </div>
 </div>
 <!-- 审批不通过 -->
 <script type="text/javascript">autoFlashHeight();</script>

protected/view/r-project-section.html

@@ -48,8 +48,8 @@
 					<td width="60">完成进度：</td>
 					<td>
 					    <div class="progress">
-						<div class="bar bar-success" style="width:{{conArray' value.phetongTotal}};" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥{{conArray' value.nhetongTotal}}">{{conArray' value.phetongTotal}}</div>
-						<div class="bar bar-danger" style="width:{{conArray' value.phetongTotal2}};" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥{{conArray' value.ncurrdoneInt}}">{{conArray' value.phetongTotal2}}</div>
+						<div class="progress-bar progress-bar-success" style="width:{{conArray' value.phetongTotal}};" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥{{conArray' value.nhetongTotal}}">{{conArray' value.phetongTotal}}</div>
+						<div class="progress-bar progress-bar-danger" style="width:{{conArray' value.phetongTotal2}};" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥{{conArray' value.ncurrdoneInt}}">{{conArray' value.phetongTotal2}}</div>
 					    </div>
 					</td>
 				    </tr>

protected/view/r-project.html

@@ -20,30 +20,30 @@
 		<!--内容-->
 		<div class="mainContent">
 		    <div class="title clearfix">
-			<div class="fR">
-			    <div class="btn-group">
-				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-				    排序
-				    <span class="caret"></span>
-				</a>
-				<ul class="dropdown-menu">
-				    <li><a href="">创建时间</a></li>
-				    <li><a href="">最近上传</a></li>
-				    <li><a href="">进度完成度</a></li>
-				</ul>
-			    </div>
-			</div>
+			<!--<div class="fR">-->
+			    <!--<div class="btn-group">-->
+				<!--<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">-->
+				    <!--排序-->
+				    <!--<span class="caret"></span>-->
+				<!--</a>-->
+				<!--<ul class="dropdown-menu">-->
+				    <!--<li><a href="">创建时间</a></li>-->
+				    <!--<li><a href="">最近上传</a></li>-->
+				    <!--<li><a href="">进度完成度</a></li>-->
+				<!--</ul>-->
+			    <!--</div>-->
+			<!--</div>-->
 			<h1>这些是您审批的项目</h1>
 		    </div>
 		    <div class="project">
 			<!-- loop proArray -->
 			<div class="projectEntry clearfix">
-			    <div class="pojIcon fL c1"><div data-icon="C" aria-hidden="true"></div></div>
+			    <div class="pojIcon fL c{{proArray' value.index}}"><div data-icon="C" aria-hidden="true"></div></div>
 			    <div class="pojDetail fL">
 				<div class="title fL"><h5><a href="{{rootUrl}}rproject/{{proArray' value.pid}}/section">{{proArray' value.pname}}</a></h5>{{formatDate(proArray' value.intime,'Y-m-d')}}</div>
 				<div class="detail fR"><p data-original-title="总价：￥{{proArray' value.bcontracttotal}} 变更：+￥{{proArray' value.bchangTotal}}" data-placement="bottom" data-toggle="tooltip">总价：￥{{proArray' value.bcontracttotal}}元 (<span class="colRed">+￥{{proArray' value.bchangTotal}}</span>)</p>
 				    <div class="progress">
-					<div class="bar bar-success" style="width: {{proArray' value.pcurrdone}};">{{proArray' value.pcurrdone}}</div>
+					<div class="progress-bar progress-bar-success" style="width: {{proArray' value.pcurrdone}};">{{proArray' value.pcurrdone}}</div>
 				    </div>
 				</div>
 				<!-- if {{proArray' value.numofchecking}} > 0 --><div class="detail2 fR"><p style="margin:0 0 5px 0" class="colOrange">有 <b>{{proArray' value.numofchecking}}</b> 个标段需要审批</p></div><!-- endif -->

protected/view/s-project-section-detail.html

@@ -25,11 +25,11 @@
 					<li class="dropdown"><a title="返回" href="{{rootUrl}}sproject/{{currproArray.pid}}/section"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
 					<li class="dropdown">
 						<a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
-							{{currproArray.pname}}<b class="caret"></b>
-						</a>
+						{{currproArray.pname}}<b class="caret"></b>
+					</a>
 						<ul class="dropdown-menu">
 							<!-- loop allproArray -->
-							<li><a href="{{rootUrl}}sproject/{{currproArray.pid}}/section">{{allproArray' value.pname}}</a></li>
+							<li><a href="{{rootUrl}}sproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
 							<!-- endloop -->
 						</ul>
 					</li>

protected/view/s-project-section-files-recover.html

@@ -6,12 +6,12 @@
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
     <link rel=stylesheet href={{rootUrl}}global/css/fixedheadertable.css>
-    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
     <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
     <link rel=stylesheet href="{{rootUrl}}global/css/style.css">
     <script src="{{rootUrl}}global/js/jquery-1.9.1.min.js"></script>
     <script src="{{rootUrl}}global/js/bootstrap.js"></script>
     <script src="{{rootUrl}}global/js/jl.js"></script>
+    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
 </head>
 <body>
 <!-- include "top" -->
@@ -22,31 +22,38 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}sproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currproArray.pname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allproArray -->
+                            <li><a href="{{rootUrl}}sproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}sproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/files/recover">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -59,7 +66,7 @@
                 <li>
                     <a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
-                <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <li class="active"><a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
                 <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
             </ul>
             <!--导航-->
@@ -125,19 +132,13 @@
                         </tbody>
                     </table>
 
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
-                            <!--<li class="disabled"><a href="#">&laquo;</a></li>-->
-                            <!--<li class="active"><a href="#">1</a></li>-->
-                            <!--<li><a href="#">2</a></li>-->
-                            <!--<li><a href="#">3</a></li>-->
-                            <!--<li><a href="#">4</a></li>-->
-                            <!--<li><a href="#">5</a></li>-->
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none">
                     <input type="hidden" id="imnid" value="0"/>
                     <table class="table table-striped">
                         <thead>
@@ -182,52 +183,62 @@
     </div>
 </div>
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件恢复</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">恢复成功。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件恢复</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">恢复成功。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-error">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="del" class="btn btn-danger">确定删除</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="del" class="btn btn-danger">确定删除</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 删除弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del2" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del2" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 删除弹出 -->
 <script type="text/javascript">autoFlashHeight();</script>
 <script type="text/javascript">

protected/view/s-project-section-files.html

@@ -25,7 +25,14 @@
                     <li class="dropdown"><a title="返回" href="{{rootUrl}}sproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currproArray.pname}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop allproArray -->
+                            <li><a href="{{rootUrl}}sproject/{{allproArray' value.pid}}/section">{{allproArray' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
                         <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
@@ -46,7 +53,7 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/files">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -64,23 +71,28 @@
             </ul>
             <!--导航-->
             <!--筛选工具-->
+            <br>
             <div class="clearfix">
-                <form class="form-inline">
-                    <select id="numpname" class="span2">
-                        <option value="0">不限期数</option>
-                        <!-- loop groupArray -->
-                        <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
-                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
-                        </option>
-                        <!-- endloop -->
-                    </select>
-                    <select id="uploaduser" class="span2">
-                        <option value="0">上传者</option>
-                        <!-- loop owneridArray -->
-                        <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
-                        <!-- endloop -->
-                    </select>
+                <form class="row">
+                    <div class="col-sm-2">
+                        <select class="form-control" id="numpname" class="span2">
+                            <option value="0">不限期数</option>
+                            <!-- loop groupArray -->
+                            <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
+                            value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                            </option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
+                    <div class="col-sm-2">
+                        <select class="form-control" id="uploaduser" class="span2">
+                            <option value="0">上传者</option>
+                            <!-- loop owneridArray -->
+                            <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
+                            value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
                     <a href="/sproject/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
                 </form>
             </div>
@@ -136,13 +148,13 @@
                         <!-- endloop -->
                         </tbody>
                     </table>
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none">
                     <table class="table table-striped">
                         <thead>
                         <tr>
@@ -195,95 +207,109 @@
     </div>
 </div>
 <!-- 编辑弹出 -->
-<div id="file-edit" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-edit" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件编辑</h3>
+        <h4 class="modal-title">文件编辑</h4>
     </div>
     <div class="modal-body">
         <div class="form">
             <form class="form-horizontal">
                 <input type="hidden" id="upimnid" name="upimnid" value=""/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">文件名称</label>
-                    <div class="controls">
-                        <input name="upfilename" id="upfilename" type="text"/>
+                <div class="form-group">
+                    <label class="control-label col-sm-3">文件名称</label>
+                    <div class="col-sm-8">
+                        <input class="form-control" name="upfilename" id="upfilename" type="text"/>
                     </div>
                 </div>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">备注/描述</label>
-                    <div class="controls">
-                        <textarea name="upfiledesc" id="upfiledesc"></textarea>
+                <div class="form-group">
+                    <label class="control-label col-sm-3">备注/描述</label>
+                    <div class="col-sm-8">
+                        <textarea class="form-control" name="upfiledesc" id="upfiledesc"></textarea>
                     </div>
                 </div>
             </form>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
         <button id="updateFileDesc" class="btn btn-primary">确定修改</button>
     </div>
+            </div>
+        </div>
 </div>
 <!-- 编辑弹出 -->
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件替换</h3>
-    </div>
-    <div class="modal-body">
-        <div class="form">
-            <form class="form-horizontal">
-                <input type="hidden" name="fid" value="0" id="fid"/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">选择文件</label>
-                    <div class="controls">
-                        <input name="file" id="file" type="file">
-                        <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
-                    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件替换</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form">
+                    <form class="form-horizontal">
+                        <input type="hidden" name="fid" value="0" id="fid"/>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">选择文件</label>
+                            <div class="col-sm-8">
+                                <input name="file" id="file" type="file">
+                                <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
+                            </div>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="btreplacefile" class="btn btn-primary">确定替换</button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="btreplacefile" class="btn btn-primary">确定替换</button>
-    </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 删除弹出 -->
 <!-- 历史版本弹出 -->
-<div id="file-history" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-history" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <input type="hidden" name="iaid" value="0" id="iaid"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">历史版本</h3>
-    </div>
-    <div id="historyHTML" class="modal-body">
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input type="hidden" name="iaid" value="0" id="iaid"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">历史版本</h4>
+            </div>
+            <div id="historyHTML" class="modal-body">
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
-</div>
 <!-- 历史版本1弹出 -->
 <script type="text/javascript">autoFlashHeight();</script>
 <script type="text/javascript">

protected/view/s-project-section.html

@@ -57,9 +57,9 @@
 								<!-- loop MyMeasureArray -->
 								<tr>
 									<td width="15%"><a href="{{rootUrl}}sproject/{{MyMeasureArray' value.pid}}/section/{{MyMeasureArray' value.pmid}}/detail">{{MyMeasureArray' value.pmname}}</a><br>{{MyMeasureArray' value.type}}</td><td width="16%" class="taR">￥<b>{{MyMeasureArray' value.totalplus}}</b><br>第 {{MyMeasureArray' value.totalnum}} 期（<span class="colOrange">{{MyMeasureArray' value.ownstatus}}</span>）</td><td width="40%" class="taR"><div class="progress">
-									<div data-original-title="截止上期完成：￥{{MyMeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: {{MyMeasureArray' value.dispstopnow}};" class="bar bar-success">{{MyMeasureArray' value.dispstopnow}}</div>
-									<div data-original-title="本期完成：￥{{MyMeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.dispcurrdone}}" class="bar">{{MyMeasureArray' value.dispcurrdone}}</div>
-									<div data-original-title="未完成：￥{{MyMeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.pless}}" class="bar bar-gary">{{MyMeasureArray' value.pless}}</div>
+									<div data-original-title="截止上期完成：￥{{MyMeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: {{MyMeasureArray' value.dispstopnow}};" class="progress-bar progress-bar-success">{{MyMeasureArray' value.dispstopnow}}</div>
+									<div data-original-title="本期完成：￥{{MyMeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.dispcurrdone}}" class="progress-bar">{{MyMeasureArray' value.dispcurrdone}}</div>
+									<div data-original-title="未完成：￥{{MyMeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.pless}}" class="progress-bar progress-bar-gary">{{MyMeasureArray' value.pless}}</div>
 								</div></td>
 								</tr>
 								<!-- endloop -->

protected/view/s-project.html

@@ -20,32 +20,32 @@
 		<!--内容-->
 		<div class="mainContent">
 		    <div class="title clearfix">
-			<div class="fR">
-			    <div class="btn-group">
-				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-				    排序
-				    <span class="caret"></span>
-				</a>
-				<ul class="dropdown-menu">
-				    <li><a href="">创建时间</a></li>
-				    <li><a href="">最近上传</a></li>
-				    <li><a href="">进度完成度</a></li>
-				</ul>
-			    </div>
-			    <button class="btn" type="button"><i class="icon-plus"></i>&nbsp;添加项目</button>
-			</div>
+			<!--<div class="fR">-->
+			    <!--<div class="btn-group">-->
+				<!--<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">-->
+				    <!--排序-->
+				    <!--<span class="caret"></span>-->
+				<!--</a>-->
+				<!--<ul class="dropdown-menu">-->
+				    <!--<li><a href="">创建时间</a></li>-->
+				    <!--<li><a href="">最近上传</a></li>-->
+				    <!--<li><a href="">进度完成度</a></li>-->
+				<!--</ul>-->
+			    <!--</div>-->
+			    <!--<button class="btn" type="button"><i class="icon-plus"></i>&nbsp;添加项目</button>-->
+			<!--</div>-->
 			<h1>这些是来自您软件编制的项目</h1>
 		    </div>
 		    <div class="project">
 			<!-- if {{zhisset(conArray)}} -->
 			<!-- loop conArray -->
 			<div class="projectEntry clearfix" title="点击查看该项目详细">
-			    <div class="pojIcon fL c1"><div data-icon="H" aria-hidden="true"></div></div>
+			    <div class="pojIcon fL c{{conArray' value.index}}"><div data-icon="H" aria-hidden="true"></div></div>
 			    <div class="pojDetail fL">
 				<div class="title fL"><h5><a href="{{rootUrl}}sproject/{{conArray' value.pid}}/section">{{conArray' value.pname}}</a>（{{conArray' value.countTotalMeasureInt}}个标段）</h5>{{formatDate(conArray' value.intime,'Y-m-d')}}</div>
 				<div class="detail fR"><p data-original-title="总价：￥{{pros' value.bcontracttotal}} 变更：+￥{{pros' value.bchangTotal}}" data-placement="bottom" data-toggle="tooltip">总价：￥{{conArray' value.bcontracttotal}}元 (<span class="colRed">+￥{{conArray' value.bchangTotal}}</span>)</p>
 				    <div class="progress">
-					<div class="bar bar-success" style="width: {{conArray' value.pcurrdone}};">{{conArray' value.pcurrdone}}</div>
+					<div class="progress-bar progress-bar-success" style="width: {{conArray' value.pcurrdone}};">{{conArray' value.pcurrdone}}</div>
 				    </div></div>
 				<div class="detail2 fR"><p>业主单位：{{conArray' value.company}}</p><p>我的标段：{{conArray' value.countmeasure}}</p></div>
 			    </div>

protected/view/sign-create_sign.html

@@ -27,7 +27,7 @@
                 <div class="proSection">
                     <ul class="nav nav-pills">
                         <li>
-                            <select id="itemlist">
+                            <select class="form-control" id="itemlist">
                                 <option value="0">请选择项目</option>
                                 <!-- if !empty({{itemlist}}) -->
                                 <!-- loop itemlist -->
@@ -37,7 +37,7 @@
                             </select>&nbsp;
                         </li>
                         <li>
-                            <select id="tenderlist">
+                            <select class="form-control" id="tenderlist">
                                 <option value="0">请选择标段</option>
                                 <!-- if !empty({{tenderlist}}) -->
                                 <!-- loop tenderlist -->
@@ -47,7 +47,7 @@
                             </select>&nbsp;
                         </li>
                         <li>
-                            <select id="phasenolist">
+                            <select class="form-control" id="phasenolist">
                                 <option value="0">请选择期数</option>
                                 <!-- if !empty({{phasenolist}}) -->
                                 <!-- loop phasenolist -->
@@ -75,17 +75,17 @@
                             <td>{{unlist' value.project}}-{{unlist' value.tender}}-第{{ToChinaseNum(unlist' value.phaseno)}}期</td>
                             <td>{{unlist' value.ownname}}</td>
                             <td>{{formatDate(unlist' value.intime,'Y-m-d')}}</td>
-                            <td width=""><a class="btn btn-primary btn-small" href="/sign/set/{{list' value.sid}}">发起签署</a>
+                            <td width=""><a class="btn btn-primary btn-sm" href="/sign/set/{{list' value.sid}}">发起签署</a>
                         </tr>
                         <!-- endloop -->
                         <!-- endif -->
                         </tbody>
                     </table>
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
                         </ul>
-                    </div>
+                    </nav>
                 </div>
             </div>
         </div>

protected/view/sign-list-done_sign.html

@@ -26,7 +26,7 @@
       <div class="proSection">
         <ul class="nav nav-pills">
             <li>
-                <select id="itemlist">
+                <select class="form-control" id="itemlist">
                     <option value="0">请选择项目</option>
                     <!-- if !empty({{itemlist}}) -->
                     <!-- loop itemlist -->
@@ -36,7 +36,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="tenderlist">
+                <select class="form-control" id="tenderlist">
                     <option value="0">请选择标段</option>
                     <!-- if !empty({{tenderlist}}) -->
                     <!-- loop tenderlist -->
@@ -46,7 +46,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="phasenolist">
+                <select class="form-control" id="phasenolist">
                     <option value="0">请选择期数</option>
                     <!-- if !empty({{phasenolist}}) -->
                     <!-- loop phasenolist -->
@@ -68,17 +68,17 @@
             <td>{{donelist' value.project}}-{{donelist' value.tender}}-第{{ToChinaseNum(donelist' value.phaseno)}}期</td>
             <td>{{formatDate(donelist' value.aintime,'Y-m-d')}}</td>
             <td><span class="colGreen">完成</span><br>{{formatDate(donelist' value.sintime,'Y-m-d')}}</td>
-            <td width=""><a class="btn btn-small" href="/sign/view/{{donelist' value.sid}}?status=donelist">查看报表</a></td>
+            <td width=""><a class="btn btn-default btn-sm" href="/sign/view/{{donelist' value.sid}}?status=donelist">查看报表</a></td>
           </tr>
           <!-- endloop -->
           <!-- endif -->
           </tbody>
         </table>
-        <div class="pagination">
-           <ul>
-               {{pager}}
-           </ul>
-        </div>
+          <nav aria-label="Page navigation">
+              <ul class="pagination">
+                  {{pager}}
+              </ul>
+          </nav>
       </div>
     </div>
   </div>

protected/view/sign-list-my_create.html

@@ -26,7 +26,7 @@
       <div class="proSection">
         <ul class="nav nav-pills">
             <li>
-                <select id="itemlist">
+                <select class="form-control" id="itemlist">
                     <option value="0">请选择项目</option>
                     <!-- if !empty({{itemlist}}) -->
                     <!-- loop itemlist -->
@@ -36,7 +36,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="tenderlist">
+                <select class="form-control" id="tenderlist">
                     <option value="0">请选择标段</option>
                     <!-- if !empty({{tenderlist}}) -->
                     <!-- loop tenderlist -->
@@ -46,7 +46,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="phasenolist">
+                <select class="form-control" id="phasenolist">
                     <option value="0">请选择期数</option>
                     <!-- if !empty({{phasenolist}}) -->
                     <!-- loop phasenolist -->
@@ -68,17 +68,17 @@
             <td>{{mylist' value.project}}-{{mylist' value.tender}}-第{{ToChinaseNum(mylist' value.phaseno)}}期</td>
             <td>{{formatDate(mylist' value.aintime,'Y-m-d')}}</td>
             <td><!-- if {{mylist' value.status}} == 'checked' --><span class="colGreen">完成</span><br>{{formatDate(mylist' value.sintime,'Y-m-d')}}<!-- elseif {{mylist' value.status}} == 'checking' --><span class="colOrange">签署中</span><br><!-- endif --></td>
-            <td width=""><a class="btn btn-small" href="/sign/view/{{mylist' value.sid}}?status=mylist">查看报表</a>&nbsp;<a class="btn btn-small <!-- if {{mylist' value.ishare}} == 1 -->btn-success<!-- endif -->" onclick="sharesign('{{mylist' value.ishare}}','{{mylist' value.sid}}');" href="#share" title="分享" id="sharebtn{{mylist' value.sid}}" data-toggle="modal"><span class="icon-share <!-- if {{mylist' value.ishare}} == 1 -->icon-white<!-- endif -->"></span></a></td>
+            <td width=""><a class="btn btn-default btn-sm" href="/sign/view/{{mylist' value.sid}}?status=mylist">查看报表</a>&nbsp;<a class="btn btn-sm <!-- if {{mylist' value.ishare}} == 1 -->btn-success<!-- else -->btn-default<!-- endif -->" onclick="sharesign('{{mylist' value.ishare}}','{{mylist' value.sid}}');" href="#share" title="分享" id="sharebtn{{mylist' value.sid}}" data-toggle="modal"><span data-icon="n"></span></a></td>
           </tr>
           <!-- endloop -->
           <!-- endif -->
           </tbody>
         </table>
-        <div class="pagination">
-          <ul>
-              {{pager}}
-          </ul>
-        </div>
+          <nav aria-label="Page navigation">
+              <ul class="pagination">
+                  {{pager}}
+              </ul>
+          </nav>
       </div>
     </div>
   </div>
@@ -86,33 +86,38 @@
     	</div>
     </div>
 <!-- 添加签署人弹出 -->
-<div id="share" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">分享报表</h3>
-    </div>
-    <div class="modal-body">
-        <form class="form-horizontal">
-
-        <div class="control-group">
-            <input type="hidden" id="sharesid" value="">
-            <label class="control-label" for="ishare"></label>
-            <div class="controls">
-                <div class="checkbox" >
-                    <label style="display: inline-block" id="ishare">
-                        <input checked="" type="checkbox" name=""> 启用
-                    </label>
-                </div>
-            </div>
-            <div id="showshare" style="display:none">
-            <label class="control-label" for="shareurl">分享地址</label>
-            <div class="controls">
-                <input placeholder="这是该项目的KEY" id="shareurl" value="{{rootUrl}}share?sid=" style="cursor: text" readonly class="span4" onfocus="this.select()" onmouseover="this.focus()" type="text">
-                <p>分享以上链接即可免登录查阅标该报表。</p>
+<div id="share" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3 id="myModalLabel">分享报表</h3>
             </div>
+            <div class="modal-body">
+                <form class="form-horizontal">
+
+                    <div class="form-group">
+                        <input type="hidden" id="sharesid" value="">
+                        <label class="control-label col-sm-2" for="ishare"></label>
+                        <div class="col-sm-8">
+                            <div class="checkbox" >
+                                <label style="display: inline-block" id="ishare">
+                                    <input checked="" type="checkbox" name=""> 启用
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="showshare" class="form-group" style="display:none">
+                        <label class="control-label col-sm-2" for="shareurl">分享地址</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" placeholder="这是该项目的KEY" id="shareurl" value="{{rootUrl}}share?sid=" style="cursor: text" readonly class="span4" onfocus="this.select()" onmouseover="this.focus()" type="text">
+                            <p>分享以上链接即可免登录查阅标该报表。</p>
+                        </div>
+                    </div>
+
+                </form>
             </div>
         </div>
-    </form>
     </div>
 </div>
 <!-- 添加签署人弹出 -->
@@ -143,13 +148,13 @@
                         alert(result.msg);
                     }else{
                         if(result.status){
-                            $('#sharebtn'+$('#sharesid').val()).addClass("btn-success");
-                            $('#sharebtn'+$('#sharesid').val()).children('span').addClass('icon-white');
+                            $('#sharebtn'+$('#sharesid').val()).addClass("btn-success").removeClass('btn-default');
+//                            $('#sharebtn'+$('#sharesid').val()).children('span').addClass('icon-white');
                             $('#showshare').show();
                             $('#sharebtn'+$('#sharesid').val()).attr('onclick',"sharesign('1','"+$('#sharesid').val()+"')");
                         }else{
-                            $('#sharebtn'+$('#sharesid').val()).removeClass("btn-success");
-                            $('#sharebtn'+$('#sharesid').val()).children('span').removeClass('icon-white');
+                            $('#sharebtn'+$('#sharesid').val()).removeClass("btn-success").addClass('btn-default');
+//                            $('#sharebtn'+$('#sharesid').val()).children('span').removeClass('icon-white');
                             $('#showshare').hide();
                             $('#sharebtn'+$('#sharesid').val()).attr('onclick',"sharesign('0','"+$('#sharesid').val()+"')");
                         }

protected/view/sign-list-need_sign.html

@@ -53,7 +53,7 @@
                 <!-- endloop -->
               </div>
             </td>
-            <td width="10%"><a href="/sign/needview/{{needlist' tlist' plist' signlist' value.sid}}" class="btn btn-primary btn-small">签署</a></td>
+            <td width="10%"><a href="/sign/needview/{{needlist' tlist' plist' signlist' value.sid}}" class="btn btn-primary btn-sm">签署</a></td>
           </tr>
           <!-- endloop -->
           <!-- endif -->

protected/view/sign-list-on_sign.html

@@ -26,7 +26,7 @@
       <div class="proSection">
         <ul class="nav nav-pills">
             <li>
-                <select id="itemlist">
+                <select class="form-control" id="itemlist">
                     <option value="0">请选择项目</option>
                     <!-- if !empty({{itemlist}}) -->
                     <!-- loop itemlist -->
@@ -36,7 +36,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="tenderlist">
+                <select class="form-control" id="tenderlist">
                     <option value="0">请选择标段</option>
                     <!-- if !empty({{tenderlist}}) -->
                     <!-- loop tenderlist -->
@@ -46,7 +46,7 @@
                 </select>&nbsp;
             </li>
             <li>
-                <select id="phasenolist">
+                <select class="form-control" id="phasenolist">
                     <option value="0">请选择期数</option>
                     <!-- if !empty({{phasenolist}}) -->
                     <!-- loop phasenolist -->
@@ -81,17 +81,17 @@
                 <!-- endif -->
               </div>
             </td>
-            <td width=""><a class="btn btn-small" href="/sign/view/{{onlist' value.sid}}?status=onlist">查看报表</a></td>
+            <td width=""><a class="btn btn-default btn-sm" href="/sign/view/{{onlist' value.sid}}?status=onlist">查看报表</a></td>
           </tr>
           <!-- endloop -->
           <!-- endif -->
           </tbody>
         </table>
-        <div class="pagination">
-          <ul>
-            {{pager}}
-          </ul>
-        </div>
+          <nav aria-label="Page navigation">
+              <ul class="pagination">
+                  {{pager}}
+              </ul>
+          </nav>
       </div>
     </div>
   </div>

protected/view/sign-view-set_signer.html

@@ -21,7 +21,7 @@
         <div class="mainContent signContent">
             <div class="title clearfix sign-title-height">
                 <div class="fR sign-topbar">
-                    <a class="btn " href="javascript:void(0);" onclick="printdiv('sign_msg')"><i class="icon-print "></i> 打印</a>
+                    <a class="btn btn-default" href="javascript:void(0);" onclick="printdiv('sign_msg')"><i class="icon-print "></i> 打印</a>
                 </div>
                 <h1><a href="/sign/create" title="返回"><span class="closePanel" aria-hidden="true"
                                                                      data-icon="Z"></span></a>&nbsp;{{signmsg.name}}</h1>
@@ -29,7 +29,7 @@
             <div class="sign-view clearfix">
                 <div class="sign-side fR">
                     <div class="view-info">
-                        <ul>
+                        <ul class="list-unstyled">
                             <li>
                                 <div class="fL">所在项目</div>
                                 {{signmsg.project}}
@@ -45,13 +45,13 @@
                         </ul>
                     </div>
                     <div class="signed-list" id="signerlist">
-                        <ul>
+                        <ul class="list-unstyled">
                         </ul>
                         <li class="add"><a href="#addsign" data-toggle="modal">+ 添加签署人</a></li>
                     </div>
                     <div class="btn-bar">
                         <input type="hidden" id="signid" value="{{signmsg.sid}}">
-                        <a id="signbtn" onclick="upsigner();" href="javascript:void(0);" class="btn btn-large btn-block disabled">发起签署</a>
+                        <a id="signbtn" onclick="upsigner();" href="javascript:void(0);" class="btn btn-default btn-large btn-block disabled">发起签署</a>
                     </div>
                 </div>
                 <input type="hidden" id="maxwidth" value="{{maxwidth}}">
@@ -71,59 +71,68 @@
     </div>
 </div>
 <!-- 添加签署人弹出 -->
-<div id="addsign" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">添加签署人</h3>
-    </div>
-    <div class="modal-body">
-        <div class="">
-            <h5>原报人:</h5>
-            <ul class="clearfix moadl-avatars" id="reportlist">
-                <!-- if !empty({{reportlist}}) -->
-                <li>
-                    <a class="fR btn btn-small btn-primary" data-userid="{{reportlist.userid}}" data-user="{{reportlist.userid}}&&{{reportlist.name}}&&{{reportlist.avatar}}">添加</a>
-                    <p><span class=" icon-user"></span> <b>{{reportlist.name}}</b></p>
-                    <p>{{reportlist.jobs}}</p>
-                </li>
-                <!-- endif -->
-            </ul>
-        </div>
-        <div class="">
-            <h5>标段审批人:</h5>
-            <ul class="clearfix moadl-avatars" id="userlist">
-                <!-- if !empty({{userlist}}) -->
-                <!-- loop userlist -->
-                <li>
-                    <a class="fR btn btn-small btn-primary" data-userid="{{userlist' value.userid}}" data-user="{{userlist' value.userid}}&&{{userlist' value.name}}&&{{userlist' value.avatar}}">添加</a>
-                    <p><span class=" icon-user"></span> <b>{{userlist' value.name}}</b></p>
-                    <p>{{userlist' value.jobs}}</p>
-                </li>
-                <!-- endloop -->
-                <!-- endif -->
-            </ul>
-        </div>
-        <div class="">
-            <h5>添加新签署人:</h5>
-            <div class="input-append">
-                <input class="span3" type="text" placeholder="输入邮箱地址检索系统中的用户" id="searchuser">
-                <button class="btn" type="button" onclick="searchuser();">搜索</button>
+<div id="addsign" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">添加签署人</h4>
+            </div>
+            <div class="modal-body">
+                <div class="">
+                    <h5>原报人:</h5>
+                    <ul class="clearfix moadl-avatars" id="reportlist">
+                        <!-- if !empty({{reportlist}}) -->
+                        <li>
+                            <a class="fR btn btn-sm btn-primary" data-userid="{{reportlist.userid}}" data-user="{{reportlist.userid}}&&{{reportlist.name}}&&{{reportlist.avatar}}">添加</a>
+                            <p><span class=" icon-user"></span> <b>{{reportlist.name}}</b></p>
+                            <p>{{reportlist.jobs}}</p>
+                        </li>
+                        <!-- endif -->
+                    </ul>
+                </div>
+                <div class="">
+                    <h5>标段审批人:</h5>
+                    <ul class="clearfix moadl-avatars" id="userlist">
+                        <!-- if !empty({{userlist}}) -->
+                        <!-- loop userlist -->
+                        <li>
+                            <a class="fR btn btn-sm btn-primary" data-userid="{{userlist' value.userid}}" data-user="{{userlist' value.userid}}&&{{userlist' value.name}}&&{{userlist' value.avatar}}">添加</a>
+                            <p><span class=" icon-user"></span> <b>{{userlist' value.name}}</b></p>
+                            <p>{{userlist' value.jobs}}</p>
+                        </li>
+                        <!-- endloop -->
+                        <!-- endif -->
+                    </ul>
+                </div>
+                <div class="">
+                    <h5>添加新签署人:</h5>
+                    <div class="input-group col-xs-8">
+                        <input class="span3 form-control" type="text" placeholder="输入邮箱地址检索" id="searchuser">
+                <span class="input-group-btn">
+                    <button class="btn btn-default" type="button" onclick="searchuser();">搜索</button>
+                </span>
+                    </div>
+                    <ul class="clearfix moadl-avatars" id="resultsearch">
+                    </ul>
+                </div>
             </div>
-            <ul class="clearfix moadl-avatars" id="resultsearch">
-            </ul>
         </div>
     </div>
 </div>
 <!-- 添加签署人弹出 -->
 <!-- 发起签署弹出 -->
-<div id="starsign" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-
-    <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-success" onclick="uploadsign();">确认</button>
+<div id="starsign" 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-success" onclick="uploadsign();">确认</button>
+            </div>
+        </div>
     </div>
 </div>
 <!-- 发起签署弹出 -->
@@ -131,7 +140,8 @@
 <script>
     function printdiv(printpage)
     {
-        $('.warp-printer').css("max-width","1085px");
+        var maxwidth = $('#maxwidth').val();
+        $('.warp-printer').css("max-width",maxwidth+"px");
         var headstr = '<html><head><title></title><link rel="stylesheet" href="https://code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"><style type="text/css" media="print">' +
                 '@page {size: {{style}}; margin: 0mm; padding: 0mm; border:0mm; } @media print body {margin:0mm;padding:0mm;border: 0mm} .warp-printer .page{margin:0mm;padding:0mm;border: 0mm;widows:0 orphans:0} .sign-content .page{margin:0mm;padding:0mm;border: 0mm;widows:0 orphans:0}' +
                 '</style></head><body>';
@@ -161,7 +171,7 @@
                     if(result.code == 400){
                         alert(result.msg);
                     }else{
-                        html += '<li><a class="fR btn btn-small btn-primary" data-user="'+result.user.userid+'&&'+result.user.name+'&&'+result.user.avatar+'">添加</a> <p><span class=" icon-user"></span> <b>'+result.user.name+'</b></p> <p>'+result.user.jobs+'</p></li>'
+                        html += '<li><a class="fR btn btn-sm btn-primary" data-user="'+result.user.userid+'&&'+result.user.name+'&&'+result.user.avatar+'">添加</a> <p><span class=" icon-user"></span> <b>'+result.user.name+'</b></p> <p>'+result.user.jobs+'</p></li>'
                     }
                     $('#resultsearch').html(html);
                     $('#resultsearch li a').on('click',function(){
@@ -180,12 +190,12 @@
                             $('#signbtn').addClass('btn-primary').removeClass('disabled');
                             $('#userlist li').each(function(){
                                 if($(this).children('a').attr('data-userid') == userarr[0]){
-                                    $(this).children('a').removeClass('btn-primary').addClass('disabled');
+                                    $(this).children('a').removeClass('btn-primary').addClass('btn-default').addClass('disabled');
                                     return;
                                 }
                             });
                             if($('#reportlist li a').attr('data-userid') == userarr[0]){
-                                $('#reportlist li a').removeClass('btn-primary').addClass('disabled');
+                                $('#reportlist li a').removeClass('btn-primary').addClass('btn-default').addClass('disabled');
                             }
                             alert('添加成功');
                             $('#resultsearch').html('');
@@ -195,16 +205,16 @@
                             var sid = $(this).parents('li').attr('data-sid');
                             $('#userlist li').each(function(){
                                if($(this).children('a').attr('data-userid') == sid){
-                                   $(this).children('a').removeClass('disabled').addClass('btn-primary');
+                                   $(this).children('a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                                    return;
                                }
                             });
                             if($('#reportlist li a').attr('data-userid') == sid){
-                                $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                                $('#reportlist li a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                             }
                             $(this).parents('li').remove();
                             if($('#signerlist ul li').length == 0){
-                                $('#signbtn').removeClass('btn-primary').addClass('disabled');
+                                $('#signbtn').removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                             }else{
                                 var i =1;
                                 $('#signerlist ul li').each(function(){
@@ -270,10 +280,10 @@
             if(flag){
                 var html = '<li data-sid="'+userarr[0]+'"> <div class="no fL">'+($('#signerlist ul li').length+1)+'</div> <div class="avatars fL"><img src="{{rootUrl}}'+userarr[2]+'">'+userarr[1]+'</div> <div class="corl fR"><a href="#" class="colRed">移除</a></div> </li>';
                 $('#signerlist ul').append(html);
-                $('#signbtn').addClass('btn-primary').removeClass('disabled');
-                $(this).removeClass('btn-primary').addClass('disabled');
+                $('#signbtn').addClass('btn-primary').removeClass('disabled').removeClass('btn-default');
+                $(this).removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                 if($('#reportlist li a').attr('data-userid') == userarr[0]){
-                    $('#reportlist li a').removeClass('btn-primary').addClass('disabled');
+                    $('#reportlist li a').removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                 }
                 alert('添加成功');
             }
@@ -282,16 +292,16 @@
                 var sid = $(this).parents('li').attr('data-sid');
                 $('#userlist li').each(function(){
                     if($(this).children('a').attr('data-userid') == sid){
-                        $(this).children('a').removeClass('disabled').addClass('btn-primary');
+                        $(this).children('a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                         return;
                     }
                 });
                 if($('#reportlist li a').attr('data-userid') == sid){
-                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                 }
                 $(this).parents('li').remove();
                 if($('#signerlist ul li').length == 0){
-                    $('#signbtn').removeClass('btn-primary').addClass('disabled');
+                    $('#signbtn').removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                 }else{
                     var i =1;
                     $('#signerlist ul li').each(function(){
@@ -318,11 +328,11 @@
             if(flag){
                 var html = '<li data-sid="'+userarr[0]+'"> <div class="no fL">'+($('#signerlist ul li').length+1)+'</div> <div class="avatars fL"><img src="{{rootUrl}}'+userarr[2]+'">'+userarr[1]+'</div> <div class="corl fR"><a href="#" class="colRed">移除</a></div> </li>';
                 $('#signerlist ul').append(html);
-                $('#signbtn').addClass('btn-primary').removeClass('disabled');
-                $(this).removeClass('btn-primary').addClass('disabled');
+                $('#signbtn').addClass('btn-primary').removeClass('disabled').removeClass('btn-default');
+                $(this).removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                 $('#userlist li').each(function(){
                     if($(this).children('a').attr('data-userid') == userarr[0]){
-                        $(this).children('a').removeClass('btn-primary').addClass('disabled');
+                        $(this).children('a').removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                         return;
                     }
                 });
@@ -332,16 +342,16 @@
                 var sid = $(this).parents('li').attr('data-sid');
                 $('#userlist li').each(function(){
                     if($(this).children('a').attr('data-userid') == sid){
-                        $(this).children('a').removeClass('disabled').addClass('btn-primary');
+                        $(this).children('a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                         return;
                     }
                 });
                 if($('#reportlist li a').attr('data-userid') == sid){
-                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary').removeClass('btn-default');
                 }
                 $(this).parents('li').remove();
                 if($('#signerlist ul li').length == 0){
-                    $('#signbtn').removeClass('btn-primary').addClass('disabled');
+                    $('#signbtn').removeClass('btn-primary').addClass('disabled').addClass('btn-default');
                 }else{
                     var i =1;
                     $('#signerlist ul li').each(function(){

protected/view/sign-view-signer_sign.html

@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
     <link rel="stylesheet" href="{{rootUrl}}global/css/jquery-ui.min.css">
-    <link rel=stylesheet href={{rootUrl}}global/css/style.css>
+    <link rel=stylesheet href={{rootUrl}}global/css/style.css?201709061>
     <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>
     <script src={{rootUrl}}global/js/bootstrap.js></script>
     <script src={{rootUrl}}global/js/jl.js></script>
@@ -25,7 +25,7 @@
                 <div class="fR sign-topbar">
                     <a class="btn btn-primary" href="javascript:void(0);" onclick="addsgin()"><i class="icon-pencil icon-white"></i> 签名</a>
                     <a id="delallsign" class="btn btn-danger" style="display: none" href="javascript:void(0);" onclick="delconfirm();"><i class="icon-remove icon-white"></i> 清除签名</a>
-                    <a class="btn " href="javascript:void(0);" onclick="printdiv('sign_msg')"><i class="icon-print "></i> 打印</a>
+                    <a class="btn btn-default" href="javascript:void(0);" onclick="printdiv('sign_msg')"><i class="icon-print "></i> 打印</a>
                 </div>
                 <div class="fR sign-page-num">
                     <span id="picnum">1</span> / {{signmsg.pagenum}} 页
@@ -35,14 +35,14 @@
             <div class="sign-view clearfix">
                 <div class="sign-side fR">
                     <div class="view-info">
-                        <ul>
+                        <ul class="list-unstyled">
                             <li><div class="fL">所在项目</div>{{signmsg.project}}</li>
                             <li><div class="fL">标段</div>{{signmsg.tender}}</li>
                             <li><div class="fL">期数</div>第{{ToChinaseNum(signmsg.phaseno)}}期</li>
                         </ul>
                     </div>
                     <div class="signed-list">
-                        <ul>
+                        <ul class="list-unstyled">
                             <!-- if !empty({{auditlist}}) -->
                             <!-- loop auditlist -->
                             <li><div class="no fL">{{auditlist' value.index}}</div><div class="avatars fL"><img src="{{auditlist' value.avatar}}">{{auditlist' value.aname}}</div><div class="corl fR"><!-- if {{auditlist' value.status}} == 'checked' --><span class="colGreen">完成</span><!-- elseif {{auditlist' value.status}} == 'checking' --><span class="colOrange">签署中</span><!-- else --><span class=""></span><!-- endif --></div></li>
@@ -51,7 +51,7 @@
                         </ul>
                     </div>
                     <div class="btn-bar">
-                        <a href="javascript:void(0);" onclick="judagedonesign();" class="btn btn-success btn-large btn-block">完成签署</a>
+                        <a  href="javascript:void(0);" onclick="judagedonesign();" class="btn btn-success btn-large btn-block">完成签署</a>
                         <div class="clearfix" style="margin-top:15px">
                             <!-- if {{firstsign}} == 0 --><a href="#backsign" data-toggle="modal" class="btn btn-warning fL">退回签署</a><!-- endif -->
                             <a href="#stopsign" data-toggle="modal" class="btn btn-danger<!-- if {{firstsign}} == 1 --> btn-large btn-block<!-- else --> fR<!-- endif -->">终止签署</a>
@@ -65,7 +65,7 @@
                         <!-- if !empty({{attlist}}) -->
                         <!-- loop attlist -->
                         <div class="page" id="pageContainer{{attlist' value.curnum}}" style="background: url('{{rootUrl}}{{attlist' value.filepath}}') no-repeat 0 0;background-size:cover;padding:10px">
-                            <img src="{{rootUrl}}{{attlist' value.filepath}}" style="display: none" style="max-width: 100%">
+                            <img src="{{rootUrl}}{{attlist' value.filepath}}" style="display: none">
                             <!-- if !empty({{attlist' value.auditatt}}) -->
                             <!-- loop attlist' value.auditatt -->
                             <div class="user-sign" style="z-index:10;{{attlist' auditatt' value.position}}">
@@ -96,19 +96,23 @@
     </div>
 </div>
 <!-- 完成签署人弹出 -->
-<div id="donesign" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
-
-    <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-success" onclick="donesign();">确认完成</button>
+<div id="donesign" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h4 id="signtips"></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" onclick="donesign();">确认</button>
+            </div>
+        </div>
     </div>
 </div>
 <!-- 退回签署人弹出 -->
 <!-- if {{firstsign}} == 0 -->
-<div id="backsign" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
+<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">
@@ -123,7 +127,7 @@
 </div>
 <!-- endif -->
 <!-- 终止签署人弹出 -->
-<div id="stopsign" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
+<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">
@@ -157,7 +161,7 @@
             }
         });
         $( ".draggable" ).draggable({ containment: "parent" },{stop: function( event, ui ) {
-        }}).resizable({ maxWidth: 600 },{ maxHeight: 300 },{ aspectRatio: true },{ autoHide: true },{
+        }}).resizable({ maxWidth: 600 },{ maxHeight: 300 },{ aspectRatio: true },{
             stop: function( event, ui ) {
 //                localStorage.setItem('sign_'+$(this).attr('data-num'),$(this).attr('style'));
             }
@@ -297,10 +301,12 @@
     function judagedonesign()
     {
         var flag = false;
+        var num = 0;
         $('.page .draggable').each(function(k,v){
             if(localStorage.getItem('sign_'+$(this).attr('data-num'))){
                 flag = true;
-                return;
+//                return;
+                num++;
             }
 //            if($(this).attr('style') && $(this).css('display') == 'block'){
 //                flag = true;
@@ -308,6 +314,11 @@
 //            }
         });
         if(flag){
+            if(num < {{signmsg.pagenum}}){
+                $('#signtips').html('<span class="text-danger">报表存在未签署或未点击确认的签名，确认提交吗？</span><img src="{{rootUrl}}global/images/signtipsimg.png">');
+            }else{
+                $('#signtips').text('完成后不可更改，确认完成签署？');
+            }
             $('#donesign').modal('show');
 
         }else{

protected/view/top.html

@@ -1,13 +1,20 @@
 <div class="wrapHeader">
     <h1 title="纵横计量支付" class="mainLogo"></h1>
     <div class="userInfo"><img src="{{rootUrl}}{{user.avatar}}" class="fR">
+        <!-- if {{zhisset(version)}} && !empty({{version}}) -->
         <div class="btn-group">
-            <button data-toggle="dropdown" class="btn dropdown-toggle">{{user.name}}&nbsp;<span class="caret"></span>
+            <a href="{{download}}"><button class="btn btn-inverse dropdown-toggle" style="color: #333;">下载桌面软件 v{{version}}</button></a>
+        </div>
+        <!-- endif -->
+        <div class="btn-group">
+            <a href="{{rootUrl}}user/profile/app"><button class="btn btn-inverse dropdown-toggle" style="color: #333;">手机APP</button></a>
+        </div>
+        <div class="btn-group">
+            <button data-toggle="dropdown" class="btn btn-inverse dropdown-toggle">{{user.name}}&nbsp;<span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
                 <li><a href="{{rootUrl}}user/profile">个人信息</a></li>
                 <li><a href="{{rootUrl}}user/profile/sms">短信通知</a></li>
-                <li><a href="{{rootUrl}}user/profile/app">APP</a></li>
                 <li class="hide"><a href="#"><span data-icon="r" aria-hidden="true"></span>&nbsp;工作组</a></li>
                 <li class="hide"><a href="#"><span data-icon="B" aria-hidden="true"></span>&nbsp;我的任务</a></li>
                 <li class="divider"></li>

protected/view/w-project-section-detail.html

@@ -22,27 +22,34 @@
 		<div class="mainContent">
 			<div class="title clearfix">
 				<ul class="nav nav-pills">
-					<li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
+					<li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currProID}}/section"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
 					<li class="dropdown">
-
+						<a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown" class="dropdown-toggle">
+							{{currProName}}<b class="caret"></b>
+						</a>
+						<ul class="dropdown-menu">
+							<!-- loop othrPro -->
+							<li><a href="{{rootUrl}}project/{{othrPro' value.pid}}/section">{{othrPro' value.pname}}</a></li>
+							<!-- endloop -->
+						</ul>
 					</li>
 					<li class="dropdown">
-						<a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+						<a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown" class="dropdown-toggle">
 							{{currconArray.stname}}<b class="caret"></b>
 						</a>
 						<ul class="dropdown-menu">
 							<!-- loop allconArray -->
-							<li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+							<li><a href="{{rootUrl}}project/{{currProID}}/section">{{allconArray' value.stname}}</a></li>
 							<!-- endloop -->
 						</ul>
 					</li>
 					<li class="dropdown">
-						<a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
+						<a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown" class="dropdown-toggle">
 							{{curractmeasureArray.pmname}}<b class="caret"></b>
 						</a>
 						<ul class="dropdown-menu">
 							<!-- loop allactmeasureArray -->
-							<li><a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+							<li><a href="{{rootUrl}}project/{{currProID}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
 							<!-- endloop -->
 							<!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -58,6 +65,7 @@
 				<li>
 					<a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a>
 				</li>
+				<!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
 				<!--			<li><a href="/project/{{pid}}/section/{{pmid}}/measure">计量台帐</a></li>-->
 			</ul>
 			<!--导航-->

protected/view/w-project-section-files-recover.html

@@ -6,12 +6,12 @@
     <meta name=description content=计量支付>
     <meta name=copyright content=smartcost.com.cn>
     <link rel=stylesheet href={{rootUrl}}global/css/fixedheadertable.css>
-    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
     <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
     <link rel=stylesheet href="{{rootUrl}}global/css/style.css">
     <script src="{{rootUrl}}global/js/jquery-1.9.1.min.js"></script>
     <script src="{{rootUrl}}global/js/bootstrap.js"></script>
     <script src="{{rootUrl}}global/js/jl.js"></script>
+    <script src={{rootUrl}}global/js/jquery.fixedheadertable.js></script>
 </head>
 <body>
 <!-- include "top" -->
@@ -22,31 +22,38 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currProID}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currProName}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop othrPro -->
+                            <li><a href="{{rootUrl}}project/{{othrPro' value.pid}}/section">{{othrPro' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}project/{{currProID}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}project/{{currProID}}/section/{{allactmeasureArray' value.pmid}}/files/recover">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -60,6 +67,7 @@
                     <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
             </ul>
             <!--导航-->
@@ -125,19 +133,13 @@
                         </tbody>
                     </table>
 
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
-                            <!--<li class="disabled"><a href="#">&laquo;</a></li>-->
-                            <!--<li class="active"><a href="#">1</a></li>-->
-                            <!--<li><a href="#">2</a></li>-->
-                            <!--<li><a href="#">3</a></li>-->
-                            <!--<li><a href="#">4</a></li>-->
-                            <!--<li><a href="#">5</a></li>-->
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none">
                     <input type="hidden" id="imnid" value="0"/>
                     <table class="table table-striped">
                         <thead>
@@ -182,49 +184,61 @@
     </div>
 </div>
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件恢复</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">恢复成功。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件恢复</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">恢复成功。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-error">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="del" class="btn btn-danger">确定删除</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger">彻底删除无法还原，所有清单下挂的该文件都将移除。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="del" class="btn btn-danger">确定删除</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>
 <!-- 删除弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del2" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del2" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-warning">文件上传者才有彻底删除权限。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>

protected/view/w-project-section-files.html

@@ -22,31 +22,38 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currProID}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
-
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown" class="dropdown-toggle">
+                            {{currProName}}<b class="caret"></b>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!-- loop othrPro -->
+                            <li><a href="{{rootUrl}}project/{{othrPro' value.pid}}/section">{{othrPro' value.pname}}</a></li>
+                            <!-- endloop -->
+                        </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}project/{{currProID}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}project/{{currProID}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}project/{{currProID}}/section/{{allactmeasureArray' value.pmid}}/files">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -60,27 +67,33 @@
                     <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!-- if {{imediateSwitch}} == 1 --><li><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/intermediate">中间计量草图</a></li><!-- endif -->
                 <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
             </ul>
             <!--导航-->
             <!--筛选工具-->
+            <br>
             <div class="clearfix">
-                <form class="form-inline">
-                    <select id="numpname" class="span2">
-                        <option value="0">不限期数</option>
-                        <!-- loop groupArray -->
-                        <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
-                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
-                        </option>
-                        <!-- endloop -->
-                    </select>
-                    <select id="uploaduser" class="span2">
-                        <option value="0">上传者</option>
-                        <!-- loop owneridArray -->
-                        <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
-                        <!-- endloop -->
-                    </select>
+                <form class="row">
+                    <div class="col-sm-2">
+                        <select class="form-control" id="numpname" class="span2">
+                            <option value="0">不限期数</option>
+                            <!-- loop groupArray -->
+                            <option <!-- if {{num}} == {{groupArray' value.numpname}} --> selected <!-- endif -->
+                            value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                            </option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
+                    <div class="col-sm-2">
+                        <select class="form-control" id="uploaduser" class="span2">
+                            <option value="0">上传者</option>
+                            <!-- loop owneridArray -->
+                            <option <!-- if {{userid}} == {{owneridArray' value.ownerid}} --> selected <!-- endif -->
+                            value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
+                            <!-- endloop -->
+                        </select>
+                    </div>
                     <a href="/project/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
                 </form>
             </div>
@@ -136,13 +149,13 @@
                         <!-- endloop -->
                         </tbody>
                     </table>
-                    <div class="pagination">
-                        <ul>
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination">
                             {{pager}}
                         </ul>
-                    </div>
+                    </nav>
                 </div>
-                <div class="filesDetail hide">
+                <div class="filesDetail" style="display: none">
                     <table class="table table-striped">
                         <thead>
                         <tr>
@@ -195,92 +208,108 @@
     </div>
 </div>
 <!-- 编辑弹出 -->
-<div id="file-edit" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-edit" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件编辑</h3>
-    </div>
-    <div class="modal-body">
-        <div class="form">
-            <form class="form-horizontal">
-                <input type="hidden" id="upimnid" name="upimnid" value=""/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">文件名称</label>
-                    <div class="controls">
-                        <input name="upfilename" id="upfilename" type="text"/>
-                    </div>
-                </div>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">备注/描述</label>
-                    <div class="controls">
-                        <textarea name="upfiledesc" id="upfiledesc"></textarea>
-                    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件编辑</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form">
+                    <form class="form-horizontal">
+                        <input type="hidden" id="upimnid" name="upimnid" value=""/>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">文件名称</label>
+                            <div class="col-sm-8">
+                                <input class="form-control" name="upfilename" id="upfilename" type="text"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">备注/描述</label>
+                            <div class="col-sm-8">
+                                <textarea class="form-control" name="upfiledesc" id="upfiledesc"></textarea>
+                            </div>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="updateFileDesc" class="btn btn-primary">确定修改</button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="updateFileDesc" class="btn btn-primary">确定修改</button>
-    </div>
 </div>
 <!-- 编辑弹出 -->
 <!-- 替换弹出 -->
-<div id="file-replace" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-replace" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件替换</h3>
-    </div>
-    <div class="modal-body">
-        <div class="form">
-            <form class="form-horizontal">
-                <input type="hidden" name="fid" value="0" id="fid"/>
-                <div class="control-group">
-                    <label class="control-label" for="inputEmail">选择文件</label>
-                    <div class="controls">
-                        <input name="file" id="file" type="file">
-                        <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
-                    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件替换</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form">
+                    <form class="form-horizontal">
+                        <input type="hidden" name="fid" value="0" id="fid"/>
+                        <div class="form-group">
+                            <label class="control-label col-sm-3">选择文件</label>
+                            <div class="col-sm-8">
+                                <input name="file" id="file" type="file">
+                                <span class="help-block">替换新文件后，所有已下挂该文件的清单都将更新。</span>
+                            </div>
+                        </div>
+                    </form>
                 </div>
-            </form>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+                <button id="btreplacefile" class="btn btn-primary">确定替换</button>
+            </div>
         </div>
     </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-        <button id="btreplacefile" class="btn btn-primary">确定替换</button>
-    </div>
 </div>
 <!-- 替换弹出 -->
 <!-- 删除弹出 -->
-<div id="file-del" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">文件删除</h3>
-    </div>
-    <div class="modal-body">
-        <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">文件删除</h4>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-success">文件删除成功，您可以在附件回收站恢复它。</h5>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>
 <!-- 删除弹出 -->
 <!-- 历史版本弹出 -->
-<div id="file-history" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+<div id="file-history" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
      aria-hidden="true">
-    <input type="hidden" name="iaid" value="0" id="iaid"/>
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel">历史版本</h3>
-    </div>
-    <div id="historyHTML" class="modal-body">
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <input type="hidden" name="iaid" value="0" id="iaid"/>
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title">历史版本</h4>
+            </div>
+            <div id="historyHTML" class="modal-body">
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+            </div>
+        </div>
     </div>
 </div>
 </div>

protected/view/w-project-section.html

@@ -48,104 +48,116 @@
 	    </div>
 	</div>
 	<!-- 添加标段类型弹出 -->
-	<div id="addsection" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	    <form class="form-horizontal" method="post" name="tenderform">
-		<div class="modal-header">
-		    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		    <h3 id="myModalLabel">添加标段类型</h3>
-		</div>
-		<div class="modal-body">
-		    <div class="form">
-			<div class="control-group">
-			    <label class="control-label" for="inputEmail">标段类型名称</label>
-			    <div class="controls">
-				<input type="text" placeholder="输入标段类型名称" id="secname" name="secname" />
-			    </div>
+	<div id="addsection" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<form class="form-horizontal" method="post" name="tenderform">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+						<h4 class="modal-title">添加标段类型</h4>
+					</div>
+					<div class="modal-body">
+						<div class="form">
+							<div class="form-group">
+								<label class="control-label col-sm-3">标段类型名称</label>
+								<div class="col-sm-8">
+									<input type="text" class="form-control" placeholder="输入标段类型名称" id="secname" name="secname" />
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+						<input type="submit" name="secsub" id="secsub" class="btn btn-primary" value="保存" />
+					</div>
+				</form>
 			</div>
-		    </div>
 		</div>
-		<div class="modal-footer">
-		    <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-		    <input type="submit" name="secsub" id="secsub" class="btn btn-primary" value="保存" />
-		</div>
-	    </form>
 	</div>
 	<!-- 添加标段类型弹出 -->
 	<!-- 项目设置弹出 -->
-	<div id="pojoption" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	    <div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel">项目设置</h3>
-	    </div>
-	    <div class="modal-body">
+	<div id="pojoption" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h4 class="modal-title">项目设置</h4>
+				</div>
+				<div class="modal-body">
 
-		<div class="form">
-		    <form class="form-horizontal">
-			<div class="control-group">
-			    <label class="control-label" for="inputEmail">项目名称</label>
-			    <div class="controls">
-				<input type="text" placeholder="输入项目名称" value="黄金大桥项目">
-			    </div>
+					<div class="form">
+						<form class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label">项目名称</label>
+								<div class="controls">
+									<input type="text" class="form-control" placeholder="输入项目名称" value="黄金大桥项目">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">KEY</label>
+								<div class="controls">
+									<input type="text" class="form-control" placeholder="这是该项目的KEY" value="QWESD134SD123" readonly class="span2">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">颜色标识</label>
+								<div class="controls">
+									<ul class="pjColorList">
+										<li class="pjColor pj-c1 pjSelect"></li>
+										<li class="pjColor pj-c2"></li>
+										<li class="pjColor pj-c3"></li>
+										<li class="pjColor pj-c4"></li>
+										<li class="pjColor pj-c5"></li>
+										<li class="pjColor pj-c6"></li>
+										<li class="pjColor pj-c7"></li>
+										<li class="pjColor pj-c8"></li>
+									</ul>
+								</div>
+							</div>
+						</form>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+					<button class="btn btn-primary">保存</button>
+				</div>
 			</div>
-			<div class="control-group">
-			    <label class="control-label" for="inputPassword">KEY</label>
-			    <div class="controls">
-				<input type="text" placeholder="这是该项目的KEY" value="QWESD134SD123" readonly class="span2">
-			    </div>
-			</div>
-			<div class="control-group">
-			    <label class="control-label" for="inputEmail">颜色标识</label>
-			    <div class="controls">
-				<ul class="pjColorList">
-				    <li class="pjColor pj-c1 pjSelect"></li>
-				    <li class="pjColor pj-c2"></li>
-				    <li class="pjColor pj-c3"></li>
-				    <li class="pjColor pj-c4"></li>
-				    <li class="pjColor pj-c5"></li>
-				    <li class="pjColor pj-c6"></li>
-				    <li class="pjColor pj-c7"></li>
-				    <li class="pjColor pj-c8"></li>
-				</ul>
-			    </div>
-			</div>
-		    </form>
 		</div>
-	    </div>
-	    <div class="modal-footer">
-		<button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-		<button class="btn btn-primary">保存</button>
-	    </div>
 	</div>
 	<!-- 项目设置弹出 -->
 	<!-- 标段类型设置弹出 -->
-	<div id="secoption" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	    <div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel">标段类型设置</h3>
-	    </div>
-	    <div class="modal-body">
-		<form class="form-horizontal" method="post">
-		    <input id="stid" name="stid" type="hidden" value="0" />
-		    <div class="form">
-			<div class="control-group">
-			    <label class="control-label" for="inputEmail">标段类型名称</label>
-			    <div class="controls">
-				<input id="proname" name="proname" type="text" placeholder="输入类型类型名称">
-			    </div>
+	<div id="secoption" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h4 class="modal-title">标段类型设置</h4>
+				</div>
+				<form class="form-horizontal" method="post">
+					<div class="modal-body">
+						<input id="stid" name="stid" type="hidden" value="0" />
+						<div class="form">
+							<div class="form-group">
+								<label class="control-label col-sm-3">标段类型名称</label>
+								<div class="col-sm-8">
+									<input id="proname" class="form-control" name="proname" type="text" placeholder="输入类型类型名称">
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="control-label col-sm-3">KEY</label>
+								<div class="col-sm-8">
+									<input id="key" type="text" class="form-control" placeholder="这是该项目的KEY" value="QWESD134SD123"  class="span2"  onfocus="this.select()" onmouseover="this.focus()">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+						<button class="btn btn-primary">保存</button>
+					</div>
+				</form>
 			</div>
-			<div class="control-group">
-			    <label class="control-label" for="inputPassword">KEY</label>
-			    <div class="controls">
-				<input id="key" type="text" placeholder="这是该项目的KEY" value="QWESD134SD123"  class="span2"  onfocus="this.select()" onmouseover="this.focus()">
-			    </div>
-			</div>
-		    </div>
-	    </div>
-	    <div class="modal-footer">
-		<button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
-		<button class="btn btn-primary">保存</button>
-	    </div>
-	</form>
+		</div>
     </div>
     <!-- 标段类型设置弹出 -->
     <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>

protected/view/w-share-erro.html

@@ -15,15 +15,15 @@
 <body style="overflow:auto">
 <div class="wrapHeader"><h1 title="纵横计量支付" class="mainLogo"></h1></div>
 <div class="mainContent">
-    <div class="row-fluid" style="margin-top:200px">
-        <div class="span3"></div>
-        <div class="span6">
-            <div class="alert alert-block alert-error fade in">
+    <div class="row" style="margin-top:200px">
+        <div class="col-md-3"></div>
+        <div class="col-md-6">
+            <div class="alert alert-block alert-danger fade in">
                 <h3 class="alert-heading">分享链接未启用</h3>
                 <h5>该分享已被项目所有者关闭，暂时无法查阅，请联系相关项目所有者。</h5>
             </div>
         </div>
-        <div class="span3"></div>
+        <div class="col-md-3"></div>
     </div>
 
 

protected/view/w-share-project-section-detail.html

@@ -23,7 +23,7 @@
         <div class="detail">
             <h5>总价：￥{{pros.bcontracttotal}}元 (<span class="colRed">+￥{{pros.bchangTotal}}</span>)</h5>
           <div class="progress">
-            <div class="bar bar-success" style="width: {{pros.pcurrdone}};">{{pros.pcurrdone}}</div>
+            <div class="progress-bar progress-bar-success" style="width: {{pros.pcurrdone}};">{{pros.pcurrdone}}</div>
           </div>
         </div>
       </div>
@@ -31,7 +31,7 @@
     <!--标段信息-->
     <ul class="nav nav-tabs">
         <li class="active">
-        <a href="w-project-detail.html">标段信息</a>
+        <a href="javascript:void(0);">标段信息</a>
         </li>
     </ul>
     <div class="project">

protected/view/w-share-project-section.html

@@ -24,10 +24,10 @@
             <div class="detail">
                 <h5>总价：￥{{st.bcontracttotal}}元</h5>
                 <div class="progress">
-                    <div class="bar bar-success" style="width:{{st.progress}};" data-placement="bottom" data-toggle="tooltip"
+                    <div class="progress-bar progress-bar-success" style="width:{{st.progress}};" data-placement="bottom" data-toggle="tooltip"
                          data-original-title="累计完成：￥{{st.nprogress}}">{{st.progress}}
                     </div>
-                    <div class="bar bar-danger" style="width:{{st.otherprogress}};" data-placement="bottom" data-toggle="tooltip"
+                    <div class="progress-bar progress-bar-danger" style="width:{{st.otherprogress}};" data-placement="bottom" data-toggle="tooltip"
                          data-original-title="未完成：￥{{st.notherprogress}}">{{st.otherprogress}}
                     </div>
                 </div>
@@ -37,7 +37,7 @@
     <!--标段信息-->
     <ul class="nav nav-tabs">
         <li class="active">
-            <a href="w-project-detail.html">标段信息</a>
+            <a href="javascript:void(0);">标段信息</a>
         </li>
     </ul>
     <div class="project">
@@ -70,13 +70,13 @@
                     <td width="40%" class="taR">
                         <div class="progress">
                             <div data-original-title="截止本期累计完成：{{stidArray' value.nTotalProgress}}" data-toggle="tooltip"
-                                 data-placement="bottom" style="width: {{stidArray' value.displayPercentSnTotalProgress}};" class="bar bar-success">{{stidArray' value.displayPercentSnTotalProgress}}
+                                 data-placement="bottom" style="width: {{stidArray' value.displayPercentSnTotalProgress}};" class="progress-bar progress-bar-success">{{stidArray' value.displayPercentSnTotalProgress}}
                             </div>
                             <div data-original-title="本期完成：{{stidArray' value.ncurrTotalProgress}}" data-toggle="tooltip" data-placement="bottom"
-                                 style="width:{{stidArray' value.displayPercentCurrTotalProgress}};" class="bar">{{stidArray' value.displayPercentCurrTotalProgress}}
+                                 style="width:{{stidArray' value.displayPercentCurrTotalProgress}};" class="progress-bar">{{stidArray' value.displayPercentCurrTotalProgress}}
                             </div>
                             <div data-original-title="未完成：{{stidArray' value.nlessTotalProgress}}" data-toggle="tooltip" data-placement="bottom"
-                                 style="width:{{stidArray' value.displayPercentLessTotalProgress}};" class="bar bar-gary">{{stidArray' value.displayPercentLessTotalProgress}}
+                                 style="width:{{stidArray' value.displayPercentLessTotalProgress}};" class="progress-bar progress-bar-gary">{{stidArray' value.displayPercentLessTotalProgress}}
                             </div>
                         </div>
                     </td>

protected/view/w-share-project.html

@@ -23,7 +23,7 @@
             <div class="detail">
                 <h5>总价：￥{{pros.bcontracttotal}}元 (<span class="colRed">+￥{{pros.bchangTotal}}</span>)</h5>
                 <div class="progress">
-                    <div class="bar bar-success" style="width:{{pros.pcurrdone}};">{{pros.pcurrdone}}</div>
+                    <div class="progress-bar progress-bar-success" style="width:{{pros.pcurrdone}};">{{pros.pcurrdone}}</div>
                 </div>
             </div>
         </div>
@@ -31,7 +31,7 @@
     <!--项目汇总-->
     <ul class="nav nav-tabs">
         <li class="active">
-            <a href="w-project-detail.html">项目汇总</a>
+            <a href="javascript:void(0);">项目汇总</a>
         </li>
     </ul>
     <div class="project">

protected/viewc/sign-list-need_sign.php

@@ -53,7 +53,7 @@
                 <?php endforeach; ?>
               </div>
             </td>
-            <td width="10%"><a href="/sign/needview/<?php echo $v4['sid']; ?>" class="btn btn-primary btn-small">签署</a></td>
+            <td width="10%"><a href="/sign/needview/<?php echo $v4['sid']; ?>" class="btn btn-primary btn-sm">签署</a></td>
           </tr>
           <?php endforeach; ?>
           <?php endif; ?>