2.1.2 no.1 up

global/css/style.css

@@ -896,13 +896,13 @@ left:5px
   margin:0 0 5px 0
 }
 .wrapLogin .loginPanel{
-  width:400px;
+  width:500px;
   position: absolute;
   bottom:50%;
   right:50%;
   padding:10px 20px;
   background:#F8F8F8;
-  margin:0 -200px -100px 0
+  margin:0 -250px -100px 0
 }
 .wrapLogin .loginPanel img{
   margin:0 0 10px 0;
@@ -1067,10 +1067,20 @@ left:5px
   overflow-y: auto;
 }
 .sign-content .page{
+  margin:0 auto;
+  width:1085px;
+  border: 9px solid transparent;
+  position: relative;
+  overflow: hidden;
+  box-sizing: content-box;
+}
+.warp-printer .page{
+  margin:0 auto;
+  width:1085px;
   border: 9px solid transparent;
   position: relative;
   overflow: hidden;
-  text-align: center
+  box-sizing: content-box;
 }
 .sign-side{
   width:220px;
@@ -1131,13 +1141,15 @@ left:5px
   top:10%;
   left:10%;
   z-index: 999;
-  width:300px
+  width:300px;
+  height: 150px;
 }
 .user-sign .focus{
   background:rgba(255,0,0,0.1);
 }
 .user-sign img{
-  width:inherit;
+  /*width:inherit;*/
+  width: 100%;
 }
 .user-sign .img-bar {
   background:#ddd;
@@ -1145,12 +1157,13 @@ left:5px
   position: absolute;
   right:0;
   top:0;
-  display:none;
-}
-.user-sign:hover .img-bar{
-  display: block;
+  /*display:none;*/
 }
-#draggable{
+/*.user-sign:hover .img-bar{*/
+  /*display: block;*/
+/*}*/
+.draggable{
+  display: none;
   cursor: move;
 }
 .user-sign .img-bar a{

protected/class/change.php

@@ -212,7 +212,7 @@ class Changes
 
     public function getPmidGroup($uid)
     {
-        return $this->__changeaudit->find(array('where' => 'uid=?', 'param' => array($uid), 'groupby' => 'pmid', 'asArray' => TRUE));
+        return $this->__changeaudit->find(array('where' => 'uid=? and cid in (SELECT `jl_change`.`cid` FROM `jl_change` WHERE `jl_change`.status!="uncheck")', 'param' => array($uid), 'groupby' => 'pmid', 'asArray' => TRUE));
     }
 
     public function getNumbyMydetail($pmid='',$uid)

protected/class/extras/Uploader.php

@@ -58,7 +58,10 @@ class FileUpload {
 
         if ($this->fileName) {
             $this->fileName = $this->sanitizeFilename($this->fileName);
-            $pathinfo = pathinfo($this->fileName);
+
+            //弃用原生pathinfo(),原因在低版本的php环境下无法正确读取文件名称。
+            //$pathinfo = pathinfo($this->fileName);
+            $pathinfo = $this->mb_pathinfo($this->fileName);
 
             if (isset($pathinfo['extension']) &&
                 isset($pathinfo['filename']))
@@ -85,6 +88,15 @@ class FileUpload {
         return substr(basename('X'.$splited[count($splited)-1], $suffix), 1);
     }
 
+    private function mb_pathinfo($filepath) {
+        preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im',$filepath,$m);
+        if($m[1]) $ret['dirname']=$m[1];
+        if($m[2]) $ret['basename']=$m[2];
+        if($m[5]) $ret['extension']=$m[5];
+        if($m[3]) $ret['filename']=$m[3];
+        return $ret;
+    }
+
     public function getFileName() {
         return $this->fileName;
     }

protected/class/sign.php

@@ -188,7 +188,7 @@ class Signn
     }
 
     public function delSignbysid($sid,$status){
-        if($status == 'checking'){
+        if($status == 'checking' || $status == 'checked'){
 
             $this->_signaudit->sid = $sid;
             $this->_signaudit->delete();

protected/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v2.1.1';
+$config['ver'] = 'v2.1.2';
 

protected/controller/SignController.php

@@ -708,10 +708,10 @@ class SignController extends DooController
      */
     public function signList()
     {
-        if(isset($_POST['delid']) && is_numeric($_POST['delid'])){
+        if(isset($_POST['delid']) && is_numeric($_POST['delid']) && isset($_POST['deltext']) && trim($_POST['deltext']) == '删除报表'){
             //删除未签署报表数据和文件
             $signmsg = $this->sign->getOneSignbysid($_POST['delid']);
-            if(empty($signmsg) && $signmsg['status'] == "checked" && $signmsg['ownuid'] != $this->auth->getUid()){
+            if(empty($signmsg) && $signmsg['ownuid'] != $this->auth->getUid()){
                 exit(json_encode(array('code' => 400),JSON_UNESCAPED_UNICODE));
             }
             $this->sign->delSignbysid($_POST['delid'],$signmsg['status']);
@@ -802,7 +802,7 @@ class SignController extends DooController
 //                $list[$k]['phaseno'] = $phaseno['numpname'];
                 $list[$k]['ownname'] = $this->auth->getName($v['ownuid']);
                 $list[$k]['auditname'] = $this->auth->getName($v['audituid']);
-                $list[$k]['delstatus'] = $this->auth->getUid() == $v['ownuid'] && $v['status'] != 'checked' && $v['isinter'] != 3 ? 1 : 0;
+                $list[$k]['delstatus'] = $this->auth->getUid() == $v['ownuid'] && $v['isinter'] != 3 ? 1 : 0;
             }
         }
 

protected/view/sign-view-page.html

@@ -7,7 +7,7 @@
     <meta name=copyright content=smartcost.com.cn>
     <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/style.css?20170828>
+    <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>