1.8.0版本提交

jlweb1.7.0.sql

@@ -2,8 +2,8 @@
 -- version 4.7.0
 -- https://www.phpmyadmin.net/
 --
+-- Host: 10.27.6.148
+-- Generation Time: 2017-07-10 09:18:53
 -- 服务器版本： 5.7.17-13
 -- PHP Version: 7.0.15-0ubuntu0.16.04.4
 
@@ -18,6 +18,10 @@ SET time_zone = "+00:00";
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
 /*!40101 SET NAMES utf8mb4 */;
 
+--
+-- Database: `jlweb`
+--
+
 -- --------------------------------------------------------
 
 --
@@ -71,15 +75,18 @@ CREATE TABLE `jl_config` (
   `proname` char(255) NOT NULL,
   `onoff` tinyint(2) NOT NULL DEFAULT '0',
   `upgradeinfo` text NOT NULL,
-  `smsswitch` tinyint(4) NOT NULL DEFAULT '1'
+  `smsswitch` tinyint(4) NOT NULL DEFAULT '1',
+  `reportswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '软件生成报表开关',
+  `signswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'web在线签署开启开关',
+  `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
 -- 转存表中的数据 `jl_config`
 --
 
-INSERT INTO `jl_config` (`conid`, `proname`, `onoff`, `upgradeinfo`, `smsswitch`) VALUES
-(1, '', 0, '', 1);
+INSERT INTO `jl_config` (`conid`, `proname`, `onoff`, `upgradeinfo`, `smsswitch`, `reportswitch`, `signswitch`, `launchsignswitch`) VALUES
+(1, '', 0, '', 0, 1, 1, 1);
 
 -- --------------------------------------------------------
 
@@ -149,6 +156,21 @@ CREATE TABLE `jl_measure_audit` (
 -- --------------------------------------------------------
 
 --
+-- 表的结构 `jl_measure_concern`
+--
+
+CREATE TABLE `jl_measure_concern` (
+  `mcid` mediumint(9) NOT NULL,
+  `pid` mediumint(9) NOT NULL COMMENT '项目id',
+  `stid` mediumint(9) NOT NULL COMMENT '标段类型id',
+  `pmid` mediumint(9) NOT NULL COMMENT '标段id',
+  `uid` mediumint(9) NOT NULL COMMENT '关注人id',
+  `intime` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标段关注人表';
+
+-- --------------------------------------------------------
+
+--
 -- 表的结构 `jl_measure_numofper`
 --
 
@@ -349,8 +371,8 @@ CREATE TABLE `jl_user_profiles` (
   `groups` enum('vip','anonymous') NOT NULL DEFAULT 'anonymous',
   `avatar` char(255) NOT NULL DEFAULT 'global/avatar/avtra.jpg',
   `isnotice` tinyint(4) NOT NULL DEFAULT '0',
-  `signpath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'global/signpath/signavatar.png' COMMENT '签名图片地址',
-  `remark` varchar(500) NOT NULL COMMENT '备注信息'
+  `remark` varchar(500) NOT NULL COMMENT '备注信息',
+  `signpath` varchar(255) NOT NULL DEFAULT 'global/signpath/signavatar.png' COMMENT '签名图片地址'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -411,6 +433,12 @@ ALTER TABLE `jl_measure_audit`
   ADD UNIQUE KEY `auditoruid` (`auditoruid`,`pmid`,`numpname`,`times`);
 
 --
+-- Indexes for table `jl_measure_concern`
+--
+ALTER TABLE `jl_measure_concern`
+  ADD PRIMARY KEY (`mcid`);
+
+--
 -- Indexes for table `jl_measure_numofper`
 --
 ALTER TABLE `jl_measure_numofper`
@@ -499,7 +527,7 @@ ALTER TABLE `jl_zero_audit`
 -- 使用表AUTO_INCREMENT `jl_attachment`
 --
 ALTER TABLE `jl_attachment`
-  MODIFY `aid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `aid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5594;
 --
 -- 使用表AUTO_INCREMENT `jl_auser`
 --
@@ -514,67 +542,72 @@ ALTER TABLE `jl_config`
 -- 使用表AUTO_INCREMENT `jl_item_attachment`
 --
 ALTER TABLE `jl_item_attachment`
-  MODIFY `iaid` mediumint(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `iaid` mediumint(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1162;
 --
 -- 使用表AUTO_INCREMENT `jl_item_measure_numofper`
 --
 ALTER TABLE `jl_item_measure_numofper`
-  MODIFY `imnid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `imnid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1030;
 --
 -- 使用表AUTO_INCREMENT `jl_measure_audit`
 --
 ALTER TABLE `jl_measure_audit`
-  MODIFY `maid` smallint(6) NOT NULL AUTO_INCREMENT;
+  MODIFY `maid` smallint(6) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7672;
+--
+-- 使用表AUTO_INCREMENT `jl_measure_concern`
+--
+ALTER TABLE `jl_measure_concern`
+  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=64;
 --
 -- 使用表AUTO_INCREMENT `jl_measure_numofper`
 --
 ALTER TABLE `jl_measure_numofper`
-  MODIFY `mpid` mediumint(9) NOT NULL AUTO_INCREMENT;
+  MODIFY `mpid` mediumint(9) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2140;
 --
 -- 使用表AUTO_INCREMENT `jl_project`
 --
 ALTER TABLE `jl_project`
-  MODIFY `pid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `pid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=321;
 --
 -- 使用表AUTO_INCREMENT `jl_project_measure`
 --
 ALTER TABLE `jl_project_measure`
-  MODIFY `pmid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `pmid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1733;
 --
 -- 使用表AUTO_INCREMENT `jl_section_type`
 --
 ALTER TABLE `jl_section_type`
-  MODIFY `stid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `stid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=498;
 --
 -- 使用表AUTO_INCREMENT `jl_share`
 --
 ALTER TABLE `jl_share`
-  MODIFY `sid` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT;COMMIT;
+  MODIFY `sid` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=16;
 --
 -- 使用表AUTO_INCREMENT `jl_sign`
 --
 ALTER TABLE `jl_sign`
-  MODIFY `sid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=1;
+  MODIFY `sid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=14;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_attachment`
 --
 ALTER TABLE `jl_sign_attachment`
-  MODIFY `said` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=1;
+  MODIFY `said` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=14;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_audit`
 --
 ALTER TABLE `jl_sign_audit`
-  MODIFY `satid` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=1;
+  MODIFY `satid` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=10;
 --
 -- 使用表AUTO_INCREMENT `jl_sign_audit_attachment`
 --
 ALTER TABLE `jl_sign_audit_attachment`
-  MODIFY `saaid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=1;COMMIT;
+  MODIFY `saaid` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', AUTO_INCREMENT=6;
 --
 -- 使用表AUTO_INCREMENT `jl_users`
 --
 ALTER TABLE `jl_users`
-  MODIFY `uid` int(11) NOT NULL AUTO_INCREMENT;
+  MODIFY `uid` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=270;
 --
 -- 使用表AUTO_INCREMENT `jl_users_auth`
 --

jlweb_lastest.sql

@@ -1,259 +0,0 @@
---
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
---
---
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_attachment` (
-  `aid` int(11) NOT NULL AUTO_INCREMENT,
-  `pid` mediumint(9) NOT NULL,
-  `stid` mediumint(9) NOT NULL,
-  `mpid` mediumint(9) NOT NULL,
-  `pmid` mediumint(9) NOT NULL,
-  `numpname` smallint(6) NOT NULL,
-  `times` smallint(6) NOT NULL DEFAULT '0',
-  `auditoruid` mediumint(9) NOT NULL,
-  `filepath` char(255) NOT NULL,
-  `ziphashcode` char(32) NOT NULL,
-  `filehashcode` char(32) NOT NULL,
-  `isnew` tinyint(4) NOT NULL DEFAULT '1',
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`aid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2178 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_auser` (
-  `auid` mediumint(9) NOT NULL AUTO_INCREMENT,
-  `auname` char(255) NOT NULL,
-  `aupass` char(255) NOT NULL,
-  `aemail` char(255) NOT NULL,
-  PRIMARY KEY (`auid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_config` (
-  `conid` tinyint(4) NOT NULL AUTO_INCREMENT,
-  `proname` char(255) NOT NULL,
-  PRIMARY KEY (`conid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_item_attachment` (
-  `iaid` mediumint(11) NOT NULL AUTO_INCREMENT,
-  `mpid` mediumint(11) NOT NULL,
-  `ownerid` smallint(11) NOT NULL,
-  `itemid` char(255) CHARACTER SET utf8 NOT NULL,
-  `filename` char(255) CHARACTER SET utf8 NOT NULL,
-  `fileext` char(5) CHARACTER SET utf8 NOT NULL,
-  `filesize` char(255) CHARACTER SET utf8 NOT NULL,
-  `filepath` char(255) CHARACTER SET utf8 NOT NULL,
-  `categoryid` smallint(6) NOT NULL,
-  `intime` int(11) NOT NULL,
-  `isdel` tinyint(2) NOT NULL DEFAULT '0',
-  `tips` text NOT NULL,
-  PRIMARY KEY (`iaid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=26 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_measure_audit` (
-  `maid` smallint(6) NOT NULL AUTO_INCREMENT,
-  `pid` mediumint(9) NOT NULL,
-  `creatoruid` mediumint(9) NOT NULL,
-  `auditoruid` mediumint(9) NOT NULL DEFAULT '0',
-  `mpid` mediumint(9) NOT NULL DEFAULT '0',
-  `pmid` mediumint(9) NOT NULL,
-  `stid` mediumint(9) NOT NULL,
-  `numpname` mediumint(9) NOT NULL,
-  `times` smallint(6) NOT NULL DEFAULT '0',
-  `mastatus` enum('uncheck','checking','checked','checkno') NOT NULL DEFAULT 'uncheck',
-  `last` tinyint(4) NOT NULL DEFAULT '2',
-  `audittime` int(11) NOT NULL,
-  `auditcontent` text NOT NULL,
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`maid`),
-  UNIQUE KEY `auditoruid` (`auditoruid`,`pmid`,`numpname`,`times`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3405 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_measure_numofper` (
-  `mpid` mediumint(9) NOT NULL AUTO_INCREMENT,
-  `iszero` tinyint(3) unsigned NOT NULL,
-  `uid` mediumint(9) NOT NULL,
-  `pid` smallint(6) unsigned NOT NULL,
-  `pmid` smallint(5) unsigned NOT NULL,
-  `stid` smallint(5) unsigned NOT NULL,
-  `numpname` smallint(5) unsigned NOT NULL,
-  `times` smallint(6) NOT NULL DEFAULT '0',
-  `currcontractval` char(255) NOT NULL COMMENT '本期合同计量',
-  `currchangeval` char(255) NOT NULL COMMENT '本期数量变更计量',
-  `stopnowtotal` char(255) NOT NULL COMMENT '截止上期累计完成',
-  `currdone` char(255) NOT NULL COMMENT '本期完成计量',
-  `curralltotal` char(255) NOT NULL COMMENT '累计完成计量',
-  `currstatus` enum('uncheck','checking','checked','checkno') NOT NULL DEFAULT 'checking',
-  `audittime` int(11) NOT NULL,
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`mpid`),
-  UNIQUE KEY `pmid_numpname_times` (`pmid`,`numpname`,`times`),
-  UNIQUE KEY `mpid` (`mpid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=691 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_project` (
-  `pid` int(11) NOT NULL AUTO_INCREMENT,
-  `uid` mediumint(9) NOT NULL,
-  `pname` char(255) NOT NULL,
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`pid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=159 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_project_measure` (
-  `pmid` int(11) NOT NULL AUTO_INCREMENT,
-  `pid` mediumint(8) DEFAULT '0',
-  `stid` mediumint(8) NOT NULL DEFAULT '0',
-  `uid` mediumint(9) NOT NULL,
-  `pmname` char(255) DEFAULT NULL,
-  `contracttotal` char(255) NOT NULL DEFAULT '0',
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`pmid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=608 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_section_type` (
-  `stid` int(11) NOT NULL AUTO_INCREMENT,
-  `pid` mediumint(8) NOT NULL DEFAULT '0',
-  `uid` mediumint(9) NOT NULL,
-  `stname` char(255) NOT NULL,
-  `stkey` char(255) NOT NULL,
-  `intime` int(11) NOT NULL,
-  PRIMARY KEY (`stid`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=234 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_users` (
-  `uid` int(11) NOT NULL AUTO_INCREMENT,
-  `uemail` char(255) NOT NULL,
-  `upass` char(60) NOT NULL,
-  `intime` int(11) NOT NULL,
-  `isstop` tinyint(1) NOT NULL,
-  PRIMARY KEY (`uid`),
-  UNIQUE KEY `uemail` (`uemail`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=163 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_users_auth` (
-  `aid` int(11) NOT NULL AUTO_INCREMENT,
-  `token` char(255) NOT NULL,
-  `expirestime` int(11) NOT NULL,
-  PRIMARY KEY (`aid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_users_friends` (
-  `uid` int(11) NOT NULL,
-  `fuid` int(11) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_user_profiles` (
-  `userid` int(11) NOT NULL,
-  `name` char(50) NOT NULL,
-  `company` char(255) NOT NULL,
-  `jobs` char(255) NOT NULL,
-  `phone` char(255) NOT NULL,
-  `mobile` char(255) NOT NULL,
-  `qq` char(50) NOT NULL,
-  `groups` enum('vip','anonymous') NOT NULL DEFAULT 'anonymous',
-  `avatar` char(255) NOT NULL DEFAULT 'global/avatar/avtra.jpg',
-  UNIQUE KEY `userid` (`userid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-
---
---
-
-CREATE TABLE IF NOT EXISTS `jl_zero_audit` (
-  `zaid` smallint(6) NOT NULL AUTO_INCREMENT,
-  `uid` int(11) NOT NULL,
-  `catid` int(11) NOT NULL,
-  `auditstatus` int(11) NOT NULL,
-  PRIMARY KEY (`zaid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

protected/class/attfile.php

@@ -177,6 +177,11 @@ class attFile
         return $this->__file->delete(array('where' => 'mpid=?', 'param' => array($mpid)));
     }
 
+    public function getLastFileAid($pmid,$numpname,$times){
+        $result = $this->__file->getOne(array('select' => 'aid', 'where' => 'pmid=? and numpname=? and times=?', 'param' => array($pmid, $numpname, $times), 'desc' => 'aid', 'asArray' => TRUE));
+        return !empty($result) ? $result['aid'] : '';
+    }
+
 }
 
 ?>

protected/class/auth.php

@@ -125,6 +125,12 @@ class Auth
         return $name['name'];
     }
 
+    public function getEmail($uid)
+    {
+        $name = $this->users->getOne(array('select' => 'uemail', 'where' => 'uid=?', 'param' => array($uid), 'asArray' => TRUE));
+        return $name['uemail'];
+    }
+
     public function getRowByUid($uid)
     {
         return $this->profile->getOne(array('where' => 'userid=?', 'param' => array($uid), 'asArray' => TRUE));

protected/class/measureauditact.php

@@ -93,9 +93,9 @@ class MeasureauditAct
         return $this->__measureaudit->find(array('where' => 'mpid=? order by last desc,maid asc', 'param' => array($mpid), 'asArray' => TRUE));
     }
 
-    public function getRowByMpidTimes($mpid,$times)
+    public function getRowByMpidTimes($mpid,$numpname,$times)
     {
-        return $this->__measureaudit->find(array('where' => 'mpid=? and times=? order by last desc,maid asc', 'param' => array($mpid,$times), 'asArray' => TRUE));
+        return $this->__measureaudit->find(array('where' => 'mpid=? and numpname=? and times=? order by last desc,maid asc', 'param' => array($mpid,$numpname,$times), 'asArray' => TRUE));
     }
 
     public function getRowGroupByTimes($mpid)

protected/class/measureconcerner.php

@@ -0,0 +1,46 @@
+<?php
+
+Doo::loadModel('measureconcern');
+
+/**
+ * Description of Users
+ *
+ * @author zongheng
+ */
+class MeasureConcerner
+{
+
+    private $__measureconcern;
+
+    function __construct()
+    {
+        $this->__measureconcern = new MeasureConcern();
+    }
+
+    public function insertMeasureConcern($pid, $stid, $pmid, $uid)
+    {
+        if (!isset($pid))
+            return FALSE;
+        $this->__measureconcern->pid = filter_var($pid, FILTER_VALIDATE_INT);
+        $this->__measureconcern->stid = filter_var($stid, FILTER_VALIDATE_INT);
+        $this->__measureconcern->pmid = filter_var($pmid, FILTER_VALIDATE_INT);
+        $this->__measureconcern->uid = filter_var($uid, FILTER_VALIDATE_INT);
+        $this->__measureconcern->intime = time();
+        return $this->__measureconcern->insert();
+    }
+
+    public function delMeasureConcern($tenderid, $uid)
+    {
+        return $this->__measureconcern->delete(array('where' => 'pmid=? and uid=?', 'param' => array($tenderid, $uid), 'asArray' => TRUE));
+    }
+
+    public function getMeasureConcernList($tenderid){
+        return $this->__measureconcern->find(array('where' => 'pmid=?', 'param' => array($tenderid), 'asArray' => TRUE));
+    }
+
+    public function getRowbyUid($uid){
+        return $this->__measureconcern->find(array('where' => 'uid=?', 'param' => array($uid), 'asArray' => TRUE));
+    }
+
+
+}

protected/config/routes.conf.php

@@ -212,6 +212,7 @@ $route['*']['/manage/item/del/:pmid'] = array('[admin]ItemController', 'itemDel'
 $route['*']['/manage/restore/list'] = array('[admin]RestoreController', 'restoreList');
 $route['*']['/manage/sys/info'] = array('[admin]SysController', 'sysinfo');
 $route['*']['/manage/sys/sms/switch'] = array('[admin]SysController', 'smsSwitch');
+$route['*']['/manage/sys/sign/switch'] = array('[admin]SysController', 'signSwitch');
 
 $route['*']['/manage/item/index'] = array('[admin]ProController', 'index');
 $route['*']['/manage/item/:pid/section'] = array('[admin]ProController', 'section');
@@ -314,4 +315,22 @@ $route['*']['/api/client/sign/create'] = array('ClientController', 'getSignCreat
  */
 $route['*']['/api/client/sign/list'] = array('ClientController', 'getSignList');
 
+/**
+ * 查询标段关注人信息列表
+ */
+$route['*']['/api/client/tender/:tenderid/concernaudit/list'] = array('ClientController', 'getConcernAuditList');
+
+/**
+ * 添加关注标段
+ */
+$route['*']['/api/client/tender/concernaudit/create'] = array('ClientController', 'addConcernAudit');
+/**
+ * 取消关注标段
+ */
+$route['*']['/api/client/tender/concernaudit/del'] = array('ClientController', 'delConcernAudit');
+
+/**
+ * 软件生成报表开关
+ */
+$route['*']['/api/client/sign/switch'] = array('ClientController', 'signSwitch');
 ?>

protected/config/ver.conf.php

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

protected/controller/AppController.php

@@ -260,8 +260,9 @@ class AppController extends DooController {
             $lastRowArray = $this->numofperact->getLastNew2($this->params['pmid']);
             $maxTimes = $this->numofperact->getMaxTimes($lastRowArray['pmid'], $lastRowArray['numpname']);
 //        $auditUserArray = $this->measureauditact->getAllAudit($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times']);
-            $maxtimez = $this->measureauditact->getRowGroupByTimes($numStatusArray['mpid']);
-            $auditUserArray = $this->measureauditact->getRowByMpidTimes($numStatusArray['mpid'], $maxtimez['times']);
+//            $maxtimez = $this->measureauditact->getRowGroupByTimes($numStatusArray['mpid']);
+            $maxtimez = $this->numofperact->getRowByMpid($numStatusArray['mpid']);
+            $auditUserArray = $this->measureauditact->getRowByMpidTimes($numStatusArray['mpid'], $maxtimez['numpname'], $maxtimez['times']);
             $auditArray = $this->measureauditact->getLastNewRowInfo($lastRowArray['pmid'], $lastRowArray['numpname'], $_GET['uid']);
             if (isset($_POST['act'])) {
                 $auditStatusArray = array('checkno', 'checked');

protected/controller/ProjectController.php

@@ -12,6 +12,7 @@ Doo::loadClass('itemfile');
 Doo::loadClass('attachment');
 Doo::loadHelper('DooPager');
 Doo::loadClass('sign');
+Doo::loadModelAt('aconfig', 'admin');
 
 /* * proDetail
  * MainController
@@ -23,7 +24,7 @@ Doo::loadClass('sign');
 class ProjectController extends DooController
 {
 
-    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '<span class = "colGray">未审批</span>', 'checking' => '<span class = "colOrange">审批中</span>', 'checked' => '<span class = "colGreen">审批通过</span>', 'checkno' => '<span class = "colRed">审批不通过</span>'), $itemmeasurenum, $itemfle, $att;
+    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '<span class = "colGray">未审批</span>', 'checking' => '<span class = "colOrange">审批中</span>', 'checked' => '<span class = "colGreen">审批通过</span>', 'checkno' => '<span class = "colRed">审批不通过</span>'), $aconfig, $itemmeasurenum, $itemfle, $att;
 
     public function beforeRun($resource, $action)
     {
@@ -48,6 +49,7 @@ class ProjectController extends DooController
         $this->numofperact = new NumofperAct();
         $this->measureauditact = new MeasureauditAct();
         $this->itemmeasurenum = new ItemMeasureNumpofper();
+        $this->aconfig = new AConfig();
         $this->itemfle = new ItemFile();
         $this->att = new attachment();
         $this->sign = new Signn();
@@ -65,8 +67,11 @@ class ProjectController extends DooController
             $this->data['numofchecking'] = null;
         }
 
+        $this->data['signSwitch'] = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+
         //获取需要您签署的数目
-        $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
+        if($this->data['signSwitch'] > 0)
+            $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
     }
 
@@ -242,16 +247,16 @@ class ProjectController extends DooController
                 $j = $i < 10 ? '0'.$i : $i;
                 $month = $sv.'-'.$j;
                 $thismonth1 = 0;
-                foreach ($allmonth as $keyk => $valuev) {
-                    if ($valuev['month'] == $month)
-                        $thismonth += $valuev['currtotal'];
-                }
-                $total[] = $thismonth != 0 ? $thismonth : 0;
                 foreach ($allmonth1 as $k1 => $v1) {
                     if ($v1['month'] == $month)
                         $thismonth1 += $v1['currdone'];
                 }
                 $total1[] = $thismonth1 != 0 ? $thismonth1 : 0;
+                foreach ($allmonth as $keyk => $valuev) {
+                    if ($valuev['month'] == $month)
+                        $thismonth += $valuev['currtotal'];
+                }
+                $total[] = ($thismonth != 0 && $thismonth1 != 0) ? $thismonth : 0;
                 $cnymArray[] = $i == 1 ? '\'' .$sv.'年'.$i.'月'. '\'' : '\'' .$i.'月'. '\'';
             }
         }

protected/controller/RProjectController.php

@@ -59,8 +59,11 @@ class RProjectController extends DooController
             $this->data['numofchecking'] = null;
         }
 
+        $this->data['signSwitch'] = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+
         //获取需要您签署的数目
-        $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
+        if($this->data['signSwitch'] > 0)
+            $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
     }
 
     public function beforeRun($resource, $action)
@@ -650,8 +653,9 @@ class RProjectController extends DooController
         $lastRowArray = $this->numofperact->getLastNew2($this->params['pmid']);
         $maxTimes = $this->numofperact->getMaxTimes($lastRowArray['pmid'], $lastRowArray['numpname']);
 //        $auditUserArray = $this->measureauditact->getAllAudit($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times']);
-        $maxtimez = $this->measureauditact->getRowGroupByTimes($this->params['mpid']);
-        $auditUserArray = $this->measureauditact->getRowByMpidTimes($this->params['mpid'], $maxtimez['times']);
+//        $maxtimez = $this->measureauditact->getRowGroupByTimes($this->params['mpid']);
+        $maxtimez = $this->numofperact->getRowByMpid($this->params['mpid']);
+        $auditUserArray = $this->measureauditact->getRowByMpidTimes($this->params['mpid'], $maxtimez['numpname'], $maxtimez['times']);
         $auditArray = $this->measureauditact->getLastNewRowInfo($lastRowArray['pmid'], $lastRowArray['numpname'], $this->auth->getUid());
         if (isset($_POST['act'])) {
             $auditStatusArray = array('checkno', 'checked');

protected/controller/SProjectController.php

@@ -12,6 +12,7 @@ Doo::loadClass('itemfile');
 Doo::loadClass('attachment');
 Doo::loadHelper('DooPager');
 Doo::loadClass('sign');
+Doo::loadModelAt('aconfig', 'admin');
 
 /**
  * MainController
@@ -22,7 +23,7 @@ Doo::loadClass('sign');
 class SProjectController extends DooController
 {
 
-    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $numofperact, $measureauditact, $itemmeasurenum, $itemfle, $att;
+    private $aconfig,$data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $numofperact, $measureauditact, $itemmeasurenum, $itemfle, $att;
 
     public function beforeRun($resource, $action)
     {
@@ -42,6 +43,7 @@ class SProjectController extends DooController
 
     public function __construct()
     {
+        $this->aconfig = new AConfig();
         $this->auth = new Auth();
         $this->attfile = new attFile();
         $this->profile = new Profile();
@@ -68,8 +70,11 @@ class SProjectController extends DooController
             $this->data['numofchecking'] = null;
         }
 
+        $this->data['signSwitch'] = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+
         //获取需要您签署的数目
-        $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
+        if($this->data['signSwitch'] > 0)
+            $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
     }
 
@@ -213,16 +218,16 @@ class SProjectController extends DooController
                 $j = $i < 10 ? '0'.$i : $i;
                 $month = $sv.'-'.$j;
                 $thismonth1 = 0;
-                foreach ($allmonth as $keyk => $valuev) {
-                    if ($valuev['month'] == $month)
-                        $thismonth += $valuev['currtotal'];
-                }
-                $total[] = $thismonth != 0 ? $thismonth : 0;
                 foreach ($allmonth1 as $k1 => $v1) {
                     if ($v1['month'] == $month)
                         $thismonth1 += $v1['currdone'];
                 }
                 $total1[] = $thismonth1 != 0 ? $thismonth1 : 0;
+                foreach ($allmonth as $keyk => $valuev) {
+                    if ($valuev['month'] == $month)
+                        $thismonth += $valuev['currtotal'];
+                }
+                $total[] = ($thismonth != 0 && $thismonth1 != 0) ? $thismonth : 0;
                 $cnymArray[] = $i == 1 ? '\'' .$sv.'年'.$i.'月'. '\'' : '\'' .$i.'月'. '\'';
             }
         }

protected/controller/ShareController.php

@@ -147,16 +147,16 @@ class ShareController extends DooController
                 $j = $i < 10 ? '0'.$i : $i;
                 $month = $sv.'-'.$j;
                 $thismonth1 = 0;
-                foreach ($allmonth as $keyk => $valuev) {
-                    if ($valuev['month'] == $month)
-                        $thismonth += $valuev['currtotal'];
-                }
-                $total[] = $thismonth != 0 ? $thismonth : 0;
                 foreach ($allmonth1 as $k1 => $v1) {
                     if ($v1['month'] == $month)
                         $thismonth1 += $v1['currdone'];
                 }
                 $total1[] = $thismonth1 != 0 ? $thismonth1 : 0;
+                foreach ($allmonth as $keyk => $valuev) {
+                    if ($valuev['month'] == $month)
+                        $thismonth += $valuev['currtotal'];
+                }
+                $total[] = ($thismonth != 0 && $thismonth1 != 0) ? $thismonth : 0;
                 $cnymArray[] = $i == 1 ? '\'' .$sv.'年'.$i.'月'. '\'' : '\'' .$i.'月'. '\'';
             }
         }

protected/controller/SignController.php

@@ -9,6 +9,7 @@ Doo::loadClass('actmeasure');
 Doo::loadClass('numofperact');
 Doo::loadClass('measureauditact');
 Doo::loadClass('sign');
+Doo::loadModelAt('aconfig', 'admin');
 //define('FPDF_FONTPATH','protected/class/fpdf1.5/font/');
 //Doo::loadClass('fpdf');
 
@@ -22,7 +23,7 @@ Doo::loadClass('sign');
 class SignController extends DooController
 {
 
-    private $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '<span class = "colGray">未审批</span>', 'checking' => '<span class = "colOrange">审批中</span>', 'checked' => '<span class = "colGreen">审批通过</span>', 'checkno' => '<span class = "colRed">审批不通过</span>');
+    private $aconfig, $data, $sign, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '<span class = "colGray">未审批</span>', 'checking' => '<span class = "colOrange">审批中</span>', 'checked' => '<span class = "colGreen">审批通过</span>', 'checkno' => '<span class = "colRed">审批不通过</span>');
 
     public function beforeRun($resource, $action)
     {
@@ -38,6 +39,7 @@ class SignController extends DooController
 
     public function __construct()
     {
+        $this->aconfig = new AConfig();
         $this->auth = new Auth();
         $this->attfile = new attFile();
         $this->profile = new Profile();
@@ -63,6 +65,13 @@ class SignController extends DooController
             $this->data['numofchecking'] = null;
         }
 
+
+        $signSwitch = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+        if ($signSwitch == 0)
+            exit('未开启在线签名功能');
+
+        $this->data['signSwitch'] = $signSwitch;
+
         //获取需要您签署的数目
         $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
@@ -84,6 +93,8 @@ class SignController extends DooController
         //获取关于我的完成签署数目
         $this->data['doneSignNum'] = $this->sign->getDoneSignNumbyUid($this->auth->getUid());
 
+        $this->data['launchsign'] = $this->aconfig->getOne(array('select' => 'launchsignswitch', 'asArray' => TRUE))['launchsignswitch'];
+
         $this->render('sign-index', $this->data, TRUE);
     }
 
@@ -506,6 +517,10 @@ class SignController extends DooController
      */
     public function signCreate()
     {
+        $launchsignSwitch = $this->aconfig->getOne(array('select' => 'launchsignswitch', 'asArray' => TRUE))['launchsignswitch'];
+        if($launchsignSwitch == 0)
+            exit('未开启发起签署功能');
+
         Doo::loadHelper('DooPager');
         $pagestr = '';
         $sqlstr = ' 1';
@@ -683,6 +698,10 @@ class SignController extends DooController
      */
     public function signSignSet()
     {
+        $launchsignSwitch = $this->aconfig->getOne(array('select' => 'launchsignswitch', 'asArray' => TRUE))['launchsignswitch'];
+        if($launchsignSwitch == 0)
+            exit('未开启发起签署功能');
+
         if(!isset($this->params['sid']) || !is_numeric($this->params['sid'])){
             exit('没有报表参数');
         }
@@ -702,6 +721,17 @@ class SignController extends DooController
             }
         }
 
+        //获取原报人
+        $measureArray = $this->actmeasure->getRowByPmid($signmsg['tender']);
+//        $lastRowArray = $this->numofperact->getLastNew2($signmsg['tender']);
+        $usermsg2 = $this->auth->getRowByUid($measureArray['uid']);
+        $orginArray['userid'] = $measureArray['uid'];
+        $orginArray['avatar'] = $usermsg2['avatar'];
+        $orginArray['name'] = $usermsg2['name'];
+        $orginArray['jobs'] = $usermsg2['jobs'];
+//        $attfileArray = $this->attfile->getFirstFile($lastRowArray['pmid'], $lastRowArray['numpname'], $lastRowArray['times']);
+//        $orginArray['time'] = date('Y-m-d', $attfileArray['intime']);
+
         //获取项目名，标段名，标段期数
         $project = $this->project->getRowByPid($signmsg['project']);
         $tender = $this->actmeasure->getRowByPmid($signmsg['tender']);
@@ -738,6 +768,7 @@ class SignController extends DooController
         $this->data['signmsg'] = $signmsg;
         $this->data['userlist'] = $userlist;
         $this->data['attlist'] = $signattlist;
+        $this->data['reportlist'] = $orginArray;
         $this->data['maxwidth'] = $maxwidth;
         $this->data['maxheight'] = $maxheight;
         $this->data['style'] = $style;

protected/controller/UserController.php

@@ -71,8 +71,11 @@ class UserController extends DooController
             $this->data['numofchecking'] = null;
         }
 
+        $this->data['signSwitch'] = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+
         //获取需要您签署的数目
-        $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
+        if($this->data['signSwitch'] > 0)
+            $this->data['needSignNum'] = $this->sign->getNeedSignNumbyUid($this->auth->getUid()) != 0 ? $this->sign->getNeedSignNumbyUid($this->auth->getUid()) : '';
 
     }
 

protected/model/measureconcern.php

@@ -0,0 +1,26 @@
+<?php
+
+Doo::loadCore('db/DooModel');
+
+/**
+ * 标段关注人表
+ */
+class MeasureConcern extends DooModel {
+
+    public $mcid;
+    public $pid;
+    public $stid;
+    public $pmid;
+    public $uid;
+    public $intime;
+    public $_table = 'jl_measure_concern';
+    public $_primarykey = 'mcid';
+    public $_fields = array('mcid', 'pid', 'stid', 'pmid', 'uid', 'intime');
+
+    public function __construct() {
+        parent::setupModel(__CLASS__);
+    }
+
+}
+
+?>

protected/module/admin/controller/ProController.php

@@ -174,7 +174,7 @@ class ProController extends DooController
                     if(!empty($mumsg)){
                         $nextmumsg = $this->ama->getAuditByMpidStatus($mamsg['mpid'],'uncheck');
                         if(!empty($nextmumsg)){
-                            $this->ama->updateStatus($nextmumsg['maid'],'checking');
+                            $this->ama->updateStatus($nextmumsg['maid'],'checking',2,0);
                         }else{
                             $this->an->updateAuditStatus($mamsg['mpid'],'checked');
                         }
@@ -211,9 +211,21 @@ class ProController extends DooController
                     }
                     //修改上一审状态为uncheck，下一审状态为checking
                     $lastmamsg = $this->ama->getAuditByMpidStatus($mamsg['mpid'],'checking');
-                    $this->ama->updateStatus($lastmamsg['maid'],'uncheck',2);
-                    $this->ama->updateStatus($_POST['maid'],'checking',2);
-                    $this->attfile->updateHash($mumsg['pmid'], $mumsg['numpname'], $mumsg['times']);
+                    $this->ama->updateStatus($lastmamsg['maid'],'uncheck',2,0);
+                    $this->ama->updateStatus($_POST['maid'],'checking',2,0);
+
+                    //查看当前审批人附件是否存在，存在则删除
+                    $attfile = $this->attfile->getMyAttFile($mumsg['pmid'], $mumsg['numpname'], $mumsg['times'],$mamsg['auditoruid']);
+                    if(!empty($attfile)){
+                        $this->attfile->delMyAttFile($mumsg['pmid'], $mumsg['numpname'], $mumsg['times'],$mamsg['auditoruid']);
+
+                        //更新最后一个附件为最新 isnew=2
+                        $lastaid = $this->attfile->getLastFileAid($mumsg['pmid'], $mumsg['numpname'], $mumsg['times']);
+                        if(!empty($lastaid)){
+                            $this->attfile->updateIsNew2($lastaid);
+                        }
+                    }
+//                    $this->attfile->updateHash($mumsg['pmid'], $mumsg['numpname'], $mumsg['times']);
                 }
                 die(json_encode(array('status' => 'ok')));
             }

protected/module/admin/controller/SysController.php

@@ -80,4 +80,38 @@ class SysController extends DooController
         $this->render('admin-sms', $this->data, TRUE);
     }
 
+    function signSwitch()
+    {
+        if(isset($_POST['type']) && isset($_POST['status'])){
+            if($_POST['status'] == 'close'){
+                $ststus = 0;
+            }else{
+                $ststus = 1;
+            }
+            switch($_POST['type']){
+                case 'report':
+                    $this->aconfig->reportswitch = $ststus;
+                    if ($this->aconfig->update(array('where' => "conid = 1")) > 0)
+                        exit('1');
+                    break;
+                case 'sign':
+                    $this->aconfig->signswitch = $ststus;
+                    if ($this->aconfig->update(array('where' => "conid = 1")) > 0)
+                        exit('1');
+                    break;
+                case 'launch':
+                    $this->aconfig->launchsignswitch = $ststus;
+                    if ($this->aconfig->update(array('where' => "conid = 1")) > 0)
+                        exit('1');
+                    break;
+            }
+            exit(0);
+        }
+        $this->data['reportSwitch'] = $this->aconfig->getOne(array('select' => 'reportswitch', 'asArray' => TRUE))['reportswitch'];
+        $this->data['signSwitch'] = $this->aconfig->getOne(array('select' => 'signswitch', 'asArray' => TRUE))['signswitch'];
+        $this->data['launchsignSwitch'] = $this->aconfig->getOne(array('select' => 'launchsignswitch', 'asArray' => TRUE))['launchsignswitch'];
+        $this->data['menu'] = 6;
+        $this->render('admin-sign', $this->data, TRUE);
+    }
+
 }

protected/module/admin/model/aconfig.php

@@ -13,9 +13,12 @@ class AConfig extends DooModel
     public $onoff;
     public $upgradeinfo;
     public $smsswitch;
+    public $reportswitch;
+    public $signswitch;
+    public $launchsignswitch;
     public $_table = 'jl_config';
     public $_primarykey = 'conid';
-    public $_fields = array('conid', 'proname', 'onoff', 'upgradeinfo', 'smsswitch');
+    public $_fields = array('conid', 'proname', 'onoff', 'upgradeinfo', 'smsswitch', 'reportswitch', 'signswitch', 'launchsignswitch');
 
     public function __construct()
     {

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

@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>纵横计量支付系统</title>
+	<meta name=description content=计量支付>
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href={{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>
+</head>
+<body>
+<div class="wrapHeader">
+	<h1 class="mainLogo" title="纵横计量支付"></h1>
+	<div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a
+			title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+</div>
+<!-- include "top" -->
+<div class="warpAdmin">
+	<!-- include "menu" -->
+	<div class="adminMain">
+		<form class="form-horizontal">
+			<fieldset>
+				<legend>在线签署</legend>
+				<!--软件生成报表-->
+				<div class="control-group">
+					<label class="control-label">软件生成报表</label>
+					<div class="controls">
+						<!-- if {{reportSwitch}} == 0 -->
+						<div class="btn-group">
+							<button class="btn" 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>
+						</div>
+						<!-- endif -->
+						<a data-toggle="modal" href="#help1">帮助</a>
+					</div>
+				</div>
+
+				<!--WEB开启在线签署-->
+				<div class="control-group">
+					<label class="control-label">WEB开启在线签署</label>
+					<div class="controls">
+						<!-- if {{signSwitch}} == 0 -->
+						<div class="btn-group">
+							<button class="btn" 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>
+						</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">
+						<!-- if {{launchsignSwitch}} == 0 -->
+						<div class="btn-group">
+							<button class="btn" 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>
+						</div>
+						<!-- endif -->
+						<a data-toggle="modal" href="#help3">帮助</a>
+					</div>
+				</div>
+			</fieldset>
+		</form>
+	</div>
+</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>
+	</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>
+	</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>
+	</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(){
+			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('关闭');
+					if(status[1] == 'sign'){
+						$('#launchsign').show();
+					}
+				}else{
+					$(this).addClass('btn-danger').text('已关闭');
+					$(this).siblings('button').removeClass('btn-success').text('开启');
+					if(status[1] == 'sign'){
+						$('#launchsign').hide();
+					}
+				}
+				$(this).addClass('disabled').attr('disabled', true);
+				$(this).siblings('button').removeClass('disabled').attr('disabled',false);
+			}
+			$.ajax({
+				type: 'post',
+				url: '/manage/sys/sign/switch',
+				data:{status:status[0], type:status[1]},
+				dataType: 'json',
+				success: function(result){
+
+				}
+			});
+			return false;
+		})
+	})
+</script>
+</body>

protected/module/admin/view/menu.html

@@ -4,6 +4,7 @@
         <li><a href="{{rootUrl}}manage/sys/sms/switch"<!-- if {{menu}}=='4' --> class="now" <!-- endif -->>短信通知</a></li>
         <li><a href="{{rootUrl}}manage/user/list"<!-- if {{menu}}=='2' --> class="now" <!-- endif -->>用户列表</a></li>
         <li><a href="{{rootUrl}}manage/user/add"<!-- if {{menu}}=='3' --> class="now" <!-- endif -->>添加用户</a></li>
-        <li><a href="{{rootUrl}}manage/item/index"<!-- if {{menu}}=='5' --> class="now" <!-- endif -->>项目管理</a></li>
+        <li><a href="{{rootUrl}}manage/sys/sign/switch"<!-- if {{menu}}=='6' --> class="now" <!-- endif -->>在线签署</a></li>
+        <!-- <li><a href="{{rootUrl}}manage/item/index"<!-- if {{menu}}=='5' --> class="now" <!-- endif -->>项目管理</a></li> -->
     </ul>
 </div>

protected/module/admin/viewc/admin-addUser.php

@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn>
-    <head>
-        <meta charset=utf-8>
-        <title>纵横计量支付系统</title>
-        <meta name=description content=计量支付>
-        <meta name=copyright content=smartcost.com.cn>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/bootstrap.css>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/style.css>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jquery-1.9.1.min.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/bootstrap.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jl.js></script>
-    </head>
-    <body>
-        <div class="wrapHeader">
-            <h1 class="mainLogo" title="纵横计量支付"></h1>
-            <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
-        </div>
-        <?php include Doo::conf()->SITE_PATH .  Doo::conf()->PROTECTED_FOLDER . "viewc//top.php"; ?>
-        <div class="warpAdmin">
-            <div class="adminSidebar fL">
-                <ul>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/list">用户列表</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/add" class="now">添加用户</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/item/list">标段管理</a></li>
-                </ul>
-            </div>
-            <div class="adminContent">
-                <div class="adminMain">
-                    <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>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">单位（公司）</label>
-                                <div class="controls">
-                                    <input 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>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">姓名</label>
-                                <div class="controls">
-                                    <input 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>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">手机</label>
-                                <div class="controls">
-                                    <input type="text" name="mobile" placeholder="输入用户手机">
-                                </div>
-                            </div>
-                            <div class="alert alert-info">
-                                添加成功后，系统将会发送一封确认邮件给该用户，邮件中将包含登录密码。
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
-                                    <input name="submit" type="submit" class="btn btn-normal btn-primary" value="确定添加" />
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript">autoFlashHeight();</script>
-    </body>

protected/module/admin/viewc/admin-editUser.php

@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn>
-    <head>
-        <meta charset=utf-8>
-        <title>纵横计量支付系统</title>
-        <meta name=description content=计量支付>
-        <meta name=copyright content=smartcost.com.cn>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/bootstrap.css>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/style.css>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jquery-1.9.1.min.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/bootstrap.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jl.js></script>
-    </head>
-    <body>
-        <div class="wrapHeader">
-            <h1 class="mainLogo" title="纵横计量支付"></h1>
-            <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
-        </div>
-        <?php include Doo::conf()->SITE_PATH .  Doo::conf()->PROTECTED_FOLDER . "viewc//top.php"; ?>
-        <div class="warpAdmin">
-            <div class="adminSidebar fL">
-                <ul>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/list" class="now">用户列表</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/add">添加用户</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/item/list">标段管理</a></li>
-                </ul>
-            </div>
-            <div class="adminContent">
-                <div class="adminMain">
-                    <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" value="<?php echo $data['users']['uemail']; ?>">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">单位（公司）</label>
-                                <div class="controls">
-                                    <input type="text" name="company" value="<?php echo $data['profile']['company']; ?>">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">职位</label>
-                                <div class="controls">
-                                    <input type="text" name="jobs"  value="<?php echo $data['profile']['jobs']; ?>">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">姓名</label>
-                                <div class="controls">
-                                    <input type="text" name="name"  value="<?php echo $data['profile']['name']; ?>">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">电话</label>
-                                <div class="controls">
-                                    <input type="text" name="phone"  value="<?php echo $data['profile']['phone']; ?>">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">手机</label>
-                                <div class="controls">
-                                    <input type="text" name="mobile"  value="<?php echo $data['profile']['mobile']; ?>">
-                                </div>
-                            </div>
-                            <div class="alert alert-error">
-                                <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
-                                    <input type="submit" class="btn btn-normal btn-danger" value="完成编辑" />
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                    <!--		    <div class="userPrj">
-                                            <legend>该用户参与的标段</legend>
-                                            <table class="table table-striped">
-                                                <thead>
-                                                    <tr><th>项目名称</th><th>标段名称</th></tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr><td>XXXX项目</td><td>A标段</td></tr>
-                                                    <tr><td>XXXX项目</td><td>B标段</td></tr>
-                                                    <tr><td>XXXX项目</td><td>C标段</td></tr>
-                                                </tbody>
-                                            </table>
-                                        </div>-->
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript">autoFlashHeight();</script>
-    </body>

protected/module/admin/viewc/admin-item.php

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn>
-    <head>
-        <meta charset=utf-8>
-        <title>纵横计量支付系统</title>
-        <meta name=description content=计量支付>
-        <meta name=copyright content=smartcost.com.cn>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/bootstrap.css>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/style.css>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jquery-1.9.1.min.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/bootstrap.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jl.js></script>
-    </head>
-    <body>
-        <div class="wrapHeader">
-            <h1 class="mainLogo" title="纵横计量支付"></h1>
-            <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
-        </div>
-        <?php include Doo::conf()->SITE_PATH .  Doo::conf()->PROTECTED_FOLDER . "viewc//top.php"; ?>
-        <div class="warpAdmin">
-            <div class="adminSidebar fL">
-                <ul>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/list">用户列表</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/add">添加用户</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/item/list" class="now">标段管理</a></li>
-                </ul>
-            </div>
-            <div class="adminContent">
-                <div class="adminMain">
-                    <fieldset>
-                        <legend>用户列表</legend>
-                        <table class="table table-striped">
-                            <thead>
-                                <tr>
-                                    <!--<th>#</th>-->
-                                    <th>标段名称</th>
-                                    <th>标段总额</th>
-                                    <th>操作</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <?php foreach($data['userlist'] as $k1=>$v1): ?>
-                                <tr>
-                                    <!--<td><input type="checkbox" name="pmid" id="" value="<?php echo $v1['pmid']; ?>"/></td>-->
-                                    <td><?php echo $v1['pmname']; ?></td>
-                                    <td><?php echo $v1['contracttotal']; ?></td>
-                                    <td><a href="#" data-keyboard="false" data-backdrop="ture" class="colGray" >标段还原</a> <a href="javascript:if(confirm('确实要删除吗?'))location='/manage/item/del/<?php echo $v1['pmid']; ?>'" data-keyboard="false" data-backdrop="ture" class="colGray" >删除标段</a></td>
-                                </tr>
-                                <?php endforeach; ?>
-                            </tbody>
-                        </table>
-                    </fieldset>
-                </div>
-            </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>
-        </div>
-        <!--重置密码-->
-        <script type="text/javascript">autoFlashHeight();</script>
-        <script type="text/javascript">
-            function confirm_stop() {
-                if (confirm('是否停用此用户？')) {
-                    $('#myform').submit();
-                }
-
-            }
-            function confirm_resetpasswd(uid) {
-                $.get("<?php echo $data['rootUrl']; ?>manage/user/repasswd/" + uid + "/uid", function (data) {
-                    $('#email').html(data);
-                });
-            }
-        </script>
-    </body>
-</html>

protected/module/admin/viewc/admin-login.php

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn>
-    <head>
-	<meta charset=utf-8>
-	<title>纵横计量支付系统</title>
-	<meta name=description content=计量支付>
-	<meta name=copyright content=smartcost.com.cn>
-	<link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/bootstrap.css>
-	<link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/style.css>
-	<script src=<?php echo $data['rootUrl']; ?>global/js/jquery-1.9.1.min.js></script>
-	<script src=<?php echo $data['rootUrl']; ?>global/js/bootstrap.js></script>
-	<script src=<?php echo $data['rootUrl']; ?>global/js/jl.js></script>
-    </head>
-    <body>
-	<div class="wrapHeader">
-	    <h1 title="纵横计量支付" class="mainLogo"></h1>
-	    <div class="sysTools"><a href="<?php echo $data['rootUrl']; ?>" 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">
-	    <div class="loginPanel">
-		<form method="post">
-		    <input type="hidden" name="tokenform" value="<?php echo $data['_token_']; ?>" />
-		    <div  class="tpa"><b>管理后台</b></div>
-		    <div class="clearfix">
-			<div class="fL">
-			    <img src="<?php echo $data['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="clearfix">
-			<input type="submit" class="btn btn-normal btn-block btn-primary" href="admin-userlist.html" value="登录"/>
-			<?php echo $data['tips']; ?>
-		    </div>
-		</form>
-	    </div>
-	    <div class="copyRight">Copyright @<a href="http://smartcost.com.cn" target="_blank">珠海纵横创新软件有限公司</a> all rights reserved</div>
-	</div>
-    </body>
-</html>

protected/module/admin/viewc/admin-option.php

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-cn>
-    <head>
-        <meta charset=utf-8>
-        <title>纵横计量支付系统</title>
-        <meta name=description content=计量支付>
-        <meta name=copyright content=smartcost.com.cn>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/bootstrap.css>
-        <link rel=stylesheet href=<?php echo $data['rootUrl']; ?>global/css/style.css>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jquery-1.9.1.min.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/bootstrap.js></script>
-        <script src=<?php echo $data['rootUrl']; ?>global/js/jl.js></script>
-    </head>
-    <body><div class="wrapHeader">
-            <h1 class="mainLogo" title="纵横计量支付"></h1>
-            <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
-        </div>
-        <?php include Doo::conf()->SITE_PATH .  Doo::conf()->PROTECTED_FOLDER . "viewc//top.php"; ?>
-        <div class="warpAdmin">
-            <div class="adminSidebar fL">
-                <ul>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/list">用户列表</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/user/add">添加用户</a></li>
-                    <li><a href="<?php echo $data['rootUrl']; ?>manage/item/list">标段管理</a></li>
-                </ul>
-            </div>
-            <div class="adminContent">
-                <div class="adminMain">
-                    <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="<?php echo $data['auser']['auname']; ?>" disabled>
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">旧密码</label>
-                                <div class="controls">
-                                    <input 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>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">确认新密码</label>
-                                <div class="controls">
-                                    <input type="password" name="renewpasswd" placeholder="再次输入您的新密码">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
-                                    <input type="submit" type="button" class="btn btn-normal btn-primary" value="修改" />
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript">autoFlashHeight();</script>
-    </body>

protected/module/admin/viewc/top.php

@@ -1,3 +0,0 @@
-<div class="width960 userInfoPanel clearfix">
-    <p><b>你好，管理员</b>；<a href="<?php echo $data['rootUrl']; ?>manage/option">修改密码</a>&nbsp;<a href="<?php echo $data['rootUrl']; ?>manage/signout">退出</a></p>
-</div>

protected/view/left.html

@@ -4,7 +4,7 @@
 	    <li data-placement="right" data-toggle="tooltip" data-original-title="业主"><a href="{{rootUrl}}project/index" <!-- if {{currChannle}}=='p' --> class="focus" <!-- endif --> title="项目管理"><div data-icon="A" aria-hidden="true" class="navIcon"></div>项目管理</a></li>
 	    <li data-placement="right" data-toggle="tooltip" data-original-title="审批人"><a href="{{rootUrl}}rproject/index" <!-- if {{currChannle}}=='r' --> class="focus" <!-- endif --> title="需审批项目"><div data-icon="C" aria-hidden="true" class="navIcon"></div>审批项目</a><span class="badge badge-warning">{{numofchecking}}</span></li>
 	    <li data-placement="right" data-toggle="tooltip" data-original-title="计量上报人"><a href="{{rootUrl}}sproject/index" <!-- if {{currChannle}}=='s' --> class="focus" <!-- endif --> title="我编制的项目"><div data-icon="B" aria-hidden="true" class="navIcon"></div>编制项目</a></li>
-		<li><a href="/sign/index" <!-- if {{currChannle}}=='sign' --> class="focus" <!-- endif --> title="报表签署"><div data-icon="D" aria-hidden="true" class="navIcon"></div>报表签署</a><span class="badge badge-warning">{{needSignNum}}</span></li>
+		<!-- if {{signSwitch}} == 1 --><li><a href="/sign/index" <!-- if {{currChannle}}=='sign' --> class="focus" <!-- endif --> title="报表签署"><div data-icon="D" aria-hidden="true" class="navIcon"></div>报表签署</a><span class="badge badge-warning">{{needSignNum}}</span></li><!-- endif -->
 	    <!--<li><a href="" title="数据汇总"><div data-icon="E" aria-hidden="true" class="navIcon"></div>汇总</a></li>-->
 	</ul>
     </div>

protected/view/sign-index.html

@@ -26,8 +26,8 @@
                     <div class="item"><h1>正在签署</h1><a href="/sign/onlist">{{doingSignNum}}</a></div>
                     <div class="item"><h1>签署完成</h1><a href="/sign/donelist">{{doneSignNum}}</a></div>
                 </div>
-                <div class="bar"><p><a href="/sign/create" class="btn btn-primary btn-large btn-block">发起签署</a>
-                </p>
+                <div class="bar"><!-- if {{launchsign}} == 1 --><p><a href="/sign/create" class="btn btn-primary btn-large btn-block">发起签署</a>
+                </p><!-- endif -->
                     <p><a href="/sign/list">查看所有报表</a></p></div>
             </div>
         </div>

protected/view/sign-view-set_signer.html

@@ -60,7 +60,7 @@
                     <div class="warp-printer">
                         <!-- if !empty({{attlist}}) -->
                         <!-- loop attlist -->
-                        <div class="page" id="pageContainer{{attlist' value.curnum}}"><img src="{{rootUrl}}{{attlist' value.filepath}}" style="max-width: 99.8%"></div>
+                        <div class="page" id="pageContainer{{attlist' value.curnum}}"><img src="{{rootUrl}}{{attlist' value.filepath}}"></div>
                         <!-- endloop -->
                         <!-- endif -->
                     </div>
@@ -78,6 +78,18 @@
     </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}}) -->
@@ -166,6 +178,15 @@
                             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');
+                            $('#userlist li').each(function(){
+                                if($(this).children('a').attr('data-userid') == userarr[0]){
+                                    $(this).children('a').removeClass('btn-primary').addClass('disabled');
+                                    return;
+                                }
+                            });
+                            if($('#reportlist li a').attr('data-userid') == userarr[0]){
+                                $('#reportlist li a').removeClass('btn-primary').addClass('disabled');
+                            }
                             alert('添加成功');
                             $('#resultsearch').html('');
                         }
@@ -178,6 +199,9 @@
                                    return;
                                }
                             });
+                            if($('#reportlist li a').attr('data-userid') == sid){
+                                $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                            }
                             $(this).parents('li').remove();
                             if($('#signerlist ul li').length == 0){
                                 $('#signbtn').removeClass('btn-primary').addClass('disabled');
@@ -248,6 +272,9 @@
                 $('#signerlist ul').append(html);
                 $('#signbtn').addClass('btn-primary').removeClass('disabled');
                 $(this).removeClass('btn-primary').addClass('disabled');
+                if($('#reportlist li a').attr('data-userid') == userarr[0]){
+                    $('#reportlist li a').removeClass('btn-primary').addClass('disabled');
+                }
                 alert('添加成功');
             }
 
@@ -259,6 +286,59 @@
                         return;
                     }
                 });
+                if($('#reportlist li a').attr('data-userid') == sid){
+                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                }
+                $(this).parents('li').remove();
+                if($('#signerlist ul li').length == 0){
+                    $('#signbtn').removeClass('btn-primary').addClass('disabled');
+                }else{
+                    var i =1;
+                    $('#signerlist ul li').each(function(){
+                        $(this).children('.no').text(i);
+                        i++;
+                    });
+                }
+            })
+        });
+
+        $('#reportlist li a').on('click',function(){
+            if($(this).hasClass('disabled')){
+                return false;
+            }
+            var userarr = $(this).attr('data-user').split('&&');
+            var flag = true;
+            $('#signerlist ul li').each(function(){
+                if($(this).attr('data-sid') == userarr[0]){
+                    alert('不能重复添加签署人');
+                    flag = false;
+                    return;
+                }
+            });
+            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');
+                $('#userlist li').each(function(){
+                    if($(this).children('a').attr('data-userid') == userarr[0]){
+                        $(this).children('a').removeClass('btn-primary').addClass('disabled');
+                        return;
+                    }
+                });
+                alert('添加成功');
+            }
+            $('#signerlist ul li a').on('click',function(e){
+                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');
+                        return;
+                    }
+                });
+                if($('#reportlist li a').attr('data-userid') == sid){
+                    $('#reportlist li a').removeClass('disabled').addClass('btn-primary');
+                }
                 $(this).parents('li').remove();
                 if($('#signerlist ul li').length == 0){
                     $('#signbtn').removeClass('btn-primary').addClass('disabled');

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

@@ -118,7 +118,8 @@
                 formatter: '{value} %'
             },
             position: 'right',
-            splitArea : {show : true}
+            splitArea: {show: false},
+            splitLine: {show: false}
         }
     ],
     series : [

在线签署开关.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `jl_config` ADD `reportswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '软件生成报表开关';
+
+ALTER TABLE `jl_config` ADD `signswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT 'web在线签署开启开关';
+
+ALTER TABLE `jl_config` ADD `launchsignswitch` tinyint(4) NOT NULL DEFAULT '1' COMMENT '发起签署开启开关';

标段关注人.sql

@@ -0,0 +1,17 @@
+
+CREATE TABLE IF NOT EXISTS `jl_measure_concern` (
+  `mcid` mediumint(9) NOT NULL,
+  `pid` mediumint(9) NOT NULL COMMENT '项目id',
+  `stid` mediumint(9) NOT NULL COMMENT '标段类型id',
+  `pmid` mediumint(9) NOT NULL COMMENT '标段id',
+  `uid` mediumint(9) NOT NULL COMMENT '关注人id',
+  `intime` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标段关注人表';
+
+
+ALTER TABLE `jl_measure_concern`
+  ADD PRIMARY KEY (`mcid`);
+
+ALTER TABLE `jl_measure_concern`
+  MODIFY `mcid` mediumint(9) NOT NULL AUTO_INCREMENT;COMMIT;
+