计量支付

在线审批
禅道1190

protected/controller/ProjectController.php

@@ -19,7 +19,7 @@ Doo::loadClass('measureauditact');
 class ProjectController extends DooController
 {
 
-    private $data, $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 $data, $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)
     {

protected/controller/RProjectController.php

@@ -18,7 +18,7 @@ Doo::loadClass('numofperact');
 class RProjectController extends DooController
 {
 
-    private $data, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '未审核', 'checking' => '审核中', 'checked' => '已审核', 'checkno' => '未通过');
+    private $data, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '未审批', 'checking' => '审批中', 'checked' => '已审批', 'checkno' => '未通过');
 
     public function __construct()
     {
@@ -399,7 +399,7 @@ class RProjectController extends DooController
                 $statushtml = '<li title="" class=""><img src="' . $strAvatar . '"></li>';
             }
             if ($value['mastatus'] == 'checking') {
-                $statuStr = '<h4 class="colOrange">审核中</h4>';
+                $statuStr = '<h4 class="colOrange">审批中</h4>';
                 $statucolorStr = 'colOrange';
                 $statushtml = '<li title="审批中" class="wait"><span data-icon="k" aria-hidden="true"></span> <img src="' . $strAvatar . '"></li>';
             }

protected/controller/SProjectController.php

@@ -154,13 +154,13 @@ class SProjectController extends DooController {
             }
             $this->data['MeasureArray'][$key]['nless'] = number_format($value['contracttotal'] - $this->data['MeasureArray'][$key]['stopnow'] - $this->data['MeasureArray'][$key]['currdone'], 2, '.', ',');
             $tenderArray = $this->numofperact->getRowTender2($value['pmid']);
-            $this->data['MeasureArray'][$key]['ownstatus'] = '审核中';
+            $this->data['MeasureArray'][$key]['ownstatus'] = '审批中';
             $ownerStatusArray = $this->measureauditact->getStatusTen($tenderArray['pmid'], $tenderArray['numpname']);
             if (isset($ownerStatusArray[0]['last']) && isset($ownerStatusArray[0]['mastatus']))
                 if (($ownerStatusArray[0]['last'] == 1) && ($ownerStatusArray[0]['mastatus'] == 'checked')) {
-                    $this->data['MeasureArray'][$key]['ownstatus'] = '已审核';
+                    $this->data['MeasureArray'][$key]['ownstatus'] = '已审批';
                 } else {
-                    $this->data['MeasureArray'][$key]['ownstatus'] = '审核中';
+                    $this->data['MeasureArray'][$key]['ownstatus'] = '审批中';
                 }
         }
         $this->render('s-project-section', $this->data, TRUE);

protected/module/admin/controller/ItemController.php

@@ -24,7 +24,7 @@ Doo::loadClass('project');
 // 管理员修改密码
 class ItemController extends DooController {
 
-    private $data, $users, $user, $profile, $ph, $userz, $mailer, $project, $am, $cc, $an, $ama, $statusArray = array('checking' => '审核中', 'checked' => '完成', 'checkno' => '不通过'), $colorArray = array('checking' => 'colOrange', 'checked' => 'colGreen', 'checkno' => 'colRed');
+    private $data, $users, $user, $profile, $ph, $userz, $mailer, $project, $am, $cc, $an, $ama, $statusArray = array('checking' => '审批中', 'checked' => '完成', 'checkno' => '不通过'), $colorArray = array('checking' => 'colOrange', 'checked' => 'colGreen', 'checkno' => 'colRed');
 
     public function beforeRun($resource, $action) {
         if (!isset($_SESSION['auid'])) {
@@ -162,9 +162,9 @@ class ItemController extends DooController {
     }
 
     function itemList() {
-        // TODO：增加判断审核人期数和上报最新期数比较来显示是否需要显示删除审核人操作
+        // TODO：增加判断审批人期数和上报最新期数比较来显示是否需要显示删除审批人操作
         // TODO：提示信息：可能显示的是瞬时状态，需要与客户经过确认之后方可删除。
-        // TODO：审核人状态和标段状态暂未加入审核人与标段是否一直的判断
+        // TODO：审批人状态和标段状态暂未加入审批人与标段是否一直的判断
         if ($this->params['pid'] > 0) {
             $mArray = $this->am->getRowAll($this->params['pid']);
             $this->data['pid'] = $this->params['pid'];

protected/module/admin/controller/RestoreController.php

@@ -52,9 +52,9 @@ class RestoreController extends DooController {
 
     function restoreRedo() {
         /**
-         *  存在最新的审核人员列表与最新一期的提交数据不匹配 与其数不匹配问题 （添加判断机制） 
+         *  存在最新的审批人员列表与最新一期的提交数据不匹配 与其数不匹配问题 （添加判断机制） 
          *  最新一次不显示单选按钮
-         *  接口是否也可以更改为当期数数据存在的情况下才显示最新的审核人列表 显示当前期最新的审核人员列表可以这么改
+         *  接口是否也可以更改为当期数数据存在的情况下才显示最新的审批人列表 显示当前期最新的审批人员列表可以这么改
          *  更新全部参与项目是否可以这么修改？哦，应该可以上述问题修改之后，那就可以按照如果不存在这一期数据就返回上一期或者次数数据
          */
         $measureArray = $this->am->getOne(array('where' => 'pmid=?', 'param' => array($this->params['pmid']), 'asArray' => TRUE));

protected/module/admin/view/admin-restore-list.html

@@ -25,7 +25,7 @@
                         <fieldset>
                             <legend>标段还原</legend>
                             <div class="control-group">
-                                <label class="control-ndname">标段名称：{{measurearray.pmname}}<span class="Reminder">（请勾选下列还原的期数和审核状态。）</span></label>
+                                <label class="control-ndname">标段名称：{{measurearray.pmname}}<span class="Reminder">（请勾选下列还原的期数和审批状态。）</span></label>
                             </div>
                             <div class="control-group">
                                 <!-- loop numofperArray -->