2.0.0 no.3 up

protected/controller/AppController.php

@@ -358,15 +358,41 @@ class AppController extends DooController {
                 echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                 die();
             }
+            if($_POST['act'] == 'back') {
+                $measureauditact = new MeasureauditAct();
+                $measureauditact->setUncheck($auditArray['maid']);
+                $this->numofperact->updateAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], 'checking', $maxTimes['times']);
+
+                //获取并改变上一个审批人为审批中状态
+                $lastmeasureauditact = $this->measureauditact->getMyAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times'], $_POST['last']);
+                $this->measureauditact->updateMastatus2($lastmeasureauditact['maid']);
+                // SMS Start
+                $TenderArray = $this->actmeasure->getRowByPmid($lastRowArray['pmid']);
+                $userProArray = $this->profile->getProWithUid($_POST['last']);
+                if (isset($userProArray) && ($userProArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
+                    $retval = $this->__auditNotice($userProArray['mobile'], Doo::conf()->SMS_TIPS_PRE . '"' . $TenderArray["pmname"] .'"'. Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR4"]);
+                }
+                // SMS End
+                echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
+                die();
+            }
             $this->data['pmid'] = $lastRowArray['pmid'];
             $this->data['numpname'] = $lastRowArray['numpname'];
             $this->data['times'] = $lastRowArray['times'];
+            $firstUser = 0;
             foreach ($auditUserArray as $key => $value) {
                 $strAvatar = $this->auth->getAvatar($value['auditoruid']);
                 if ($value['auditoruid'] == $_GET['uid']) {
                     $this->data['mastatus'] = $value['mastatus'];
                     $this->data['maid'] = $value['maid'];
                     $name = $this->profile->getProWithUid($value['auditoruid'])['name'].'（我）';
+                    if($key == 0){
+                        $firstUser = 1;
+                    }else{
+                        $this->data['lastUserID'] = $auditUserArray[$key-1]['auditoruid'];
+                        $this->data['lastUsername'] = $this->profile->getProWithUid($auditUserArray[$key-1]['auditoruid'])['name'];
+                        $this->data['lastUserCompany'] = $this->profile->getProWithUid($auditUserArray[$key-1]['auditoruid'])['company'];
+                    }
                 }else{
                     $name = $this->profile->getProWithUid($value['auditoruid'])['name'];
                 }
@@ -396,6 +422,7 @@ class AppController extends DooController {
             $this->data['pmid'] = $this->params['pmid'];
             $this->data['pid'] = $this->params['pid'];
             $this->data['mpid'] = $numStatusArray['mpid'];
+            $this->data['firstUser'] = $firstUser;
             $this->render('r-project-section-detail-APP', $this->data, TRUE);
         }else{
             exit('error：无参数无法访问本页');

protected/controller/ClientController.php

@@ -98,14 +98,14 @@ class ClientController extends DooController
             echo json_encode(array('status' => FALSE, 'msg' => '登录失败，请更新软件。'), JSON_UNESCAPED_UNICODE);
             die;
         }
-        if (isset($_POST['v4name']) && isset($_POST['v4pass']) && !empty($_POST['version'])) {
+        if (!empty($_POST['version'])) {
             try {
                 if ($this->modelconfig->getOne(array('select' => 'onoff', 'asArray' => TRUE))['onoff'] != 1) {
-                    $versionTotal = array_sum(explode('.', $_POST['version']));
+                    $versionTotal = implode("",explode('.', $_POST['version']));
                     $StrJson = ($this->modelconfig->getOne(array('select' => 'upgradeinfo', 'asArray' => TRUE))['upgradeinfo']);
                     $jsonObj = json_decode($StrJson, true);
                     if ($jsonObj) {
-                        $versionTotalUp = array_sum(explode('.', $jsonObj['version']));
+                        $versionTotalUp = implode("",explode('.', $jsonObj['version']));
                         $strJson = json_encode(array('status' => 'upgrade', 'msg' => '您的客户端需要升级，请点击确定按钮，下载新版本，并且覆盖安装。', 'url' => $jsonObj['download']), JSON_UNESCAPED_UNICODE);
                         if ($jsonObj['condition'] == 1) {
                             if ($versionTotalUp != $versionTotal) {
@@ -120,24 +120,29 @@ class ClientController extends DooController
                             }
                         }
                     }
-                    if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
-                        $uinfo = $this->auth->getUinfo();
-                        if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
-                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
-                            die;
-                        }
-                        if (isset($uinfo['uid'])) {
-                            $userArray = $this->profile->getProWithUid($uinfo['uid']);
-                            $avatarStr = $userArray['avatar'];
-                            if (isset($userArray['userid'])) {
-                                $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
-                                echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                    if(isset($_POST['v4name']) && isset($_POST['v4pass'])){
+                        if ($this->auth->login($_POST['v4name'], $_POST['v4pass'])) {
+                            $uinfo = $this->auth->getUinfo();
+                            if (isset($uinfo['isstop']) && $uinfo['isstop'] > 0) {
+                                echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
                                 die;
                             }
-                        }
+                            if (isset($uinfo['uid'])) {
+                                $userArray = $this->profile->getProWithUid($uinfo['uid']);
+                                $avatarStr = $userArray['avatar'];
+                                if (isset($userArray['userid'])) {
+                                    $msgArray = array('uid' => $uinfo['uid'], 'name' => $userArray['name'], 'email' => $uinfo['uemail'], 'ucompany' => $userArray['company'], 'jobtitle' => $userArray['jobs'], 'avatar' => Doo::conf()->APP_URL . $avatarStr);
+                                    echo json_encode(array('status' => 'true', 'msg' => '', 'userinfo' => $msgArray), JSON_UNESCAPED_UNICODE);
+                                    die;
+                                }
+                            }
 
-                    } else {
-                        echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                        } else {
+                            echo json_encode(array('status' => 'false', 'msg' => '帐号不存在或者密码错误'), JSON_UNESCAPED_UNICODE);
+                            die;
+                        }
+                    }else{
+                        echo json_encode(array('status' => 'false', 'msg' => '参数错误'), JSON_UNESCAPED_UNICODE);
                         die;
                     }
                 } else {

protected/controller/ProjectController.php

@@ -104,6 +104,21 @@ class ProjectController extends DooController
             $this->project->updateProName($_POST['ppid'], $_POST['target_pname']);
             return Doo::conf()->APP_URL . 'project/index';
         }
+        if (isset($_POST['proid']) && is_numeric($_POST['proid']) && isset($_POST['delpro'])) {
+            if($this->actmeasure->getMearsureCount($_POST['proid']) == 0){
+                $this->project->del($_POST['proid']);
+                //空的标段类型也要删
+                $stArr = $this->contractact->getRowByPid($_POST['proid']);
+                if(!empty($stArr)){
+                    foreach($stArr as $k => $v){
+                        $cont = new Contractact();
+                        $cont->del($v['stid']);
+                    }
+                }
+
+            }
+            return Doo::conf()->APP_URL . 'project/index';
+        }
         $this->data['pros'] = $this->project->getAll($this->auth->getUid());
         if (isset($this->data['pros'][0]['pid'])) {
             foreach ($this->data['pros'] as $key => $value) {
@@ -294,6 +309,12 @@ class ProjectController extends DooController
             $this->contractact->updateStName($_POST['stid'], $_POST['proname']);
             return Doo::conf()->APP_URL . 'project/' . $this->params['pid'] . '/section';
         }
+        if (isset($_POST['delstid']) && is_numeric($_POST['delstid']) && isset($_POST['delform'])) {
+            if($this->actmeasure->getCountMeasure($_POST['delstid']) == 0){
+                $this->contractact->del($_POST['delstid']);
+            }
+            return Doo::conf()->APP_URL . 'project/' . $this->params['pid'] . '/section';
+        }
         $this->getFav();
         $contractArray = $this->contractact->getRowByPid($this->params['pid']); // 获取合同段
         $htmlstr = NULL;
@@ -368,12 +389,15 @@ class ProjectController extends DooController
                 $otherprogress = round((($biaoduantotalmoney - $currTotal['totalplus']) / $biaoduantotalmoney) * 100) . '%';
                 $biaoduantotalmoney = number_format($biaoduantotalmoney, 2, '.', ',');
             }
+            $delstidhtml =  $this->actmeasure->getCountMeasure($v['stid']) == 0 ? '<a id="idst_' . $v['stid'] . '" stid="' . $v['stid'] . '" stname="' . $v['stname'] . '" href="#del-confirm-2" data-toggle="modal" title="删除类型">
+									<span data-icon="U" aria-hidden="true" class="colRed" data-placement="bottom" data-toggle="tooltip" data-original-title="删除类型" style="font-size:18px"></span></a>' : '';
+
             $htmlstr .= '<div class="project">
 			<div class="proSection">
 			    <table class="table">
 				<thead>
 				    <tr>
-					<td width="150"><span aria-hidden="true" data-icon="u"></span> ' . $v['stname'] . '<a id="idt_' . $v['stid'] . '" href="#secoption" data-toggle="modal" title="编辑/查看KEY" stid="' . $v['stid'] . '" proname="' . $v['stname'] . '" key="' . $v['stkey'] . '"><span data-icon="S" aria-hidden="true" class="closePanel" data-placement="bottom" data-toggle="tooltip" data-original-title="查看KEY" style="font-size:18px"></span></a></td>
+					<td width="150"><span aria-hidden="true" data-icon="u"></span> ' . $v['stname'] . '<a id="idt_' . $v['stid'] . '" href="#secoption" data-toggle="modal" title="编辑/查看KEY" stid="' . $v['stid'] . '" proname="' . $v['stname'] . '" key="' . $v['stkey'] . '"><span data-icon="S" aria-hidden="true" class="closePanel" data-placement="bottom" data-toggle="tooltip" data-original-title="查看KEY" style="font-size:18px"></span></a>' .$delstidhtml. '</td>
 					<td width="90">总价：</td><td width="165">￥<b style="font-size:16px">' . $biaoduantotalmoney . '</b></td>
 					<td width="60">完成进度：</td><td><div class="progress">
 						<div class="progress-bar progress-bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>

protected/controller/RProjectController.php

@@ -861,11 +861,11 @@ class RProjectController extends DooController
             $lastmeasureauditact = $this->measureauditact->getMyAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times'], $_POST['last']);
             $this->measureauditact->updateMastatus2($lastmeasureauditact['maid']);
             // SMS Start
-//            $TenderArray = $this->actmeasure->getRowByPmid($lastRowArray['pmid']);
-//            $userProArray = $this->profile->getProWithUid($_POST['last']);
-//            if (isset($userProArray) && ($userProArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
-//                $retval = $this->__auditNotice($userProArray['mobile'], Doo::conf()->SMS_TIPS_PRE . '您好，' . $TenderArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR4"]);
-//            }
+            $TenderArray = $this->actmeasure->getRowByPmid($lastRowArray['pmid']);
+            $userProArray = $this->profile->getProWithUid($_POST['last']);
+            if (isset($userProArray) && ($userProArray['mobile'])) {// // XXXX（标段名），陈特，已审批通过。请您继续审批。
+                $retval = $this->__auditNotice($userProArray['mobile'], Doo::conf()->SMS_TIPS_PRE . '"' . $TenderArray["pmname"] .'"'. Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR8"]);
+            }
             // SMS End
             echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
             die();

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

@@ -7,11 +7,22 @@
     <meta name=copyright content=smartcost.com.cn>
     <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
     <link rel=stylesheet href="{{rootUrl}}global/css/app/bootstrap.css">
-    <link rel=stylesheet href="{{rootUrl}}global/css/app/style.css">
+    <link rel=stylesheet href="{{rootUrl}}global/css/app/style.css?201709181">
     <script src="{{rootUrl}}global/js/jquery-1.9.1.min.js"></script>
     <script src="{{rootUrl}}global/js/app/bootstrap.js"></script>
     <script src="{{rootUrl}}global/js/app/global.js"></script>
     <script src="{{rootUrl}}global/js/app/echarts.min.js"></script>
+    <!-- if {{firstUser}} == 0 -->
+    <style>
+        .bottomToolsbar ul li{
+            float:left;
+            width:33.333%;
+            height:5.5rem;
+            line-height: 5.5rem;
+            text-align: center;
+        }
+    </style>
+    <!-- endif -->
 </head>
 <body>
     <div class="wrapContent">
@@ -141,6 +152,7 @@
               </div>
               <ul>
                 <li><button type="button" class="submit btn-danger" data-toggle="modal" data-target="#myModalUnpass">审批不通过</button></li>
+                  <!-- if {{firstUser}} == 0 --><li><button type="button" class="submit btn-warning" data-toggle="modal" data-target="#myModalreturn">退回</button></li><!-- endif -->
                 <li><button type="button" class="submit btn-success" data-toggle="modal" data-target="#myModalPass">审批通过</button></li>
               </ul>
             </div>
@@ -159,7 +171,7 @@
                   </div>
                   <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-danger auditclass" act="np" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}" times="{{times}}">确认审批不通过</button>
+                    <button type="button" class="btn btn-danger auditclass" act="np" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}" times="{{times}}" last="">确认审批不通过</button>
                   </div>
                 </div>
               </div>
@@ -180,11 +192,31 @@
                   <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
                     <button type="button" class="btn btn-success auditclass" act="p" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
-                            times="{{times}}" id="pass">确认审批通过</button>
+                            times="{{times}}" last="" id="pass">确认审批通过</button>
                   </div>
                 </div>
               </div>
             </div>
+              <!-- if {{firstUser}} == 0 -->
+              <div class="modal fade modalWrap" id="myModalreturn" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                  <div class="modal-dialog" role="document">
+                      <div class="modal-content">
+                          <div class="modal-header">
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                              <h4 class="modal-title">退回</h4>
+                          </div>
+                          <div class="modal-body">
+                              <h4>是否退回上一个审批人“{{lastUsername}}<!-- if !empty({{lastUserCompany}}) -->({{lastUserCompany}})<!-- endif -->”审批</h4>
+                          </div>
+                          <div class="modal-footer">
+                              <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                              <button type="button" class="btn btn-warning auditclass" act="back" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}"
+                                      times="{{times}}" last="{{lastUserID}}" id="back">确认退回</button>
+                          </div>
+                      </div>
+                  </div>
+              </div>
+              <!-- endif -->
             <!-- endif -->
           </div>
         </div>
@@ -357,11 +389,12 @@
                 var content = $(this).parent().parent().find("textarea").val();
                 var act = $(this).attr('act');
                 var maid = $(this).attr('maid');
+                var last = $(this).attr('last');
                 $.ajax({
                     type: "POST",
                     dataType: "json",
                     cache: false,
-                    data: {"act": act, "pmid": pmid, "numpname": numpname, "times": times, "content": content},
+                    data: {"act": act, "pmid": pmid, "numpname": numpname, "times": times, "content": content, "last": last},
                     url: "/app/rproject/{{pid}}/section/{{pmid}}/detail?uid={{uid}}",
                     success: function (data) {
                         if (data['status'] == 1) {

protected/view/w-project-section.html

@@ -160,6 +160,32 @@
 		</div>
     </div>
     <!-- 标段类型设置弹出 -->
+	<!-- 删除标段类型 -->
+	<div id="del-confirm-2" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h4 class="modal-title">删除标段类型</h4>
+				</div>
+				<form class="form-horizontal" method="post">
+					<input type="hidden" name="delstid" id="delstid" value="">
+					<div class="modal-body">
+						<div class="form">
+							<div class="alert alert-danger">
+								确认删除 <span id="delstname"></span> ?
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
+						<input type="submit" class="btn btn-danger" name="delform" value="确认删除" />
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<!-- 删除标段类型 -->
     <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/jquery.tablesorter.js></script>
@@ -168,19 +194,25 @@
     <script type="text/javascript">autoFlashHeight();</script>
     <script type="text/javascript">
 	$(document).ready(function () {
-	    $("#secname").keydown(function (event) {
-		if (event.which == 13) {
-		    document.tenderform.submit();
-		}
-	    });
-	    $("[id^='idt_']").click(function (e) {
-		var proname = $(this).attr('proname');
-		var key = $(this).attr('key');
-		var stid = $(this).attr('stid');
-		$("#proname").val(proname);
-		$("#key").val(key);
-		$("#stid").val(stid);
-	    })
+		$("#secname").keydown(function (event) {
+			if (event.which == 13) {
+				document.tenderform.submit();
+			}
+		});
+		$("[id^='idt_']").click(function (e) {
+			var proname = $(this).attr('proname');
+			var key = $(this).attr('key');
+			var stid = $(this).attr('stid');
+			$("#proname").val(proname);
+			$("#key").val(key);
+			$("#stid").val(stid);
+		});
+		$("[id^='idst_']").click(function (e) {
+			var stname = $(this).attr('stname');
+			var stid = $(this).attr('stid');
+			$("#delstname").text(stname);
+			$("#delstid").val(stid);
+		});
 	})
     </script>
 </body>