Przeglądaj źródła

计量支付附件、短信合并

增加map文件,去除短信页面请求脚本最后一个数组的逗号分隔符,IE11报错。
增加类名判断,
NoNZero 8 lat temu
rodzic
commit
aedc889634

+ 1 - 1
protected/config/sms.conf.php

@@ -1,4 +1,4 @@
 <?php
 <?php
 $config['SMS_URL'] = 'http://sms.haotingyun.com/v2/sms/single_send.json';
 $config['SMS_URL'] = 'http://sms.haotingyun.com/v2/sms/single_send.json';
 $config['SMS_AUTHKEY'] = 'fb5ef483e44b9556512a9febef376051';
 $config['SMS_AUTHKEY'] = 'fb5ef483e44b9556512a9febef376051';
-$config['SMS_TIPS'] = array('AUDIT_NOTICE' => '【纵横通行账号】您的验证码是', 'END_MSG' => ',15分钟内有效。', 'AUDIT_NOTICE_AUDITOR' => ',已审批通过。请您继续审批。', 'AUDIT_NOTICE_AUDITOR2' => ',需要您继续审批。【纵横计量支付】');
+$config['SMS_TIPS'] = array('AUDIT_NOTICE' => '【纵横通行账号】您的验证码是', 'END_MSG' => ',15分钟内有效。', 'AUDIT_NOTICE_AUDITOR' => ',已审批通过。请您继续审批。', 'AUDIT_NOTICE_AUDITOR2' => ',需要您继续审批。');

+ 1 - 1
protected/controller/ClientController.php

@@ -766,7 +766,7 @@ class ClientController extends DooController
                                         } else {
                                         } else {
                                             $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);//变更下一个状态
                                             $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);//变更下一个状态
                                             // SMS Start
                                             // SMS Start
-                                            // $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k]['auditoruid']);
+                                             $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k]['auditoruid']);
                                             $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
                                             $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
                                             if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// // XXXX(标段名),陈特,已审批通过。请您继续审批。
                                             if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// // XXXX(标段名),陈特,已审批通过。请您继续审批。
                                                 $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
                                                 $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);

+ 5 - 5
protected/controller/RProjectController.php

@@ -22,7 +22,7 @@ class RProjectController extends DooController
 {
 {
 
 
 
 
-    private $data, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '未审批', 'checking' => '审批中', 'checked' => '已审批', 'checkno' => '未通过'), $aconfig, $sms,$itemfile, $itemmeasurenum;
+    private $data, $auth, $attfile, $profile, $project, $contractact, $actmeasure, $measureauditact, $numofperact, $statusArray = array('uncheck' => '未审批', 'checking' => '审批中', 'checked' => '已审批', 'checkno' => '未通过'), $aconfig, $sms, $itemfile, $itemmeasurenum;
 
 
     public function __construct()
     public function __construct()
     {
     {
@@ -460,15 +460,15 @@ class RProjectController extends DooController
                                 } else {
                                 } else {
                                     $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);
                                     $this->measureauditact->updateMastatus($auditUserArray[$k + 1]['maid']);
                                     // SMS Start
                                     // SMS Start
-                                    // $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k]['auditoruid']);
+                                    $verifyUserArray = $this->profile->getVerifiedMobile($auditUserArray[$k + 1]['auditoruid']);
                                     // var_dump($verifyUserArray);
                                     // var_dump($verifyUserArray);
                                     $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
                                     $pmnameArray = $this->actmeasure->getRowByPmid($auditUserArray[$k + 1]['pmid']);
                                     // var_dump($pmnameArray);
                                     // var_dump($pmnameArray);
                                     if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// XXXX(标段名),陈特,已审批通过。请您继续审批。
                                     if (isset($verifyUserArray) && ($verifyUserArray['mobile'])) {// XXXX(标段名),陈特,已审批通过。请您继续审批。
                                         $retval = $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
                                         $retval = $this->__auditNotice($verifyUserArray['mobile'], $pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
-                                        // var_dump($pmnameArray["pmname"] . ',' . $verifyUserArray["name"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR"]);
-                                        // var_dump($retval);
-                                        // var_dump($this->sms->getErrors());
+//                                        var_dump($pmnameArray["pmname"] . Doo::conf()->SMS_TIPS["AUDIT_NOTICE_AUDITOR2"]);
+//                                        var_dump($retval);
+//                                        var_dump($this->sms->getErrors());
                                     }
                                     }
                                     // SMS End
                                     // SMS End
                                 }
                                 }

+ 5 - 3
protected/view/r-project-section-report.html

@@ -31,7 +31,8 @@
                         </a>
                         </a>
                         <ul class="dropdown-menu">
                         <ul class="dropdown-menu">
                             <!-- loop numArray -->
                             <!-- loop numArray -->
-                            <li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{numArray' value.mpid}}">第{{ToChinaseNum(numArray' value.numpname)}}期</a></li>
+                            <li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{numArray' value.mpid}}">第{{ToChinaseNum(numArray'
+                                value.numpname)}}期</a></li>
                             <!-- endloop -->
                             <!-- endloop -->
                         </ul>
                         </ul>
                     </li>
                     </li>
@@ -43,7 +44,7 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 </li>
                 <!--<li>-->
                 <!--<li>-->
-                    <!--<a href="/rproject/{{pid}}/section/{{pmid}}/files/{{mpid}}">附件</a>-->
+                <!--<a href="/rproject/{{pid}}/section/{{pmid}}/files/{{mpid}}">附件</a>-->
                 <!--</li>-->
                 <!--</li>-->
                 <li class="active">
                 <li class="active">
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
@@ -206,8 +207,9 @@
                 data: {"act": act, "pmid": pmid, "numpname": numpname, "times": times, "content": content},
                 data: {"act": act, "pmid": pmid, "numpname": numpname, "times": times, "content": content},
                 url: "/rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}",
                 url: "/rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}",
                 success: function (data) {
                 success: function (data) {
-                    if (data['status'] == 1)
+                    if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}";
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}";
+                    }
                 }
                 }
             });
             });
         });
         });