2.1.0 正式版本 no.5 up

global/js/jlzf-change-new.js

@@ -22,6 +22,7 @@ $(function(){
         var html = '';
         //获取清单列表
         var clist = new Array();
+        var rlist = new Array();
         $('.checklist').find('.listcheckbox').each(function(){
             if($(this).prop("checked")){
                 var id = $(this).parents('.checklist').children('td').eq(0).attr('list_id');
@@ -44,12 +45,14 @@ $(function(){
                     localStorage.setItem('new_clistid_'+id,zero);
                     clist.push(id+'_'+zero);
                 }
+                rlist.push(id);
                 sctotal = sctotal != 0 ? roundnum(sctotal,decimal) : costzero;
                 html += '<tr class="clist clid" list_id="'+ id +'"><td sortnum="0">'+ num +'</td><td sortnum="1">'+ name +'</td><td sortnum="2">'+ unit +'</td><td sortnum="3">'+ price +'</td><td sortnum="4">'+ oamount +'</td><td sortnum="5">'+ ototal +'</td><td sortnum="6"><input class="form-control input-sm" type="text" placeholder="请输入变更数量" onkeyup="RegNum(this,event,'+ decimalsetarr[1] +')" value="'+ scnum +'"></td><td sortnum="7">'+ sctotal +'</td></tr>';
             }
         });
         //添加到form中list
         $('#changelist').val(clist.join(','));
+        $('#reductionList').val(rlist.join(','));
 
         //获取localstorage里的数据
         var newid = 1;
@@ -82,7 +85,7 @@ $(function(){
             if(num2 != '' || name2 != '' || price2 != '' || oamount2 != '' || scnum != ''){
                 wlist.push(addArr[z]+'->'+trlist.join(';'));
 
-                var ototal2 = price2 != '' && oamount2 != '' ? roundnum(parseFloat(price2).mul(parseFloat(oamount2)),decimal) : '';
+                var ototal2 = price2 != '' && oamount2 != '' ? roundnum(parseFloat(price2).mul(parseFloat(oamount2)),2) : '';
                 var sctotal2 = price2 != '' && scnum != '' ? roundnum(parseFloat(price2).mul(parseFloat(scnum)),decimal) : '';
                 var optionlist = '';
                 for(var j = 0; j < optionselect.length; j++){
@@ -144,7 +147,7 @@ $(function(){
                 $thisstr.children('td').eq(site).children('input').val(unitprice);
                 var onum = $thisstr.children('td').eq(4).children('input').val();
                 var num = $thisstr.children('td').eq(6).children('input').val();
-                var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),decimal) : '';
+                var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),2) : '';
                 var total = $.trim(num) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(num)),decimal) : '';
                 $thisstr.children('td').eq(5).text(ototal);
                 $thisstr.children('td').eq(7).text(total);
@@ -153,7 +156,7 @@ $(function(){
             else if(site == 4) {
                 var onum = $(this).val();
                 var unitprice = $(this).parents('.clist').children('td').eq(3).children('input').val();
-                var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),decimal) : '';
+                var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),2) : '';
                 $(this).parents('.clist').children('td').eq(5).text(ototal);
             }else{
                 var thistr = $(this).parents('tr').attr('newlist_tid');
@@ -277,21 +280,21 @@ function checkform(){
             toastr.error('请添加审批人');
             return false;
         }
-
-        var addArr = new Array();
-        var storage = window.localStorage;
-        for(var i = 0; i < storage.length; i++){
-            var key = storage.key(i);
-            if(key.substring(0,16) == 'add_new_clistid_' || key.substring(0,12) == 'new_clistid_'){
-                addArr.push(key);
-            }
-        }
-        if(addArr){
-            $.each(addArr,function(k,v){
-                storage.removeItem(v);
-            })
+    }
+    var addArr = new Array();
+    var storage = window.localStorage;
+    for(var i = 0; i < storage.length; i++){
+        var key = storage.key(i);
+        if(key.substring(0,16) == 'add_new_clistid_' || key.substring(0,12) == 'new_clistid_'){
+            addArr.push(key);
         }
     }
+    if(addArr){
+        $.each(addArr,function(k,v){
+            storage.removeItem(v);
+        })
+    }
+
     var ajaxflag = 0;
     $.ajax({
         type: 'post',

global/js/jlzf-change-pnumset.js

@@ -236,14 +236,17 @@ $(function(){
 
             //移除form中
             var auditlist = $('#selectauditlist').val().split('->');
+            var reductionauditlist = $('#reductionAudit').val().split(',');
             $.each(auditlist,function(k,v){
                 var vid = v.split('_')[0];
                 if(uid == vid){
                     auditlist.splice(k,1);
+                    reductionauditlist.splice(k,1);
                     return false;
                 }
             });
             $('#selectauditlist').val(auditlist.join('->'));
+            $('#reductionAudit').val(reductionauditlist.join(','));
 
         }else{
             $(this).parents('.alert-pnone').addClass('alert-success');
@@ -258,10 +261,14 @@ $(function(){
             //添加到form中
             if($('#selectauditlist').val() != ''){
                 var auditlist = $('#selectauditlist').val().split('->');
+                var reductionauditlist = $('#reductionAudit').val().split(',');
                 auditlist.push(adduser);
+                reductionauditlist.push(uid);
                 $('#selectauditlist').val(auditlist.join('->'));
+                $('#reductionAudit').val(reductionauditlist.join(','));
             }else{
                 $('#selectauditlist').val(adduser);
+                $('#reductionAudit').val(uid);
             }
 
         }
@@ -467,6 +474,72 @@ $(function(){
             return true;
         }
     });
+
+    //modal取消事件，还原旧保存的数据
+    $('#cancellist').click(function () {
+        var reductionlist = $('#reductionList').val().split(',');
+        //先删所有后还原
+        var $rowtr = $('#addlist').find('tbody').children('tr');
+        $rowtr.removeClass('success');
+        $rowtr.find('input').prop('checked',false);
+        var z = 0;
+        for(var i = 0; i < reductionlist.length; i++){
+            var j = z;
+            for(; j < $rowtr.length; j++){
+                if(reductionlist[i] == $rowtr.eq(j).children('td').eq(0).attr('list_id')){
+                    $rowtr.eq(j).addClass('success');
+                    $rowtr.eq(j).find('input').prop('checked',true);
+                    z = ++j;
+                    break;
+                }
+            }
+        }
+
+        $('#addlist').modal('hide');
+    });
+
+    $('#cancelaudit').click(function () {
+        var reductionaudit = $('#reductionAudit').val();
+        var changeaudit = $('#changeaudit').val();
+        if(changeaudit !== reductionaudit){
+            //不相同则要还原
+            $('#selectauditlist').val('');
+            var $rowdiv = $('#addshenpi').find('.row').children('div');
+            $rowdiv.removeClass('alert-success');
+            $rowdiv.find('input').prop('checked',false);
+
+            var auditlist = changeaudit.split(',');
+            if(auditlist.length){
+                for(var i = 0; i < auditlist.length; i++){
+                    for(var j = 0; j < $rowdiv.length; j++){
+                        var $rowdivdiv = $rowdiv.eq(j).children('div');
+                        if(auditlist[i] == $rowdivdiv.attr('data-uid')){
+                            $rowdiv.eq(j).addClass('alert-success');
+                            $rowdivdiv.find('input').prop('checked',true);
+                            var uid = $rowdivdiv.attr('data-uid');
+                            var name = $rowdivdiv.attr('data-uname');
+                            var company = $rowdivdiv.attr('data-ucompany');
+                            var jobs = $rowdivdiv.attr('data-ujobs');
+                            var adduser = uid+'_'+name+'_'+company+'_'+jobs;
+                            if($('#selectauditlist').val() != ''){
+                                var auditlist2 = $('#selectauditlist').val().split('->');
+                                auditlist2.push(adduser);
+                                $('#selectauditlist').val(auditlist2.join('->'));
+                            }else{
+                                $('#selectauditlist').val(adduser);
+                            }
+                        }
+                    }
+                }
+            }
+            $('#reductionAudit').val(changeaudit);
+        }
+        $('#addshenpi').modal('hide');
+    });
+
+    $('body').on('focus', "#tablelist input", function() {
+        $(this).select();
+    });
 });
 
 //根据位数生成编号，3位-》001 ，5位-》00001

global/js/jlzf-change-update.js

@@ -41,6 +41,7 @@ $(function(){
         //获取清单列表
         var totalnum = 0;
         var clist = new Array();
+        var rlist = new Array();
         $('.checklist').find('.listcheckbox').each(function(){
             if($(this).prop("checked")){
                 var id = $(this).parents('.checklist').children('td').eq(0).attr('list_id');
@@ -63,12 +64,14 @@ $(function(){
                     localStorage.setItem('update_'+ cid +'_clistid_'+id,zero);
                     clist.push(id+'_'+zero);
                 }
+                rlist.push(id);
                 sctotal = parseFloat(sctotal) != 0 ? roundnum(sctotal,decimal) : costzero;
                 html += '<tr class="clist clid" list_id="'+ id +'"><td sortnum="0">'+ num +'</td><td sortnum="1">'+ name +'</td><td sortnum="2">'+ unit +'</td><td sortnum="3">'+ price +'</td><td sortnum="4">'+ oamount +'</td><td sortnum="5">'+ ototal +'</td><td sortnum="6"><input class="form-control input-sm" type="text" onkeyup="RegNum(this,event,'+ decimalsetarr[1] +')" placeholder="请输入变更数量" value="'+ scnum +'"></td><td sortnum="7">'+ sctotal +'</td></tr>';
             }
         });
         //添加到form中list
         $('#changelist').val(clist.join(','));
+        $('#reductionList').val(rlist.join(','));
 
         //获取localstorage里的数据
         var newid = 1;
@@ -102,7 +105,7 @@ $(function(){
             if(num2 != '' || name2 != '' || price2 != '' || oamount2 != '' || scnum != ''){
                 wlist.push(addArr[z]+'->'+trlist.join(';'));
 
-                var ototal2 = price2 != '' && oamount2 != '' ? roundnum(parseFloat(price2).mul(parseFloat(oamount2)),decimal) : '';
+                var ototal2 = price2 != '' && oamount2 != '' ? roundnum(parseFloat(price2).mul(parseFloat(oamount2)),2) : '';
                 var sctotal2 = price2 != '' && scnum != '' ? roundnum(parseFloat(price2).mul(parseFloat(scnum)),decimal) : '';
                 var optionlist = '';
                 for(var j = 0; j < optionselect.length; j++){
@@ -164,7 +167,7 @@ $(function(){
             $thisstr.children('td').eq(site).children('input').val(unitprice);
             var onum = $thisstr.children('td').eq(4).children('input').val();
             var num = $thisstr.children('td').eq(6).children('input').val();
-            var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),decimal) : '';
+            var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),2) : '';
             var total = $.trim(num) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(num)),decimal) : '';
             $thisstr.children('td').eq(5).text(ototal);
             $thisstr.children('td').eq(7).text(total);
@@ -173,7 +176,7 @@ $(function(){
         else if(site == 4) {
             var onum = $(this).val();
             var unitprice = $(this).parents('.clist').children('td').eq(3).children('input').val();
-            var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),decimal) : '';
+            var ototal = $.trim(onum) != '' && $.trim(unitprice) != '' ? roundnum(parseFloat(unitprice).mul(parseFloat(onum)),2) : '';
             $(this).parents('.clist').children('td').eq(5).text(ototal);
         }else{
             var thistr = $(this).parents('tr').attr('newlist_tid');

protected/class/change.php

@@ -234,9 +234,13 @@ class Changes
         return $this->__changeaudit->find(array('where' => 'cid=?', 'asc' => 'id', 'param' => array($cid), 'asArray' => TRUE));
     }
 
-    public function getChangeAuditsbySort($cid)
+    public function getChangeAuditsbySort($cid,$notime = '')
     {
-        return $this->__changeaudit->find(array('where' => 'cid=?', 'asc' => 'usort', 'param' => array($cid), 'asArray' => TRUE));
+        if($notime != ''){
+            return $this->__changeaudit->find(array('where' => 'cid=? and times!=?', 'asc' => 'usort', 'param' => array($cid,$notime), 'asArray' => TRUE));
+        }else{
+            return $this->__changeaudit->find(array('where' => 'cid=?', 'asc' => 'usort', 'param' => array($cid), 'asArray' => TRUE));
+        }
     }
 
     public function getChangeAuditsbycidtime($cid,$times)
@@ -358,7 +362,7 @@ class Changes
     public function delAllChangebyPmid($pmid)
     {
         // TODO: 根据pmid删除所有相关联的变更令内容
-        // TODO: 项目管理中使用
+        // TODO: 项目管理和前台删除标段中使用
         $changeattlist = $this->__changeatt->find(array('where' => 'pmid=?', 'param' => array($pmid), 'asArray' => TRUE));
 
         if(!empty($changeattlist)){

protected/class/itemmeasurenum.php

@@ -121,7 +121,8 @@ class ItemMeasureNumpofper
     {
         $list = $this->__itemMeasureNum->find(array('where' => 'pmid=?', 'param' => array($pmid), 'asArray' => TRUE));
         if(!empty($list)){
-            Doo::loadClass('itemfile');
+            include (DOO::conf()->SITE_PATH . 'protected/class/itemfile.php');
+//            Doo::loadClass('itemfile');
             include (DOO::conf()->SITE_PATH . 'protected/plugin/io.han.php');
             foreach($list as $k => $v){
                 $itemfile = new ItemFile();

protected/controller/ChangeController.php

@@ -270,7 +270,7 @@ class ChangeController extends DooController
         //获取列表内容
         Doo::loadHelper('DooPager');
         $pagestr = !empty($pmid) ? '/tender/'.$pmid.'/status/'.$status : '/status/'.$status;
-        $totalArchive = $status != 1 ? $this->change->getNumbystatus($pmid,$this->changeStatus[$status],'',$sql) : $this->change->getNumbyMydetail($pmid,$this->auth->getUid());
+        $totalArchive = $status != 1 ? ($status ==2 ? $this->change->getNumbystatus($pmid,'uncheck','back',$sql) : $this->change->getNumbystatus($pmid,$this->changeStatus[$status],'',$sql)) : $this->change->getNumbyMydetail($pmid,$this->auth->getUid());
         $pager = new DooPager(Doo::conf()->APP_URL . 'change/index'.$pagestr.'/page', $totalArchive, 10, 100);
         $pager->setCss('', 'disabled', 'active');
         if (isset($this->params['pindex']))
@@ -309,12 +309,13 @@ class ChangeController extends DooController
             if(empty($pmArray)){
                 exit('不存在此标段');
             }
+            include (DOO::conf()->SITE_PATH . 'protected/plugin/TemplateTag.php');
             $this->data['pmArray'] = $pmArray;
             $list = $this->change->getChangeListbyPmid($pmid);
             if(!empty($list)){
                 foreach($list as $k => $v){
                     $totalamount = floatval($v['unitprice'])*floatval($v['amount']);
-                    $list[$k]['totalamount'] = $totalamount;
+                    $list[$k]['totalamount'] = todecimal($totalamount,2);
                 }
             }
             $this->data['list'] = $list;
@@ -651,7 +652,7 @@ class ChangeController extends DooController
             if(!empty($list)){
                 foreach($list as $k => $v){
                     $totalamount = floatval($v['unitprice'])*floatval($v['amount']);
-                    $list[$k]['totalamount'] = $totalamount;
+                    $list[$k]['totalamount'] = todecimal($totalamount,2);
                     $list[$k]['index'] = $k+1;
                 }
             }
@@ -1291,7 +1292,7 @@ class ChangeController extends DooController
                 if(!empty($list)){
                     foreach($list as $k => $v){
                         $totalamount = floatval($v['unitprice'])*floatval($v['amount']);
-                        $list[$k]['totalamount'] = $totalamount;
+                        $list[$k]['totalamount'] = todecimal($totalamount,2);
                         $list[$k]['index'] = $k+1;
                     }
                 }
@@ -1362,17 +1363,20 @@ class ChangeController extends DooController
                         $csum = todecimal(floatval($cv['unitprice'])*floatval($cv['camount']),$decimalnum['costdnum']);
                         $clist[$ck]['csum'] = $csum;
                         $ctotalnum += $csum;
-
-                        if($cv['lid'] != 0){
+                        //判断这条清单是否已被替换或删除，有则变成空白清单显示
+                        $oneclist = $this->change->getChangeListbyid($cv['lid']);
+                        if($cv['lid'] != 0 && !empty($oneclist)){
                             array_push($changeidlist,$cv['lid']);
                             array_push($changelist,$cv['lid'].'_'.$cv['camount']);
+                            $clist[$ck]['iswhite'] = 0;
                         }else{
-                            $osum = todecimal($osum,$decimalnum['costdnum']);
+                            $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++;
                             $clist[$ck]['changeunit'] = $this->changeUnit;
+                            $clist[$ck]['iswhite'] = 1;
                         }
                         $clist[$ck]['osum'] = $osum;
                         $ototalnum += $osum;
@@ -1414,7 +1418,8 @@ class ChangeController extends DooController
 
                 //输出重新上报的审批列表信息
                 if($changeArray['status'] == 'back'){
-                    $auditlist2 = $this->change->getChangeAuditsbySort($cid);
+                    $creatorArray = $this->change->getChangeAuditLastUser($cid,0);
+                    $auditlist2 = $this->change->getChangeAuditsbySort($cid,$creatorArray['times']);
                     $this->data['auditlist2'] = $auditlist2;
                 }
 

protected/controller/SProjectController.php

@@ -145,7 +145,7 @@ class SProjectController extends DooController
     {
         //删除标段
         if(isset($_POST['secid']) && is_numeric($_POST['secid'])){
-            //删除标段关注人、审批人、期数、文件数据表、附件的内容，并更改签署表的状态为‘del’
+            //删除标段关注人、审批人、期数、文件数据表、附件,变更令的内容，并更改签署表的状态为‘del’
             if((isset($_POST['delsec']) && isset($_POST['text']) && trim($_POST['text']) == '删除标段') || isset($_POST['delsec2'])){
 
                 $mcresult = $this->concern->delMeasureConcernListbyPmid($_POST['secid']);
@@ -160,6 +160,8 @@ class SProjectController extends DooController
 
                 $signresult = $this->sign->updateSignStatusbyPmid($_POST['secid']);
 
+                $changeresult = $this->change->delAllChangebyPmid($_POST['secid']);
+
                 $this->actmeasure->del($_POST['secid']);
             }
             return Doo::conf()->APP_URL . 'sproject/' . $this->params['pid'] . '/section';

protected/module/admin/controller/ProController.php

@@ -17,7 +17,7 @@ Doo::loadClass('attfile');
 Doo::loadClass('sign');
 Doo::loadClass('measureconcerner');
 Doo::loadClass('itemmeasurenum');
-Doo::loadModel('change');
+Doo::loadClass('change');
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
@@ -121,36 +121,34 @@ class ProController extends DooController
             if($_POST['type'] == 'delmpro' && isset($_POST['pmid'])){
                 $this->am->del($_POST['pmid']);
                 //删除该标段下第1期#1所有审批人列表
-                $anmsg = $this->an->getLastNew2($_POST['pmid']);
-                if(!empty($anmsg)){
-                    $muaudits = $this->ama->getAuditsByMpid($anmsg['mpid']);
-                    if(!empty($muaudits)){
-                        foreach($muaudits as $k => $v){
-                            $this->ama->del($v['maid']);
-                        }
-                    }
-                    $this->an->del($anmsg['mpid']);
-
-                    //文件列也要删除，不然软件报错
-                    $this->attfile->delAllTimesFile2($anmsg['mpid']);
+//                $anmsg = $this->an->getLastNew2($_POST['pmid']);
+                $this->ama->delMeasureAuditListbyPmid($_POST['pmid']);
+//                if(!empty($anmsg)){
+//                    $muaudits = $this->ama->getAuditsByMpid($anmsg['mpid']);
+//                    if(!empty($muaudits)){
+//                        foreach($muaudits as $k => $v){
+//                            $this->ama->del($v['maid']);
+//                        }
+//                    }
+//                    $this->an->del($anmsg['mpid']);
 
-                    //删除标段关注、签署表，中间计量表,附件的内容，变更令的内容
-                    $this->concern->delMeasureConcernListbyPmid($_POST['pmid']);
+                //文件列也要删除，不然软件报错
+                $this->attfile->delAllTimesFile3($_POST['pmid']);
 
-                    $this->sign->delSignbyTenderAndPhaseno($_POST['pmid']);
+                //删除标段关注、签署表，中间计量表,附件的内容，变更令的内容
+                $this->concern->delMeasureConcernListbyPmid($_POST['pmid']);
 
-                    $this->itemmeasurenum->delItembyPmid($_POST['pmid']);
+                $this->sign->delSignbyTenderAndPhaseno($_POST['pmid']);
 
-                    $this->change->delAllChangebyPmid($_POST['pmid']);
+                $this->itemmeasurenum->delItembyPmid($_POST['pmid']);
 
+                $this->change->delAllChangebyPmid($_POST['pmid']);
 
-                }
                 die(json_encode(array('status' => 'ok')));
             }
 
         }
 
-
         $typeArray = $this->cc->getRowByPid($this->params['pid']);
         if(!empty($typeArray)){
             foreach($typeArray as $k => $v){

protected/module/admin/model/measureaudit.php

@@ -82,6 +82,10 @@ class AmeasureAudit extends DooModel
     public function getNumAuditsByPmidNumTimes($pmid,$numpname,$times){
         return $this->count(array('where' => 'pmid=? and numpname=? and times=?', 'param' => array($pmid,$numpname,$times), 'asArray' => TRUE));
     }
+
+    public function delMeasureAuditListbyPmid($pmid){
+        return $this->delete(array('where' => 'pmid=?', 'param' => array($pmid), 'asArray' => TRUE));
+    }
 }
 
 ?>

protected/plugin/TemplateTag.php

@@ -22,7 +22,8 @@ function tofloat($str) {
 }
 
 function todecimal($num,$decimal) {
-	return sprintf("%.".$decimal."f", $num);
+//	return sprintf("%.".$decimal."f", $num);
+	return round($num,$decimal);
 }
 
 function sample_with_args($str, $prefix) {

protected/view/biangeng-approval.html

@@ -523,9 +523,13 @@
 				for(var i = 0;i<inputs.length;i++){
 					// 如果是最后一个，则焦点回到第一个
 					if(i==(inputs.length-1)){
-						inputs[0].focus(); break;
+//						inputs[0].focus();
+						inputs[0].select();
+						break;
 					}else if(this == inputs[i]){
-						inputs[i+1].focus(); break;
+//						inputs[i+1].focus();
+						inputs[i+1].select();
+						break;
 					}
 				}
 				return false;
@@ -533,6 +537,9 @@
 				return true;
 			}
 		});
+		$("#tablelist input[type=text]").focus(function() {
+			$(this).select();
+		});
 	});
 
 	function checksubmit() {

protected/view/biangeng-new.html

@@ -239,7 +239,7 @@
 </div>
 
 <!--添加清单-->
-<div class="modal fade " tabindex="-1" role="dialog" aria-hidden="true" id="addlist">
+<div class="modal fade " id="addlist" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -269,8 +269,9 @@
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="addlistbtn btn btn-default">添加空白清单</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-default" id="cancellist">取消</button>
 				<button type="button" class="addlistbtn btn btn-primary">添加</button>
+				<input type="hidden" id="reductionList" value="">
 			</div>
 		</div>
 	</div>
@@ -342,7 +343,7 @@
 <!--添加附件-->
 
 <!--添加审批人-->
-<div class="modal fade" id="addshenpi" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="addshenpi" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" data-backdrop="static" data-keyboard="false">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -376,9 +377,10 @@
 				</div>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-default" id="cancelaudit">取消</button>
 				<button type="button" class="btn btn-primary" id="addaudit">添加</button>
 				<input type="hidden" id="selectauditlist" value="">
+				<input type="hidden" id="reductionAudit" value="">
 			</div>
 		</div>
 	</div>