Merge branch 'feature/2.1.1' into develop

global/js/jlzf-change-pnumset.js

@@ -644,7 +644,7 @@ function decimalnumsetmodal(costdnum,numbernum,status){
         $('#list tr').eq(i).children('td').eq(7).text(ctotalnum);
         if($('#list tr').eq(i).hasClass('clid')){
             var listid = $('#list tr').eq(i).attr('list_id');
-            updatelist(listid,cnumval);
+            updatelist(listid,cnumval,$('#list tr').eq(i));
             if(status == 'update'){
                 localStorage.setItem('update_'+$('#cid').val()+'_clistid_'+listid,cnumval);
             }else if(status == 'newadd'){
@@ -712,25 +712,33 @@ function updateandgetwhitelist(newid,$thisstr){
     return adtrliststr;
 }
 //更新 changelist 元素
-function updatelist(id,cnum){
+function updatelist(id,cnum,$thisstr){
+    var adtrlist = new Array(6);
+    adtrlist[0] = $thisstr.children('td').eq(0).text();
+    adtrlist[1] = $thisstr.children('td').eq(1).text();
+    adtrlist[2] = $thisstr.children('td').eq(2).text();
+    adtrlist[3] = $thisstr.children('td').eq(3).text();
+    adtrlist[4] = $thisstr.children('td').eq(4).text();
+    adtrlist[5] = cnum;
+    var adtrliststr = adtrlist.join(';');
     //添加到form中list
     if($('#changelist').val() != ''){
         var clist = $('#changelist').val().split(',');
         var exist = 0;
         $.each(clist,function(k,v){
-            var clistid = v.split('_')[0];
+            var clistid = v.split('->')[0];
             if(clistid == id){
                 exist = 1;
-                clist.splice(k,1,id+'_'+cnum);
+                clist.splice(k,1,id+'->'+adtrliststr);
                 return false;
             }
         });
         if(exist == 0){
-            clist.push(id+'_'+cnum);
+            clist.push(id+'->'+adtrliststr);
         }
         $('#changelist').val(clist.join(','));
     }else{
-        $('#changelist').val(id+'_'+cnum);
+        $('#changelist').val(id+'->'+adtrliststr);
     }
 }
 //移除 changelist 元素
@@ -738,7 +746,7 @@ function removelist(id){
     //清除form中list
     var clist = $('#changelist').val().split(',');
     $.each(clist,function(k,v){
-        var clistid = v.split('_')[0];
+        var clistid = v.split('->')[0];
         if(clistid == id){
             clist.splice(k,1);
             return false;

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/config/ver.conf.php

@@ -1,5 +1,5 @@
 <?php
 
 // Version
-$config['ver'] = 'v2.1.0';
+$config['ver'] = 'v2.1.1';
 

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);
@@ -351,7 +352,7 @@ class ChangeController extends DooController
                     $stotalnum = 0;
                     $listtablehtml = '<table class="table table-striped table-bordered nowrap" id="tablelist" cellspacing="0" width="100%">
 								<thead>
-									<tr><th rowspan="2" class="text-center" width="100">清单编号</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><th rowspan="2" class="text-center" width="100">清单编号</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>';
                     $thhtml = '<th class="text-center">数量</th>
 									<th class="text-center">金额</th>
 									<th class="text-center">数量</th>
@@ -589,25 +590,45 @@ class ChangeController extends DooController
                     if(!empty($_POST['changelist'])){
                         $clist = explode(',',$_POST['changelist']);
                         foreach($clist as $ck => $cv){
-                            $clistarr = explode('_',$cv);
-                            if(is_numeric($clistarr[1])){
-                                $changelistArr = $this->change->getChangeListbyid($clistarr[0]);
-                                $total += todecimal(floatval($changelistArr['unitprice'])*floatval($clistarr[1]),$decimalnum['costdnum']);
-
-                                $cauditlist = new ChangeAuditList();
-                                $cauditlist->pid = $pmArray['pid'];
-                                $cauditlist->stid = $pmArray['stid'];
-                                $cauditlist->pmid = $pmArray['pmid'];
-                                $cauditlist->cid = $cid;
-                                $cauditlist->lid = $clistarr[0];
-                                $cauditlist->lnum = $changelistArr['lnum'];
-                                $cauditlist->lname = $changelistArr['lname'];
-                                $cauditlist->unit = $changelistArr['unit'];
-                                $cauditlist->unitprice = $changelistArr['unitprice'];
-                                $cauditlist->oamount = $changelistArr['amount'];
-                                $cauditlist->camount = $clistarr[1];
-                                $cauditlist->auditjson = json_encode($auditArr);
-                                $cauditlist->insert();
+                            $clistid = explode('->',$cv)[0];
+                            $clistarr = explode(';',explode('->',$cv)[1]);
+                            if(!empty($clistarr[0]) && !empty($clistarr[1]) && is_numeric($clistarr[3]) && is_numeric($clistarr[4]) && is_numeric($clistarr[5])){
+                                $changelistArr = $this->change->getChangeListbyid($clistid);
+                                if(!empty($changelistArr)){
+                                    $total += todecimal(floatval($changelistArr['unitprice'])*floatval($clistarr[5]),$decimalnum['costdnum']);
+
+                                    $cauditlist = new ChangeAuditList();
+                                    $cauditlist->pid = $pmArray['pid'];
+                                    $cauditlist->stid = $pmArray['stid'];
+                                    $cauditlist->pmid = $pmArray['pmid'];
+                                    $cauditlist->cid = $cid;
+                                    $cauditlist->lid = $clistid;
+                                    $cauditlist->lnum = $changelistArr['lnum'];
+                                    $cauditlist->lname = $changelistArr['lname'];
+                                    $cauditlist->unit = $changelistArr['unit'];
+                                    $cauditlist->unitprice = $changelistArr['unitprice'];
+                                    $cauditlist->oamount = $changelistArr['amount'];
+                                    $cauditlist->camount = $clistarr[5];
+                                    $cauditlist->auditjson = json_encode($auditArr);
+                                    $cauditlist->insert();
+                                }else{
+                                    $total += todecimal(floatval($clistarr[3])*floatval($clistarr[5]),$decimalnum['costdnum']);
+
+                                    $cauditlist = new ChangeAuditList();
+                                    $cauditlist->pid = $pmArray['pid'];
+                                    $cauditlist->stid = $pmArray['stid'];
+                                    $cauditlist->pmid = $pmArray['pmid'];
+                                    $cauditlist->cid = $cid;
+                                    $cauditlist->lid = 0;
+                                    $cauditlist->lnum = $clistarr[0];
+                                    $cauditlist->lname = $clistarr[1];
+                                    $cauditlist->unit = $clistarr[2];
+                                    $cauditlist->unitprice = $clistarr[3];
+                                    $cauditlist->oamount = $clistarr[4];
+                                    $cauditlist->camount = $clistarr[5];
+                                    $cauditlist->auditjson = json_encode($auditArr);
+                                    $cauditlist->insert();
+                                }
                             }
                         }
                     }
@@ -959,7 +980,7 @@ class ChangeController extends DooController
                 $stotalnum = 0;
                 $listtablehtml = '<table class="table table-striped table-bordered nowrap" id="tablelist" cellspacing="0" width="100%">
 								<thead>
-									<tr><th rowspan="2" class="text-center" width="100">清单编号</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><th rowspan="2" class="text-center" width="100">清单编号</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>';
                 $thhtml = '<th class="text-center">数量</th>
 									<th class="text-center">金额</th>
 									<th class="text-center">数量</th>
@@ -1232,25 +1253,45 @@ class ChangeController extends DooController
                     if(!empty($_POST['changelist'])){
                         $clist = explode(',',$_POST['changelist']);
                         foreach($clist as $ck => $cv){
-                            $clistarr = explode('_',$cv);
-                            if(is_numeric($clistarr[1])){
-                                $changelistArr = $this->change->getChangeListbyid($clistarr[0]);
-                                $total += todecimal(floatval($changelistArr['unitprice'])*floatval($clistarr[1]),$decimalnum['costdnum']);
-
-                                $cauditlist = new ChangeAuditList();
-                                $cauditlist->pid = $pmArray['pid'];
-                                $cauditlist->stid = $pmArray['stid'];
-                                $cauditlist->pmid = $pmArray['pmid'];
-                                $cauditlist->cid = $cid;
-                                $cauditlist->lid = $clistarr[0];
-                                $cauditlist->lnum = $changelistArr['lnum'];
-                                $cauditlist->lname = $changelistArr['lname'];
-                                $cauditlist->unit = $changelistArr['unit'];
-                                $cauditlist->unitprice = $changelistArr['unitprice'];
-                                $cauditlist->oamount = $changelistArr['amount'];
-                                $cauditlist->camount = $clistarr[1];
-                                $cauditlist->auditjson = json_encode($auditArr);
-                                $cauditlist->insert();
+                            $clistid = explode('->',$cv)[0];
+                            $clistarr = explode(';',explode('->',$cv)[1]);
+                            if(!empty($clistarr[0]) && !empty($clistarr[1]) && is_numeric($clistarr[3]) && is_numeric($clistarr[4]) && is_numeric($clistarr[5])){
+                                $changelistArr = $this->change->getChangeListbyid($clistid);
+                                if(!empty($changelistArr)){
+                                    $total += todecimal(floatval($changelistArr['unitprice'])*floatval($clistarr[5]),$decimalnum['costdnum']);
+
+                                    $cauditlist = new ChangeAuditList();
+                                    $cauditlist->pid = $pmArray['pid'];
+                                    $cauditlist->stid = $pmArray['stid'];
+                                    $cauditlist->pmid = $pmArray['pmid'];
+                                    $cauditlist->cid = $cid;
+                                    $cauditlist->lid = $clistid;
+                                    $cauditlist->lnum = $changelistArr['lnum'];
+                                    $cauditlist->lname = $changelistArr['lname'];
+                                    $cauditlist->unit = $changelistArr['unit'];
+                                    $cauditlist->unitprice = $changelistArr['unitprice'];
+                                    $cauditlist->oamount = $changelistArr['amount'];
+                                    $cauditlist->camount = $clistarr[5];
+                                    $cauditlist->auditjson = json_encode($auditArr);
+                                    $cauditlist->insert();
+                                }else{
+                                    $total += todecimal(floatval($clistarr[3])*floatval($clistarr[5]),$decimalnum['costdnum']);
+
+                                    $cauditlist = new ChangeAuditList();
+                                    $cauditlist->pid = $pmArray['pid'];
+                                    $cauditlist->stid = $pmArray['stid'];
+                                    $cauditlist->pmid = $pmArray['pmid'];
+                                    $cauditlist->cid = $cid;
+                                    $cauditlist->lid = 0;
+                                    $cauditlist->lnum = $clistarr[0];
+                                    $cauditlist->lname = $clistarr[1];
+                                    $cauditlist->unit = $clistarr[2];
+                                    $cauditlist->unitprice = $clistarr[3];
+                                    $cauditlist->oamount = $clistarr[4];
+                                    $cauditlist->camount = $clistarr[5];
+                                    $cauditlist->auditjson = json_encode($auditArr);
+                                    $cauditlist->insert();
+                                }
                             }
                         }
                     }
@@ -1359,7 +1400,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;
@@ -1367,11 +1408,9 @@ class ChangeController extends DooController
                         $oneclist = $this->change->getChangeListbyid($cv['lid']);
                         if($cv['lid'] != 0 && !empty($oneclist)){
                             array_push($changeidlist,$cv['lid']);
-                            array_push($changelist,$cv['lid'].'_'.$cv['camount']);
+                            array_push($changelist,$cv['lid'].'->'.$cv['lnum'].';'.$cv['lname'].';'.$cv['unit'].';'.$cv['unitprice'].';'.$cv['oamount'].';'.$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

@@ -153,7 +153,7 @@
 
 						<table id="tablelist" class="table table-striped table-bordered nowrap" 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><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 colspan="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><th class="text-center">数量</th><th class="text-center">金额</th></tr>
 							</thead>
 							<tbody>
@@ -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

@@ -33,10 +33,23 @@
 			width: 10% !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>

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>
 						<!--筛选模块-->