Merge branch 'feature/1.8.3' into develop

global/js/jl.js

@@ -1,5 +1,6 @@
 function autoFlashHeight() {
     var signSide = $(".sign-side").width();
+    var viewInfo = $(".view-info").height();
     $(".body").height($(window).height());
     $(".mainContainer").height($(window).height() - 51);
     $(".adminContent").height($(window).height() - 117);
@@ -13,6 +14,7 @@ function autoFlashHeight() {
     $(".sign-content").width($(window).width() - signSide - 69);
     $(".sign-content-warp").height($(window).height() - 30);
     $(".sign-content-warp").width($(window).width());
+    $(".signed-list").height($(window).height()-viewInfo-186);
 };
 $(window).resize(autoFlashHeight);
 

protected/class/sign.php

@@ -27,7 +27,7 @@ class Signn
     }
 
     public function getUnSignNum($sql,$uid){
-        return $this->_sign->count(array('where' => $sql.' and status="uncheck" AND (`ownuid`='.$uid.' OR tender IN (SELECT pmid FROM jl_measure_audit WHERE auditoruid='.$uid.' GROUP BY auditoruid))', 'asArray' => TRUE));
+        return $this->_sign->count(array('where' => $sql.' and status="uncheck" 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'){
@@ -125,7 +125,7 @@ class Signn
     }
 
     public function getUnSignList($sql, $uid, $limit){
-        return $this->_sign->find(array('where' => $sql.' and status="uncheck" AND (`ownuid`='.$uid.' OR tender IN (SELECT pmid FROM jl_measure_audit WHERE auditoruid='.$uid.' GROUP BY auditoruid))', 'desc' => 'sid', 'limit' => $limit, 'asArray' => TRUE));
+        return $this->_sign->find(array('where' => $sql.' and status="uncheck" 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.'))', 'desc' => 'sid', 'limit' => $limit, 'asArray' => TRUE));
     }
 
     public function getSignList($sql, $limit){
@@ -184,7 +184,20 @@ class Signn
         return $this->_sign->find(array('select' => 'phaseno', 'where' => $sql.' and tender=?', 'param' => array($pmid), 'groupby' => 'phaseno', 'asArray' => TRUE));
     }
 
-    public function delSignbysid($sid){
+    public function delSignbysid($sid,$status){
+        if($status == 'checking'){
+
+            $this->_signaudit->sid = $sid;
+            $this->_signaudit->delete();
+
+            $attlist = $this->getSignAttList($sid);
+            foreach ($attlist as $key => $value) {
+                $this->_signauditatt->said = $value['said'];
+                $this->_signauditatt->delete();
+            }
+
+        }
+
         $this->_sign->sid = $sid;
         $this->_sign->delete();
 

protected/config/ver.conf.php

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

protected/controller/SignController.php

@@ -528,7 +528,7 @@ class SignController extends DooController
         $this->data['phaseno'] = '';
 
         //获取项目信息
-        $searchsql = 'status="uncheck" AND (`ownuid`='.$this->auth->getUid().' OR tender IN (SELECT pmid FROM jl_measure_audit WHERE auditoruid='.$this->auth->getUid().'))';
+        $searchsql = 'status="uncheck" AND (`ownuid`='.$this->auth->getUid().' OR tender IN (SELECT pmid FROM jl_measure_audit WHERE auditoruid='.$this->auth->getUid().') OR project IN (SELECT pid FROM jl_project_measure WHERE uid='.$this->auth->getUid().'))';
         $itemlist = $this->sign->getSignGroupByProject($searchsql);
         if(!empty($itemlist)){
             foreach($itemlist as $ik => $iv){
@@ -610,10 +610,10 @@ class SignController extends DooController
         if(isset($_POST['delid']) && is_numeric($_POST['delid'])){
             //删除未签署报表数据和文件
             $signmsg = $this->sign->getOneSignbysid($_POST['delid']);
-            if(empty($signmsg) && $signmsg['status'] == "uncheck" && $signmsg['ownuid'] != $this->auth->getUid()){
+            if(empty($signmsg) && $signmsg['status'] == "checked" && $signmsg['ownuid'] != $this->auth->getUid()){
                 exit(json_encode(array('code' => 400),JSON_UNESCAPED_UNICODE));
             }
-            $this->sign->delSignbysid($_POST['delid']);
+            $this->sign->delSignbysid($_POST['delid'],$signmsg['status']);
 
             include (DOO::conf()->SITE_PATH . 'protected/plugin/io.han.php');
             $this->IoHandler = new IoHandler();
@@ -701,6 +701,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' ? 1 : 0;
             }
         }
 

protected/view/sign-list-all.html

@@ -80,7 +80,7 @@
                             <td>{{list' value.ownname}}<br>{{formatDate(list' value.intime,'Y-m-d')}}</td>
                             <td><!-- if !empty({{list' value.auditname}}) -->{{list' value.auditname}}<!-- endif --><br><!-- if !empty({{list' value.aintime}}) -->{{formatDate(list' value.aintime,'Y-m-d')}}<!-- endif --></td>
                             <td><!-- if {{list' value.status}} == 'checked' --><span class="colGreen">完成</span><br>{{formatDate(list' value.sintime,'Y-m-d')}}<!-- elseif {{list' value.status}} == 'checking' --><span class="colOrange">签署中</span><br><!-- elseif {{list' value.status}} == 'uncheck' -->未发起签署<!-- endif --></td>
-                            <td width=""><a class="btn btn-small" href="/sign/view/{{list' value.sid}}">查看报表</a><!-- if {{list' value.status}} == 'uncheck' -->&nbsp;<a class="btn btn-danger btn-small delbtn" href="#del" data-toggle="modal" delid="{{list' value.sid}}">删除</a><!-- endif --></td>
+                            <td width=""><a class="btn btn-small" href="/sign/view/{{list' value.sid}}">查看报表</a><!-- if {{list' value.delstatus}} == 1 -->&nbsp;<a class="btn btn-danger btn-small delbtn" href="#del" data-toggle="modal" delid="{{list' value.sid}}">删除</a><!-- endif --></td>
                         </tr>
                         <!-- endloop -->
                         <!-- endif -->

protected/view/sign-view-set_signer.html

@@ -48,10 +48,10 @@
                         <ul>
                         </ul>
                         <li class="add"><a href="#addsign" data-toggle="modal">+ 添加签署人</a></li>
-                        <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>
-                        </div>
+                    </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>
                     </div>
                 </div>
                 <input type="hidden" id="maxwidth" value="{{maxwidth}}">