2.1.1 no.1 up 变更令内容更新和bug修复

global/js/jlzf-change-table.js

@@ -17,15 +17,19 @@ function RegNum(obj,e,decimal)
     var keyCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
     if(keyCode != 37 && keyCode != 39){
         //先把非数字的都替换掉，除了数字和.
-        obj.value = obj.value.replace(/[^\d.]/g,"");
+        obj.value = obj.value.replace(/[^\d.-]/g,"");
         //保证第一个数字为0后，第二个数字不能为0
         obj.value = obj.value !== '0' ? obj.value.replace(/^0+/,'').replace(/^\./,"0.") : obj.value;
+        //保证-0后不能再接0
+        obj.value = obj.value.replace(/^\-0+/g,"-0");
         //保证只有出现一个.而没有多个.
         obj.value = obj.value.replace(/\.{2,}/g,".");
         //必须保证第一个为数字而不是.
         obj.value = obj.value.replace(/^\./g,"");
         //保证.只出现一次，而不能出现两次以上
         obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+        //保证-只能出现一次，且必须在第一位
+        obj.value = parseFloat(obj.value) > 0 ? obj.value.replace(/\-/g,"") : obj.value.replace("-","$#$").replace(/\-/g,"").replace("$#$","-");
         //只能输入deciaml 位小数
         var reg = new RegExp("^(\\-)*(\\d+)\\.(\\d{1,"+decimal+"}).*$");
         obj.value = obj.value.replace(reg,'$1$2.$3');

protected/class/change.php

@@ -93,13 +93,13 @@ class Changes
             if(empty($pmid)){
                 return $this->__change->count(array('where' => '(status=? or status=?)'.$sql, 'param' => array($status,$status2), 'asArray' => TRUE));
             }else{
-                return $this->__change->count(array('where' => 'pmid=? and (status=? or status=?)', 'param' => array($pmid,$status,$status2), 'asArray' => TRUE));
+                return $this->__change->count(array('where' => 'pmid=? and (status=? or status=?)'.$sql, 'param' => array($pmid,$status,$status2), 'asArray' => TRUE));
             }
         }else{
             if(empty($pmid)){
                 return $this->__change->count(array('where' => 'status=?'.$sql, 'param' => array($status), 'asArray' => TRUE));
             }else{
-                return $this->__change->count(array('where' => 'pmid=? and status=?', 'param' => array($pmid,$status), 'asArray' => TRUE));
+                return $this->__change->count(array('where' => 'pmid=? and status=?'.$sql, 'param' => array($pmid,$status), 'asArray' => TRUE));
             }
         }
     }
@@ -110,13 +110,13 @@ class Changes
             if(empty($pmid)){
                 return $this->__change->find(array('where' => '(status=? or status=?)'.$sql, 'param' => array($status,$status2), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
             }else{
-                return $this->__change->find(array('where' => 'pmid=? and (status=? or status=?)', 'param' => array($pmid,$status,$status2), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
+                return $this->__change->find(array('where' => 'pmid=? and (status=? or status=?)'.$sql, 'param' => array($pmid,$status,$status2), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
             }
         }else{
             if(empty($pmid)){
                 return $this->__change->find(array('where' => 'status=?'.$sql, 'param' => array($status), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
             }else{
-                return $this->__change->find(array('where' => 'pmid=? and status=?', 'param' => array($pmid,$status), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
+                return $this->__change->find(array('where' => 'pmid=? and status=?'.$sql, 'param' => array($pmid,$status), 'desc' => 'cid', 'limit' => $limit, 'asArray' => TRUE));
             }
         }
     }

protected/controller/ChangeController.php

@@ -261,6 +261,7 @@ class ChangeController extends DooController
         $this->data['status'] = $status;
         $this->data['prolist'] = $prolist;
 
+        $sql .= ' and cid in (SELECT `jl_change_audit`.cid FROM `jl_change_audit` WHERE `jl_change_audit`.uid='.$this->auth->getUid().' GROUP BY `jl_change_audit`.cid)';
         $this->data['num1'] = $this->change->getNumbyMydetail($pmid,$this->auth->getUid());
         $this->data['num2'] = $this->change->getNumbystatus($pmid,'uncheck','back',$sql);
         $this->data['num3'] = $this->change->getNumbystatus($pmid,'checking','',$sql);
@@ -1359,7 +1360,7 @@ class ChangeController extends DooController
                     $addnum = 1;
                     foreach($clist as $ck => $cv){
                         $osum = floatval($cv['unitprice'])*floatval($cv['oamount']);
-
+                        $osum = todecimal($osum,2);
                         $csum = todecimal(floatval($cv['unitprice'])*floatval($cv['camount']),$decimalnum['costdnum']);
                         $clist[$ck]['csum'] = $csum;
                         $ctotalnum += $csum;
@@ -1370,8 +1371,6 @@ class ChangeController extends DooController
                             array_push($changelist,$cv['lid'].'_'.$cv['camount']);
                             $clist[$ck]['iswhite'] = 0;
                         }else{
-                            $osum = todecimal($osum,2);
-
                             $clist[$ck]['add'] = $addnum;
                             array_push($changewhitelist,$addnum.'->'.$cv['lnum'].';'.$cv['lname'].';'.$cv['unit'].';'.$cv['unitprice'].';'.$cv['oamount'].';'.$cv['camount']);
                             $addnum++;

protected/view/biangeng-approval.html

@@ -50,7 +50,7 @@
 			<input id="uid" type="hidden" value="{{uid}}">
 			<input id="verification" type="hidden" value="{{verification}}">
 			<div class="title" id="xinxi">
-				<div class="bg-top-btn affix"><button class="btn btn-success showapproval" status="pass">通过</button>&nbsp;<button class="btn btn-warning showapproval" status="back">退回</button>&nbsp;<button class="btn btn-danger showapproval" status="stop">不通过</button></div>
+				<div class="bg-top-btn affix"><button class="btn btn-success showapproval" status="pass">通过</button>&nbsp;<button class="btn btn-warning showapproval" status="back">退回</button>&nbsp;<button class="btn btn-danger showapproval" status="stop">终止</button></div>
 				<h1><a href="/change/index/tender/{{pmArray.pmid}}" title="返回"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a>&nbsp;{{changeArray.pnum}}</h1>
 			</div>
 			<div class="row">
@@ -181,7 +181,7 @@
 								<!-- else -->
 								<!-- if {{auditlist' value.status}} == 'checked' --><td width="100" class="colGreen">审批通过</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
 								<!-- elseif {{auditlist' value.status}} == 'back' || {{auditlist' value.status}} == 'backnew' --><td width="100" class="colRed">退回</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
-								<!-- elseif {{auditlist' value.status}} == 'checkno' --><td width="100" class="colRed">审批不通过</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
+								<!-- elseif {{auditlist' value.status}} == 'checkno' --><td width="100" class="colRed">审批终止</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
 								<!-- elseif {{auditlist' value.status}} == 'checking' --><td width="100" class="colOrange">审批中</td><td></td>
 								<!-- else --><td width="100"></td><td></td>
 								<!-- endif -->
@@ -226,7 +226,7 @@
 				</div>
 				<div class="alert alert-success" style="display: none;" role="alert">审批通过，将由下一审批人继续审批，如果您是终审，变更审批将完成。</div>
 				<div class="alert alert-warning" style="display: none;" role="alert">审批退回，将由上一审批人重新审批或将由原报重新提交变更。</div>
-				<div class="alert alert-danger" style="display: none;" role="alert">审批不通过，将结束本次审批。</div>
+				<div class="alert alert-danger" style="display: none;" role="alert">审批终止，将结束本次审批。</div>
 				<div id="backform" style="display: none">
 				<!-- if {{firstcheck}} == 0 -->
 				<label class="radio-inline">
@@ -240,7 +240,7 @@
 			</div>
 			<div class="modal-footer" id="submitform">
 				<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">关闭</button>
-				<button class="btn btn-success" style="display: none" name="status" value="checked" type="submit">通过</button><button style="display: none" type="submit" name="status" value="back" class="btn btn-warning">退回</button><button style="display: none" type="submit" name="status" value="checkno" class="btn btn-danger">不通过</button>
+				<button class="btn btn-success" style="display: none" name="status" value="checked" type="submit">通过</button><button style="display: none" type="submit" name="status" value="back" class="btn btn-warning">退回</button><button style="display: none" type="submit" name="status" value="checkno" class="btn btn-danger">终止</button>
 			</div>
 			</form>
 		</div>

protected/view/biangeng-detail.html

@@ -197,7 +197,7 @@
 								<!-- else -->
 									<!-- if {{auditlist' value.status}} == 'checked' --><td width="100" class="colGreen">审批通过</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
 									<!-- elseif {{auditlist' value.status}} == 'back' || {{auditlist' value.status}} == 'backnew' --><td width="100" class="colRed">退回</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
-									<!-- elseif {{auditlist' value.status}} == 'checkno' --><td width="100" class="colRed">审批不通过</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
+									<!-- elseif {{auditlist' value.status}} == 'checkno' --><td width="100" class="colRed">审批终止</td><td>{{formatDate(auditlist' value.sintime)}}<br>{{auditlist' value.sdesc}}</td>
 									<!-- elseif {{auditlist' value.status}} == 'checking' --><td width="100" class="colOrange">审批中</td><td></td>
 									<!-- else --><td width="100"></td><td></td>
 									<!-- endif -->

protected/view/biangeng-new.html

@@ -30,13 +30,26 @@
 			max-width: 300px !important;
 		}
 		.allwidth3{
-			width: 10% !important;
+			width: 9% !important;
 			max-width: 150px !important;
 		}
+		.allwidth4{
+			width: 5% !important;
+			max-width: 70px !important;
+		}
 		div.DTFC_LeftFootWrapper table, div.DTFC_RightFootWrapper table{
 			border-top: 1px solid #ddd;
 		}
 		div.dataTables_scrollFootInner table{
+			margin-top: 1px !important;
+		}
+		table.dataTable{
+			border-collapse: collapse !important;
+		}
+		table.table-bordered.dataTable tbody th, table.table-bordered.dataTable tbody td{
+			border-bottom-width: 1px;
+		}
+		div.dataTables_scrollFootInner table{
 			margin-top: 0 !important;
 		}
 	</style>
@@ -188,13 +201,13 @@
 								<span class="glyphicon glyphicon-list-alt"></span> 变更清单&nbsp;&nbsp;<a href="#addlist" class="btn btn-primary btn-xs" data-toggle="modal"><span class="glyphicon glyphicon-plus"></span> 添加清单</a></legend>
 							<table class="table table-striped table-bordered nowrap" id="tablelist" cellspacing="0" width="100%">
 								<thead>
-								<tr><th rowspan="2" class="text-center">清单编号</th><th rowspan="2" class="text-center">名称</th><th rowspan="2" class="text-center">单位</th><th rowspan="2" class="text-center">单价</th><th colspan="2" class="text-center">原设计</th><th colspan="2" class="text-center">申报变更</th></tr>
+								<tr><th rowspan="2" class="text-center">清单编号</th><th rowspan="2" class="text-center">名称</th><th rowspan="2" class="text-center">单位</th><th rowspan="2" class="text-center">单价</th><th colspan="2" class="text-center">原设计</th><th colspan="2" class="text-center">申报变更增（+）减（-）</th><th rowspan="2" class="text-center">删除</th></tr>
 								<tr><th class="text-center">数量</th><th class="text-center">金额</th><th class="text-center">数量</th><th class="text-center">金额</th></tr>
 								</thead>
 								<tbody id="list">
 								</tbody>
 								<tfoot>
-									<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td class="otatalamount"></td><td></td><td class="ctatalamount"></td></tr>
+									<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td class="otatalamount"></td><td></td><td class="ctatalamount"></td><td></td></tr>
 								</tfoot>
 							</table>
 						</div>
@@ -481,6 +494,6 @@
 <script type="text/javascript" language="javascript" src="{{rootUrl}}global/js/dataTables.fixedColumns.min.js"></script>
 <script src="{{rootUrl}}global/js/jlzf-change-table.js"></script>
 <script src="{{rootUrl}}global/js/jlzf-calculation.js"></script>
-<script src="{{rootUrl}}global/js/jlzf-change-pnumset.min.js"></script>
-<script src="{{rootUrl}}global/js/jlzf-change-new.min.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-pnumset.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-new.js"></script>
 </body>

protected/view/biangeng-poj.html

@@ -48,7 +48,7 @@
 							<a href="{{rootUrl}}change/index<!-- if !empty({{pmid}}) -->/tender/{{pmid}}<!-- endif -->/status/4">已完成 <!-- if {{num4}} != 0 --><span class="label label-default">{{num4}}</span><!-- endif --></a>
 							</li>
 							<li <!-- if {{status}} == 5 -->class="active"<!-- endif -->>
-							<a href="{{rootUrl}}change/index<!-- if !empty({{pmid}}) -->/tender/{{pmid}}<!-- endif -->/status/5">不通过 <!-- if {{num5}} != 0 --><span class="label label-default">{{num5}}</span><!-- endif --></a>
+							<a href="{{rootUrl}}change/index<!-- if !empty({{pmid}}) -->/tender/{{pmid}}<!-- endif -->/status/5">终止 <!-- if {{num5}} != 0 --><span class="label label-default">{{num5}}</span><!-- endif --></a>
 							</li>
 						</ul>
 						<!--筛选模块-->