소스 검색

1.9.0 no.3 up

likeku 8 년 전
부모
커밋
2adfe730c5

+ 14 - 0
protected/config/routes.conf.php

@@ -390,5 +390,19 @@ $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');
+
 
 ?>

+ 241 - 33
protected/controller/ProjectController.php

@@ -76,6 +76,9 @@ class ProjectController extends DooController
 
         //获取桌面版本
         $this->getsoftware();
+
+        //草图入口
+        $this->data['imediateSwitch'] = $this->aconfig->getOne(array('select' => 'imediateswitch', 'asArray' => TRUE))['imediateswitch'];
     }
 
     function getsoftware(){
@@ -443,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']);
@@ -556,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']);
@@ -775,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'])) {
@@ -801,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();
@@ -911,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!=0';
+//        $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);
+    }
+
+
 }
 
 ?>

+ 278 - 23
protected/controller/RProjectController.php

@@ -67,6 +67,9 @@ class RProjectController extends DooController
 
         //获取桌面版本
         $this->getsoftware();
+
+        //草图入口
+        $this->data['imediateSwitch'] = $this->aconfig->getOne(array('select' => 'imediateswitch', 'asArray' => TRUE))['imediateswitch'];
     }
 
     function getsoftware(){
@@ -307,16 +310,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'])) {
@@ -331,7 +332,7 @@ class RProjectController extends DooController
         } else {
             $this->data['currconArray'] = $this->data['allconArray'] = NULL;
         }
-// 面包屑导航标段
+        // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
         $actmeasureArray = $this->actmeasure->getAll();
@@ -422,16 +423,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'])) {
@@ -446,7 +445,7 @@ class RProjectController extends DooController
         } else {
             $this->data['currconArray'] = $this->data['allconArray'] = NULL;
         }
-// 面包屑导航标段
+        // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
         $actmeasureArray = $this->actmeasure->getAll();
@@ -608,15 +607,47 @@ 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'] = [];
+        $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;
+                }
+            }
+        }
+
+        $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);
@@ -632,7 +663,43 @@ 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'] = [];
+        $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;
+                }
+            }
+        }
 
 
         // 期数列表
@@ -824,6 +891,194 @@ 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'] = [];
+        $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['phaseno'] = '';
+        $this->data['nosign'] = '';
+
+        //获取项目信息
+        $searchsql = 'isinter!=0 and sid IN (SELECT sid FROM jl_sign_audit WHERE jl_sign_audit.audituid='.$this->auth->getUid().')';
+
+        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;
+
+
+        $this->data['pid'] = $this->params['pid'];
+        $this->data['pmid'] = $this->params['pmid'];
+        $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);
+    }
 }
 
 ?>

+ 27 - 6
protected/controller/SProjectController.php

@@ -136,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']));
@@ -434,8 +443,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;
@@ -549,8 +564,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;

+ 29 - 33
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>

+ 15 - 7
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>

+ 11 - 3
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>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 135 - 0
protected/view/r-project-section-intermediate.html


+ 37 - 1
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>

+ 3 - 3
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>

+ 15 - 8
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>
             <!--导航-->

+ 9 - 2
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>-->

+ 1 - 1
protected/view/s-project-section-intermediate.html

@@ -29,7 +29,7 @@
             </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>

+ 14 - 6
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>
 			<!--导航-->

+ 14 - 6
protected/view/w-project-section-files-recover.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/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>
             <!--导航-->

+ 14 - 6
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,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>
             <!--导航-->

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 129 - 0
protected/view/w-project-section-intermediate.html


+ 0 - 26
protected/viewc/top.php

@@ -1,26 +0,0 @@
-<div class="wrapHeader">
-    <h1 title="纵横计量支付" class="mainLogo"></h1>
-    <div class="userInfo"><img src="<?php echo $data['rootUrl']; ?><?php echo $data['user']['avatar']; ?>" class="fR">
-        <?php if( zhisset($data['version']) ): ?>
-        <div class="btn-group">
-            <a href="<?php echo $data['download']; ?>" class="btn dropdown-toggle">下载桌面软件 v<?php echo $data['version']; ?></a>
-        </div>
-        <?php endif; ?>
-        <div class="btn-group">
-            <a href="<?php echo $data['rootUrl']; ?>user/profile/app" class="btn dropdown-toggle">手机APP</a>
-        </div>
-        <div class="btn-group">
-            <button data-toggle="dropdown" class="btn dropdown-toggle"><?php echo $data['user']['name']; ?>&nbsp;<span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-                <li><a href="<?php echo $data['rootUrl']; ?>user/profile">个人信息</a></li>
-                <li><a href="<?php echo $data['rootUrl']; ?>user/profile/sms">短信通知</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>
-                <li class="hide"><a href="#">帮助中心</a></li>
-                <li><a href="<?php echo $data['rootUrl']; ?>signout">退出</a></li>
-            </ul>
-        </div>
-    </div>
-</div>