2.1.2 no.3 up

global/js/jlzf-change-pnumset.js

@@ -1,24 +1,24 @@
 $.event.special.valuechange = {
-    teardown: function (namespaces) {
-        $(this).unbind('.valuechange');
-    },
-
-    handler: function (e) {
-        $.event.special.valuechange.triggerChanged($(this));
-    },
-
-    add: function (obj) {
-        $(this).on('keyup.valuechange cut.valuechange paste.valuechange input.valuechange', obj.selector, $.event.special.valuechange.handler)
-    },
-
-    triggerChanged: function (element) {
-        var current = element[0].contentEditable === 'true' ? element.html() : element.val()
-            , previous = typeof element.data('previous') === 'undefined' ? element[0].defaultValue : element.data('previous');
-        if (current !== previous) {
-            element.trigger('valuechange', [element.data('previous')]);
-            element.data('previous', current);
-        }
+teardown: function (namespaces) {
+    $(this).unbind('.valuechange');
+},
+
+handler: function (e) {
+    $.event.special.valuechange.triggerChanged($(this));
+},
+
+add: function (obj) {
+    $(this).on('keyup.valuechange cut.valuechange paste.valuechange input.valuechange', obj.selector, $.event.special.valuechange.handler)
+},
+
+triggerChanged: function (element) {
+    var current = element[0].contentEditable === 'true' ? element.html() : element.val()
+        , previous = typeof element.data('previous') === 'undefined' ? element[0].defaultValue : element.data('previous');
+    if (current !== previous) {
+        element.trigger('valuechange', [element.data('previous')]);
+        element.data('previous', current);
     }
+}
 };
 
 function escapeTags( str ) {
@@ -255,7 +255,8 @@ $(function(){
             var name = $(this).attr('data-uname');
             var company = $(this).attr('data-ucompany');
             var jobs = $(this).attr('data-ujobs');
-            var adduser = uid+'_'+name+'_'+company+'_'+jobs;
+            var email = $(this).attr('data-uemail');
+            var adduser = uid+'_'+name+'_'+company+'_'+jobs+'_'+email;
 
 
             //添加到form中
@@ -271,7 +272,7 @@ $(function(){
                 $('#reductionAudit').val(uid);
             }
         }
-        approvallist();
+        //approvallist();
     });
 
     //添加到审批流程中
@@ -288,7 +289,13 @@ $(function(){
                 var name = vmsg[1];
                 var company = vmsg[2];
                 var jobs = vmsg[3];
-                var addusertr = '<tr id="user_'+ uid +'" userid="'+ uid +'"><td width="100">'+sort+' 审</td><td width="250"><h4 class="media-heading">'+ jobs +' '+ name +'</h4>'+ company +'</td> <td width="100"></td> <td></td> </tr>';
+                var email = vmsg[4];
+                var addusertr = '<tr>' +
+                    '<td width="100">'+(sort != auditlist.length ? '<i class="glyphicon glyphicon-arrow-down text-muted"></i> 审批': '<i class="glyphicon glyphicon-stop text-muted"></i> 终审') +'</td>' +
+                    '<td width="150"><h4 class="media-heading">'+ name +' </h4>'+ jobs +'</td> ' +
+                    '<td width="200">'+ email +'<br>'+ company +'</td> ' +
+                    '<td width=""><a href="javascript:void(0);" class="btn btn-default btn-sm remove-select-audit" uid="'+ uid +'" title="移除审批人"><span class="glyphicon glyphicon-remove text-danger"></span></a></td>' +
+                    ' </tr>';
                 $('#usertableshow').append(addusertr);
                 auditarray.push(uid);
                 sort++;
@@ -314,6 +321,7 @@ $(function(){
             //        return false;
             //    }
             //}
+            $('#searchshow').html('');
             $.ajax({
                 type: 'post',
                 url: '/change/user/search?name='+username,
@@ -325,12 +333,17 @@ $(function(){
                     }else{
                         var userlist = result.userlist;
                         var adduserhtml = '';
+                        var reductionAudit = $('#reductionAudit').val().split(',');
                         for(var i in userlist){
-                            useridlist.push(userlist[i].userid);
-                            adduserhtml += '<div class="col-md-3 alert alert-pnone"><div class="radio" data-uid="'+ userlist[i].userid +'" data-uname="'+ userlist[i].name +'" data-ucompany="'+ userlist[i].company +'" data-ujobs="'+ userlist[i].jobs +'"><label><input type="radio" value="'+ userlist[i].userid +'">'+ userlist[i].name +'</label><div>'+userlist[i].jobs +'<br>'+ userlist[i].email +'</div></div></div>';
+                            //useridlist.push(userlist[i].userid);
+                            if(in_array(reductionAudit,userlist[i].userid)){
+                                adduserhtml += '<div class="col-md-3 alert alert-pnone alert-success"><div class="radio" data-uid="'+ userlist[i].userid +'" data-uname="'+ userlist[i].name +'" data-ucompany="'+ userlist[i].company +'" data-ujobs="'+ userlist[i].jobs +'" data-uemail="'+ userlist[i].email +'"><label><input type="radio" value="'+ userlist[i].userid +'" checked>'+ userlist[i].name +'</label><div>'+userlist[i].jobs +'<br>'+ userlist[i].email +'</div></div></div>';
+                            }else{
+                                adduserhtml += '<div class="col-md-3 alert alert-pnone"><div class="radio" data-uid="'+ userlist[i].userid +'" data-uname="'+ userlist[i].name +'" data-ucompany="'+ userlist[i].company +'" data-ujobs="'+ userlist[i].jobs +'" data-uemail="'+ userlist[i].email +'"><label><input type="radio" value="'+ userlist[i].userid +'">'+ userlist[i].name +'</label><div>'+userlist[i].jobs +'<br>'+ userlist[i].email +'</div></div></div>';
+                            }
                         }
                         $('#useridlist').val(useridlist.join(','));
-                        $('#searchshow').append(adduserhtml);
+                        $('#searchshow').html(adduserhtml);
                     }
                 }
             })
@@ -508,7 +521,7 @@ $(function(){
         if(changeaudit !== reductionaudit){
             //不相同则要还原
             $('#selectauditlist').val('');
-            var $rowdiv = $('#addshenpi').find('.col-md-8').children('.row').children('div');
+            var $rowdiv = $('#addshenpi').find('.modal-body').children('.row').children('div');
             $rowdiv.removeClass('alert-success');
             $rowdiv.find('input').prop('checked',false);
 
@@ -524,7 +537,8 @@ $(function(){
                             var name = $rowdivdiv.attr('data-uname');
                             var company = $rowdivdiv.attr('data-ucompany');
                             var jobs = $rowdivdiv.attr('data-ujobs');
-                            var adduser = uid+'_'+name+'_'+company+'_'+jobs;
+                            var email = $rowdivdiv.attr('data-uemail');
+                            var adduser = uid+'_'+name+'_'+company+'_'+jobs+'_'+email;
                             if($('#selectauditlist').val() != ''){
                                 var auditlist2 = $('#selectauditlist').val().split('->');
                                 auditlist2.push(adduser);
@@ -538,7 +552,7 @@ $(function(){
             }
             $('#reductionAudit').val(changeaudit);
         }
-        approvallist();
+        //approvallist();
         $('#addshenpi').modal('hide');
     });
 
@@ -549,16 +563,19 @@ $(function(){
     //移除审批流程
     $('body').on('click', '.remove-select-audit', function() {
         var reductionlist = $('#reductionAudit').val().split(',');
+        var changeaudit = $('#changeaudit').val().split(',');
         var selectlist = $('#selectauditlist').val().split('->');
         for(var i in reductionlist){
             if(reductionlist[i] == $(this).attr('uid')){
                 reductionlist.splice(i,1);
+                changeaudit.splice(i,1);
                 selectlist.splice(i,1);
             }
         }
         $('#reductionAudit').val(reductionlist.join(','));
+        $('#changeaudit').val(changeaudit.join(','));
         $('#selectauditlist').val(selectlist.join('->'));
-        var $rowdiv = $('#addshenpi').find('.col-md-8').children('.row').children('.alert-success');
+        var $rowdiv = $('#addshenpi').find('.modal-body').children('.row').children('.alert-success');
         for(var j in $rowdiv){
             if($rowdiv.eq(j).children('div').attr('data-uid') == $(this).attr('uid')){
                 $rowdiv.eq(j).removeClass('alert-success');
@@ -566,7 +583,9 @@ $(function(){
                 break;
             }
         }
-        approvallist();
+        $(this).parents('tr').remove();
+
+        //approvallist();
     });
 });
 
@@ -798,17 +817,28 @@ function totalamount(decimal){
     $('.otatalamount').eq(1).text(ototalnum != 0 ? ototalnum : zero);
 }
 
-//显示并更新审批流程
-function approvallist(){
-    $('#selectlist .approval-audit-li').remove();
-    if($('#selectauditlist').val() != ''){
-        var auditlist = $('#selectauditlist').val().split('->');
-        var lihtml = '';
-        for(var i in auditlist){
-            var auditArr = auditlist[i].split('_');
-            var iclass = parseInt(i)+1 == auditlist.length ? ' glyphicon-stop' : ' glyphicon-arrow-down';
-            lihtml += '<li class="list-group-item approval-audit-li"><i class="glyphicon'+ iclass +' text-muted"></i>'+ auditArr[1] +'<a class="fR text-danger remove-select-audit" uid="'+ auditArr[0] +'" title="移除"><i class="glyphicon glyphicon-remove"></i></a></li>';
+//判断元素是否在数组中，相当于php的in_array();
+function in_array(arr, obj) {
+    var i = arr.length;
+    while (i--) {
+        if (arr[i] == obj) {
+            return true;
         }
-        $('#selectlist').append(lihtml);
     }
-}
+    return false;
+}
+
+//显示并更新审批流程
+//function approvallist(){
+//    $('#selectlist .approval-audit-li').remove();
+//    if($('#selectauditlist').val() != ''){
+//        var auditlist = $('#selectauditlist').val().split('->');
+//        var lihtml = '';
+//        for(var i in auditlist){
+//            var auditArr = auditlist[i].split('_');
+//            var iclass = parseInt(i)+1 == auditlist.length ? ' glyphicon-stop' : ' glyphicon-arrow-down';
+//            lihtml += '<li class="list-group-item approval-audit-li"><i class="glyphicon'+ iclass +' text-muted"></i>'+ auditArr[1] +'<a class="fR text-danger remove-select-audit" uid="'+ auditArr[0] +'" title="移除"><i class="glyphicon glyphicon-remove"></i></a></li>';
+//        }
+//        $('#selectlist').append(lihtml);
+//    }
+//}

protected/class/itemmeasurenum.php

@@ -121,8 +121,8 @@ class ItemMeasureNumpofper
     {
         $list = $this->__itemMeasureNum->find(array('where' => 'pmid=?', 'param' => array($pmid), 'asArray' => TRUE));
         if(!empty($list)){
-            include (DOO::conf()->SITE_PATH . 'protected/class/itemfile.php');
-//            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/class/profile.php

@@ -101,7 +101,7 @@ class Profile
 
     public function checkUserName($name)
     {
-        return $this->uprofile->find(array('select' => 'userid,name,company,jobs', 'where' => 'name LIKE "%'.$name.'%"', 'userid' => 'asc', 'asArray' => TRUE));
+        return $this->uprofile->find(array('select' => 'userid,name,company,jobs', 'where' => 'name LIKE "%'.$name.'%" and userid in(select uid from jl_users where isstop=0)', 'userid' => 'asc', 'asArray' => TRUE));
     }
 }
 

protected/controller/ChangeController.php

@@ -926,6 +926,11 @@ class ChangeController extends DooController
                             $changeaudit = new ChangeAudit();
                             //获取最后一次上报的上报人信息
                             $auditArray = $changeaudit->getChangeAuditLastUser($cid,0);
+                            //获取uid最新上报人信息
+                            $userArray = $this->auth->getRowByUid($auditArray['uid']);
+                            $auditArray['company'] = $userArray['company'];
+                            $auditArray['jobs'] = $userArray['jobs'];
+                            $auditArray['name'] = $userArray['name'];
                             //获取最后一个审批人的usort
                             $auditArray2 = $changeaudit->getChangeAuditLastUser($cid);
                             //新建新的提交人，并把time+1
@@ -1392,21 +1397,21 @@ class ChangeController extends DooController
                 $auditlist = $this->change->getChangeAuditsbycidtime($cid,$changeArray['times']);
                 $changeauditList = array();
                 $selectauditlist = array();
-                $searchauditlist = array();
                 foreach($auditlist as $adk => $adv){
+                    $email = $this->auth->getEmail($adv['uid']);
+                    $auditlist[$adk]['email'] = $email;
+                    $auditlist[$adk]['lastusite'] = count($auditlist);
                     array_push($changeauditList,$adv['uid']);
-                    $addauditlist = $adv['uid'].'_'.$adv['name'].'_'.$adv['company'].'_'.$adv['jobs'];
+                    $addauditlist = $adv['uid'].'_'.$adv['name'].'_'.$adv['company'].'_'.$adv['jobs'].'_'.$email;
                     array_push($selectauditlist,$addauditlist);
-                    if(!in_array($adv['uid'],$useridlist)){
-                        $auditlist[$adk]['email'] = $this->auth->getEmail($adv['uid']);
-                        array_push($searchauditlist,$auditlist[$adk]);
-                        array_push($useridlist,$adv['uid']);
-                    }
+//                    if(!in_array($adv['uid'],$useridlist)){
+//                        $auditlist[$adk]['email'] = $this->auth->getEmail($adv['uid']);
+//                        array_push($useridlist,$adv['uid']);
+//                    }
                     $auditlist[$adk]['islast'] = $adk+1 == count($auditlist) ? 1 : 0;
                 }
                 $this->data['changeaudit'] = implode(',',$changeauditList);
                 $this->data['selectauditlist'] = implode('->',$selectauditlist);
-                $this->data['sauditlist'] = $searchauditlist;
                 $this->data['auditlist'] = $auditlist;
 
                 //获取已选清单列表,已选清单id列表,属于签约清单的changelist，和changewhitelist
@@ -1481,6 +1486,12 @@ class ChangeController extends DooController
                 if($changeArray['status'] == 'back'){
                     $creatorArray = $this->change->getChangeAuditLastUser($cid,0);
                     $auditlist2 = $this->change->getChangeAuditsbySort($cid,$creatorArray['times']);
+                    if(!empty($auditlist2)){
+                        foreach($auditlist2 as $ak => $av){
+                            $auditlist2[$ak]['email'] = $this->auth->getEmail($av['uid']);
+                            $auditlist2[$ak]['lastusite'] = $this->change->getChangeAuditsMaxUsite($cid,$av['times'])['maxsite'];
+                        }
+                    }
                     $this->data['auditlist2'] = $auditlist2;
                 }
 
@@ -1561,7 +1572,7 @@ class ChangeController extends DooController
                 echo json_encode(array('code' => 200, 'userlist' => $userlist));
                 exit;
             }else{
-                echo json_encode(array('code' => 400, 'msg' => '列表或常用中已存在当前审批人'));
+                echo json_encode(array('code' => 400, 'msg' => '常用中已存在当前审批人'));
                 exit;
             }
         }else{

protected/model/changeaudit.php

@@ -43,7 +43,6 @@ class ChangeAudit extends DooModel {
         $this->uid = $auditArray['uid'];
         $this->company = $auditArray['company'];
         $this->jobs = $auditArray['jobs'];
-        $this->jobs = $auditArray['jobs'];
         $this->name = $auditArray['name'];
         $this->status = $status;
         $this->insert();

protected/view/biangeng-new.html

@@ -229,12 +229,14 @@
 						<div class="bg-con-warp">
 							<legend id="shenpi"><span class="glyphicon glyphicon-check"></span> 审批流程&nbsp;&nbsp;<a href="#addshenpi" class="btn btn-primary btn-xs" data-toggle="modal"><span class="glyphicon glyphicon-plus"></span> 添加审批人</a></legend>
 							<table class="table table-bordered">
+								<thead>
 								<tr>
 									<td width="100"><i class="glyphicon glyphicon-download text-muted"></i> 提交</td>
 									<td width="150"><h4 class="media-heading">{{userArray.name}}</h4>{{userArray.jobs}}</td>
 									<td width="200">{{userArray.email}}<br>{{userArray.company}}</td>
 									<td></td>
 								</tr>
+								</thead>
 								<tbody id="usertableshow">
 
 								</tbody>
@@ -368,39 +370,29 @@
 				<h4 class="modal-title">添加审批人</h4>
 			</div>
 			<div class="modal-body">
-				<div class="row">
-					<div class="col-md-8">
-						<input type="hidden" id="useridlist" value="{{useridlist}}">
-						<div class="input-group">
-							<input type="text" class="form-control" id="searchname" placeholder="请输入审批人名称">
+				<input type="hidden" id="useridlist" value="{{useridlist}}">
+				<div class="input-group">
+					<input type="text" class="form-control" id="searchname" placeholder="请输入审批人名称">
 						  <span class="input-group-btn">
 						    <button class="btn btn-default" id="searchbtn" type="button"><span class="glyphicon glyphicon-search"></span></button>
 						  </span>
-						</div>
-						<div class="row" id="searchshow" style="margin-top:25px;">
-						</div>
-						<h5>常用审批人</h5>
-						<div class="row">
-							<!-- loop userlist -->
-							<div class="col-md-3 alert alert-pnone">
-								<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}">
-									<label>
-										<input type="radio" value="{{userlist' value.userid}}">{{userlist' value.name}}
-									</label>
-									<div>
-										{{userlist' value.jobs}}<br>{{userlist' value.email}}
-									</div>
-								</div>
+				</div>
+				<div class="row" id="searchshow" style="margin-top:25px;">
+				</div>
+				<h5>常用审批人</h5>
+				<div class="row">
+					<!-- loop userlist -->
+					<div class="col-md-3 alert alert-pnone">
+						<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}" data-uemail="{{userlist' value.email}}">
+							<label>
+								<input type="radio" value="{{userlist' value.userid}}">{{userlist' value.name}}
+							</label>
+							<div>
+								{{userlist' value.jobs}}<br>{{userlist' value.email}}
 							</div>
-							<!-- endloop -->
 						</div>
 					</div>
-					<div class="col-md-4">
-						<h5>审批流程</h5>
-						<ul class="list-group" id="selectlist">
-							<li class="list-group-item"><i class="glyphicon glyphicon-download text-muted"></i> {{userArray.name}}（提交人）</li>
-						</ul>
-					</div>
+					<!-- endloop -->
 				</div>
 			</div>
 			<div class="modal-footer">
@@ -508,6 +500,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.js"></script>
-<script src="{{rootUrl}}global/js/jlzf-change-new.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-pnumset.min.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-new.min.js"></script>
 </body>

protected/view/biangeng-update.html

@@ -263,12 +263,35 @@
 						<div class="bg-con-warp">
 							<legend id="shenpi"><span class="glyphicon glyphicon-check"></span> 审批流程&nbsp;&nbsp;<a href="#addshenpi" class="btn btn-primary btn-xs" data-toggle="modal"><span class="glyphicon glyphicon-plus"></span> 添加审批人</a></legend>
 							<table class="table table-bordered">
-								<!-- if {{changeArray.status}} == 'back' -->
+								<thead>
+								<tr>
+									<td width="100"><i class="glyphicon glyphicon-download text-muted"></i> 提交</td>
+									<td width="150"><h4 class="media-heading">{{userArray.name}}</h4>{{userArray.jobs}}</td>
+									<td width="200">{{userArray.email}}<br>{{userArray.company}}</td>
+									<td></td>
+								</tr>
+								</thead>
+								<tbody id="usertableshow">
+								<!-- loop auditlist -->
+								<tr>
+									<td width="100"><!-- if {{auditlist' value.usite}} == 0 --><i class="glyphicon glyphicon-download text-muted"></i> 提交<!-- else --><!-- if {{auditlist' value.usite}} != {{auditlist' value.lastusite}} --><i class="glyphicon glyphicon-arrow-down text-muted"></i> 审批<!-- else --><i class="glyphicon glyphicon-stop text-muted"></i> 终审<!-- endif --><!-- endif --></td>
+									<td width="150"><h4 class="media-heading">{{auditlist' value.name}}</h4>
+										{{auditlist' value.jobs}} </td>
+									<td width="200">{{auditlist' value.email}}<br>{{auditlist' value.company}}</td>
+									<td width=""><a href="javascript:void(0);" class="btn btn-default btn-sm remove-select-audit" uid="{{auditlist' value.uid}}" title="移除审批人"><span class="glyphicon glyphicon-remove text-danger"></span></a></td>
+								</tr>
+								<!-- endloop -->
+								</tbody>
+							</table>
+
+							<!-- if {{changeArray.status}} == 'back' -->
+							<table class="table table-bordered">
 								<!-- loop auditlist2 -->
 								<tr>
-									<td width="100"><!-- if {{auditlist2' value.usite}} == 0 -->提交人<!-- else -->{{auditlist2' value.usite}} 审<!-- endif --></td>
-									<td width="250"><h4 class="media-heading">{{auditlist2' value.jobs}} {{auditlist2' value.name}}</h4>
-										{{auditlist' value.company}}</td>
+									<td width="100"><!-- if {{auditlist2' value.usite}} == 0 --><i class="glyphicon glyphicon-download text-muted"></i> 提交<!-- else --><!-- if {{auditlist2' value.usite}} != {{auditlist2' value.lastusite}} --><i class="glyphicon glyphicon-arrow-down text-muted"></i> 审批<!-- else --><i class="glyphicon glyphicon-stop text-muted"></i> 终审<!-- endif --><!-- endif --></td>
+									<td width="150"><h4 class="media-heading">{{auditlist2' value.name}}</h4>
+										{{auditlist2' value.jobs}} </td>
+									<td width="200">{{auditlist2' value.email}}<br>{{auditlist2' value.company}}</td>
 									<!-- if {{auditlist2' value.usite}} == 0 -->
 									<!-- if {{auditlist2' value.status}} == 'checked' --><td width="100" class="colGreen">上报完成</td><td>{{formatDate(auditlist2' value.sintime)}}<br></td>
 									<!-- elseif {{auditlist2' value.times}} == 0  && {{auditlist2' value.status}} == 'checking' --><td width="100" class="colOrange">上报中</td><td><br></td>
@@ -284,25 +307,8 @@
 									<!-- endif -->
 								</tr>
 								<!-- endloop -->
-								<!-- endif -->
-								<tr>
-									<td width="100">提交人</td>
-									<td width="250"><h4 class="media-heading">{{userArray.jobs}} {{userArray.name}}</h4>
-										{{userArray.company}}</td>
-									<!-- if {{changeArray.status}} == 'back' --><td width="100" class="colOrange">重新上报中</td><!-- else --><td width="100"></td><!-- endif -->
-									<td></td>
-								</tr>
-								<tbody id="usertableshow">
-								<!-- loop auditlist -->
-								<tr>
-									<td width="100">{{auditlist' value.usite}} 审</td>
-									<td width="250"><h4 class="media-heading">{{auditlist' value.jobs}} {{auditlist' value.name}}</h4>
-										{{auditlist' value.company}}</td>
-									<td width="100"></td><td></td>
-								</tr>
-								<!-- endloop -->
-								</tbody>
 							</table>
+							<!-- endif -->
 						</div>
 					</div>
 				</div>
@@ -445,69 +451,42 @@
 				<h4 class="modal-title">添加审批人</h4>
 			</div>
 			<div class="modal-body">
-				<div class="row">
-					<div class="col-md-8">
-						<input type="hidden" id="useridlist" value="{{useridlist}}">
-						<div class="input-group">
-							<input type="text" class="form-control" id="searchname" placeholder="请输入审批人名称">
+				<input type="hidden" id="useridlist" value="{{useridlist}}">
+				<div class="input-group">
+					<input type="text" class="form-control" id="searchname" placeholder="请输入审批人名称">
 						  <span class="input-group-btn">
 						    <button class="btn btn-default" id="searchbtn" type="button"><span class="glyphicon glyphicon-search"></span></button>
 						  </span>
-						</div>
-						<div class="row" id="searchshow" style="margin-top:25px;">
-							<!-- if !empty({{sauditlist}}) -->
-							<!-- loop sauditlist -->
-							<div class="col-md-3 alert alert-pnone alert-success">
-								<div class="radio" data-uid="{{sauditlist' value.uid}}" data-uname="{{sauditlist' value.name}}" data-ucompany="{{sauditlist' value.company}}" data-ujobs="{{sauditlist' value.jobs}}">
-									<label>
-										<input type="radio" value="{{sauditlist' value.uid}}" checked>{{sauditlist' value.name}}
-									</label>
-									<div>
-										{{sauditlist' value.jobs}}<br>{{sauditlist' value.email}}
-									</div>
-								</div>
+				</div>
+				<div class="row" id="searchshow" style="margin-top:25px;">
+				</div>
+				<h5>常用审批人</h5>
+				<div class="row">
+					<!-- loop userlist -->
+					<!-- if in_phparray({{userlist' value.userid}},{{changeaudit}}) -->
+					<div class="col-md-3 alert alert-pnone alert-success">
+						<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}" data-uemail="{{userlist' value.email}}">
+							<label>
+								<input type="radio" value="{{userlist' value.userid}}" checked>{{userlist' value.name}}
+							</label>
+							<div>
+								{{userlist' value.jobs}}<br>{{userlist' value.email}}
 							</div>
-							<!-- endloop -->
-							<!-- endif -->
 						</div>
-						<h5>常用审批人</h5>
-						<div class="row">
-							<!-- loop userlist -->
-							<!-- if in_phparray({{userlist' value.userid}},{{changeaudit}}) -->
-							<div class="col-md-3 alert alert-pnone alert-success">
-								<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}">
-									<label>
-										<input type="radio" value="{{userlist' value.userid}}" checked>{{userlist' value.name}}
-									</label>
-									<div>
-										{{userlist' value.jobs}}<br>{{userlist' value.email}}
-									</div>
-								</div>
-							</div>
-							<!-- else -->
-							<div class="col-md-3 alert alert-pnone">
-								<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}">
-									<label>
-										<input type="radio" value="{{userlist' value.userid}}">{{userlist' value.name}}
-									</label>
-									<div>
-										{{userlist' value.jobs}}<br>{{userlist' value.email}}
-									</div>
-								</div>
+					</div>
+					<!-- else -->
+					<div class="col-md-3 alert alert-pnone">
+						<div class="radio" data-uid="{{userlist' value.userid}}" data-uname="{{userlist' value.name}}" data-ucompany="{{userlist' value.company}}" data-ujobs="{{userlist' value.jobs}}" data-uemail="{{userlist' value.email}}">
+							<label>
+								<input type="radio" value="{{userlist' value.userid}}">{{userlist' value.name}}
+							</label>
+							<div>
+								{{userlist' value.jobs}}<br>{{userlist' value.email}}
 							</div>
-							<!-- endif -->
-							<!-- endloop -->
 						</div>
 					</div>
-					<div class="col-md-4">
-						<h5>审批流程</h5>
-						<ul class="list-group" id="selectlist">
-							<li class="list-group-item"><i class="glyphicon glyphicon-download text-muted"></i> {{userArray.name}}（提交人）</li>
-							<!-- loop auditlist -->
-							<li class="list-group-item approval-audit-li"><i class="glyphicon <!-- if {{auditlist' value.islast}} == 1 -->glyphicon-stop<!-- else -->glyphicon-arrow-down<!-- endif --> text-muted"></i> {{auditlist' value.name}}<a class="fR text-danger remove-select-audit" uid="{{auditlist' value.uid}}" title="移除"><i class="glyphicon glyphicon-remove"></i></a></li>
-							<!-- endloop -->
-						</ul>
-					</div>
+					<!-- endif -->
+					<!-- endloop -->
 				</div>
 			</div>
 			<div class="modal-footer">
@@ -637,6 +616,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.js"></script>
-<script src="{{rootUrl}}global/js/jlzf-change-update.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-pnumset.min.js"></script>
+<script src="{{rootUrl}}global/js/jlzf-change-update.min.js"></script>
 </body>