2.1.5版本提交

global/css/style.css

@@ -1156,7 +1156,7 @@ left:5px
   text-align: right;
   position: absolute;
   right:0;
-  top:0;
+  top:-24px;
   /*display:none;*/
 }
 /*.user-sign:hover .img-bar{*/

global/js/jlzf-change-pnumset.js

@@ -719,8 +719,8 @@ function decimalnumsetmodal(costdnum,numbernum,status){
 //更新并获取 changewhitelist
 function updateandgetwhitelist(newid,$thisstr){
     var adtrlist = new Array(6);
-    adtrlist[0] = $thisstr.children('td').eq(0).children('input').val();
-    adtrlist[1] = $thisstr.children('td').eq(1).children('input').val();
+    adtrlist[0] = $.trim($thisstr.children('td').eq(0).children('input').val());
+    adtrlist[1] = $.trim($thisstr.children('td').eq(1).children('input').val());
     adtrlist[2] = $thisstr.children('td').eq(2).children('select').val();
     adtrlist[3] = $thisstr.children('td').eq(3).children('input').val();
     adtrlist[4] = $thisstr.children('td').eq(4).children('input').val();
@@ -729,6 +729,7 @@ function updateandgetwhitelist(newid,$thisstr){
     //添加到form中
     if($('#changewhitelist').val() != ''){
         var wlist = $('#changewhitelist').val().split(',');
+        var repeatList = $('#changeRepeatWhiteList').val().split(',');
         var exist = 0;
         $.each(wlist,function(k,v){
             var wlistid = v.split('->')[0];
@@ -743,18 +744,23 @@ function updateandgetwhitelist(newid,$thisstr){
                 });
                 if(empty){
                     wlist.splice(k,1,newid+'->'+adtrliststr);
+                    repeatList.splice(k,1,adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
                 }else{
                     wlist.splice(k,1);
+                    repeatList.splice(k,1);
                 }
                 return false;
             }
         });
         if(exist == 0){
             wlist.push(newid+'->'+adtrliststr);
+            repeatList.push(adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
         }
         $('#changewhitelist').val(wlist.join(','));
+        $('#changeRepeatWhiteList').val(repeatList.join(','));
     }else{
         $('#changewhitelist').val(newid+'->'+adtrliststr);
+        $('#changeRepeatWhiteList').val(adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
     }
     return adtrliststr;
 }
@@ -771,35 +777,43 @@ function updatelist(id,cnum,$thisstr){
     //添加到form中list
     if($('#changelist').val() != ''){
         var clist = $('#changelist').val().split(',');
+        var repeatList = $('#changeRepeatList').val().split(',');
         var exist = 0;
         $.each(clist,function(k,v){
             var clistid = v.split('->')[0];
             if(clistid == id){
                 exist = 1;
                 clist.splice(k,1,id+'->'+adtrliststr);
+                repeatList.splice(k,1,adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
                 return false;
             }
         });
         if(exist == 0){
             clist.push(id+'->'+adtrliststr);
+            repeatList.push(adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
         }
         $('#changelist').val(clist.join(','));
+        $('#changeRepeatList').val(repeatList.join(','));
     }else{
         $('#changelist').val(id+'->'+adtrliststr);
+        $('#changeRepeatList').val(adtrlist[0]+'|'+adtrlist[1]+'|'+adtrlist[2]+'|'+parseFloat(adtrlist[3]));
     }
 }
 //移除 changelist 元素
 function removelist(id){
     //清除form中list
     var clist = $('#changelist').val().split(',');
+    var repeatList = $('#changeRepeatList').val().split(',');
     $.each(clist,function(k,v){
         var clistid = v.split('->')[0];
         if(clistid == id){
             clist.splice(k,1);
+            repeatList.splice(k,1);
             return false;
         }
     });
     $('#changelist').val(clist.join(','));
+    $('#changeRepeatList').val(repeatList.join(','));
 }
 
 //统计合计金额

protected/config/ver.conf.php

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

protected/controller/ChangeController.php

@@ -1422,6 +1422,8 @@ class ChangeController extends DooController
                 $changeidlist = array();
                 $changelist = array();
                 $changewhitelist = array();
+                $changeRepeatList = array();
+                $changeRepeatWhiteList = array();
                 if(!empty($clist)){
                     $addnum = 1;
                     foreach($clist as $ck => $cv){
@@ -1436,12 +1438,14 @@ class ChangeController extends DooController
                             array_push($changeidlist,$cv['lid']);
                             array_push($changelist,$cv['lid'].'->'.$cv['lnum'].';'.$cv['lname'].';'.$cv['unit'].';'.$cv['unitprice'].';'.$cv['oamount'].';'.$cv['camount']);
                             $clist[$ck]['iswhite'] = 0;
+                            array_push($changeRepeatList, $cv['lnum'].'|'.$cv['lname'].'|'.$cv['unit'].'|'.$cv['unitprice']);
                         }else{
                             $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;
+                            array_push($changeRepeatWhiteList, $cv['lnum'].'|'.$cv['lname'].'|'.$cv['unit'].'|'.$cv['unitprice']);
                         }
                         $clist[$ck]['osum'] = $osum;
                         $ototalnum += $osum;
@@ -1454,6 +1458,9 @@ class ChangeController extends DooController
                 $this->data['ctotalnum'] = todecimal($ctotalnum,$decimalnum['costdnum']);
                 $this->data['clist'] = $clist;
 
+                $this->data['changeRepeatList'] = implode(',',$changeRepeatList);
+                $this->data['changeRepeatWhiteList'] = implode(',',$changeRepeatWhiteList);
+
                 //获取已添加的附件列表
                 $attlist = $this->change->getChangeAttListbycid($cid);
                 $showattlist = array();

protected/controller/ClientController.php

@@ -988,7 +988,7 @@ class ClientController extends DooController
     function creatTenderNumPnameUser()
     {
         if (isset($_POST['tenderid']) && isset($_POST['phaseno']) && ($_POST['phaseno'] > 1)) {
-            $allMeasureUser = $this->measureauditact->getUserAudit($_POST['tenderid'], $_POST['phaseno'] - 1);
+            $allMeasureUser = $this->measureauditact->getUserAuditLast($_POST['tenderid'], $_POST['phaseno'] - 1);
             if (isset($allMeasureUser)) {
                 foreach ($allMeasureUser as $key => $value) {
 //		    if ($key == 1) {
@@ -1264,10 +1264,11 @@ class ClientController extends DooController
                 $memoStr = iconv('GBK', 'UTF-8', $_POST['Memo']);
                 $pathinfo_dirname = pathinfo($fileArray['filepath'], PATHINFO_DIRNAME);
                 $filenameStr2 = iconv('GBK', 'UTF-8', $fileArray['filename']);
-                $url = $pathinfo_dirname . '/' . $filenameStr2;
-                setlocale(LC_ALL, 'zh_CN.UTF-8');
-                $fname = pathinfo($url);
-                $filenameStr = $fname['filename'];
+//                $url = $pathinfo_dirname . '/' . $filenameStr2;
+//                setlocale(LC_ALL, 'zh_CN.UTF-8');
+//                $fname = pathinfo($url);
+//                $filenameStr = $fname['filename'];
+                $filenameStr = str_replace(strrchr($filenameStr2, "."),"",$filenameStr2);
                 $postArray = array('ownerid' => $this->params['uid'], 'pid' => $pidArray['pid'], 'pmid' => $this->params['tenderid'], 'filename' => $filenameStr, 'filesize' => $fileArray['filesize'], 'fileext' => $fileArray['fileext'], 'filepath' => $fileArray['filepath']);
                 $iaid = $this->itemfile->insertItemFileRecord($postArray);
                 if ($iaid > 1) {

protected/controller/RProjectController.php

@@ -937,7 +937,10 @@ class RProjectController extends DooController
         $orginArray['avatar'] = '<img src="' . $strAvatar . '"></li>';
         $orginArray['name'] = $this->profile->getProWithUid($measureArray['uid'])['name'];
 
-        $attfileArray = $this->attfile->getFirstFile($lastRowArray['pmid'], $lastRowArray['numpname'], $lastRowArray['times']);
+        // 获取原报时间
+        // 利用mpid和uid获取原报人当前期数下上传的第一份文件时间，即为原报时间
+//        $attfileArray = $this->attfile->getFirstFile($lastRowArray['pmid'], $lastRowArray['numpname'], $lastRowArray['times']);
+        $attfileArray = $this->attfile->getFirstFile($lastRowArray['pmid'], $maxtimez['numpname'], $maxtimez['times']);
 
         $orginArray['time'] = date('Y-m-d', $attfileArray['intime']);
         $this->data['auditArray'] = $auditUserArray;

protected/view/biangeng-new.html

@@ -251,6 +251,10 @@
 				<input type="hidden" name="changeatt" id="changeatt" value="">
 				<input type="hidden" name="changeaudit" id="changeaudit" value="">
 				<input type="hidden" name="changedecimalnum" id="changedecimalnum" value="{{pmArray.cdecimalnum}}">
+
+				<!--查重的清单-->
+				<input type="hidden" id="changeRepeatList" value="">
+				<input type="hidden" id="changeRepeatWhiteList" value="">
 			</form>
 		</div>
 		<!--内容-->

protected/view/biangeng-update.html

@@ -319,6 +319,10 @@
 				<input type="hidden" name="changeatt" id="changeatt" value="">
 				<input type="hidden" name="changeaudit" id="changeaudit" value="{{changeaudit}}">
 				<input type="hidden" name="changedecimalnum" id="changedecimalnum" value="{{changeArray.decimalnum}}">
+
+				<!--查重的清单-->
+				<input type="hidden" id="changeRepeatList" value="{{changeRepeatList}}">
+				<input type="hidden" id="changeRepeatWhiteList" value="{{changeRepeatWhiteList}}">
 			</form>
 		</div>
 		<!--内容-->

protected/view/r-project-section-files-recover.html

@@ -109,7 +109,7 @@
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
                                     id="fname_{{itemMeasureArray' value.imnid}}"
-                                    href="#">{{itemMeasureArray' value.filename}}</a></td>
+                                    href="#">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>

protected/view/r-project-section-files.html

@@ -129,7 +129,7 @@
                                     tips="{{itemMeasureArray' value.tips}}"
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
-                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}</a></td>
+                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>

protected/view/s-project-section-files-recover.html

@@ -104,7 +104,7 @@
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
                                     id="fname_{{itemMeasureArray' value.imnid}}"
-                                    href="#">{{itemMeasureArray' value.filename}}</a></td>
+                                    href="#">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>

protected/view/s-project-section-files.html

@@ -124,7 +124,7 @@
                                     tips="{{itemMeasureArray' value.tips}}"
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
-                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}</a></td>
+                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>

protected/view/sign-index.html

@@ -21,8 +21,8 @@
         <div class="mainContent">
             <div class="sign-index">
                 <div class="sign-menu clearfix">
-                    <div class="item"><h1>需要我签署</h1><a href="/sign/needlist"><!-- if !empty({{needSignNum}}) -->{{needSignNum}}<!-- else -->0<!-- endif --></a></div>
-                    <div class="item"><h1>我发起的签署</h1><a href="/sign/mylist">{{mySignNum}}</a></div>
+                    <div class="item"><h1>需要签署</h1><a href="/sign/needlist"><!-- if !empty({{needSignNum}}) -->{{needSignNum}}<!-- else -->0<!-- endif --></a></div>
+                    <div class="item"><h1>由我发起</h1><a href="/sign/mylist">{{mySignNum}}</a></div>
                     <div class="item"><h1>正在签署</h1><a href="/sign/onlist">{{doingSignNum}}</a></div>
                     <div class="item"><h1>签署完成</h1><a href="/sign/donelist">{{doneSignNum}}</a></div>
                 </div>

protected/view/sign-view-signer_sign.html

@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
     <link rel="stylesheet" href="{{rootUrl}}global/css/jquery-ui.min.css">
-    <link rel=stylesheet href={{rootUrl}}global/css/style.css?201709061>
+    <link rel=stylesheet href={{rootUrl}}global/css/style.css>
     <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>
     <script src={{rootUrl}}global/js/bootstrap.js></script>
     <script src={{rootUrl}}global/js/jl.js></script>
@@ -75,7 +75,7 @@
                             </div>
                             <!-- endloop -->
                             <!-- endif -->
-                            <div class="user-sign draggable" data-num="{{attlist' value.sid}}_{{attlist' value.said}}" style="position: absolute;top: 10%;left: 10%;z-index: 999;width: 300px;height: 150px;">
+                            <div class="user-sign draggable" data-num="{{attlist' value.sid}}_{{attlist' value.said}}" style="position: absolute;top: 95%;left: 10%;z-index: 999;width: 88px;height: 44px;">
                                 <div class="img-bar">
                                     <a href="javascript:void(0);" onclick="setallqm({{attlist' value.curnum}})" title="批量签名" class="allqm" style="display: none"><span data-icon="v" aria-hidden="true" ></span></a>
                                     <a href="javascript:void(0);" onclick="setqm({{attlist' value.curnum}});" title="确定签署" class="sign_confirm"><span data-icon="T" aria-hidden="true" class="colGreen"></span></a>
@@ -201,7 +201,7 @@
             return false;
         }
         $("#pageContainer"+curpage+" .draggable").show();
-        $("#pageContainer"+curpage+" .draggable").css({'width':"300px","height":"150px","left":"10%","top":"10%","position":"absolute"});
+        $("#pageContainer"+curpage+" .draggable").css({'width':"88px","height":"44px","left":"10%","top":"95%","position":"absolute"});
         $( "#pageContainer"+curpage+" .draggable" ).draggable( "option", "cancel", "" );
         $( "#pageContainer"+curpage+" .draggable" ).resizable("option", "cancel", "");
         $( "#pageContainer"+curpage).find(".sign_confirm").show();

protected/view/w-project-section-files-recover.html

@@ -105,7 +105,7 @@
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
                                     id="fname_{{itemMeasureArray' value.imnid}}"
-                                    href="#">{{itemMeasureArray' value.filename}}</a></td>
+                                    href="#">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>

protected/view/w-project-section-files.html

@@ -125,7 +125,7 @@
                                     tips="{{itemMeasureArray' value.tips}}"
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
-                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}</a></td>
+                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}.{{itemMeasureArray' value.fileext}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
                             <td width="">{{itemMeasureArray' value.realname}}</td>
@@ -468,6 +468,11 @@
                 window.location.href = nowurl;
             }
         });
+
+        $("a[id^='down_']").click(function () {
+            var iaid = $(this).attr('iaid');
+            window.location.href = "{{rootUrl}}project/section/get/" + iaid + "/attachment";
+        });
     });
 </script>
 </body>

protected/view/w-project-section.html

@@ -51,7 +51,7 @@
 	<div id="addsection" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
-				<form class="form-horizontal" method="post" name="tenderform">
+				<form class="form-horizontal" method="post" name="tenderform" onsubmit="return checkform();">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 						<h4 class="modal-title">添加标段类型</h4>
@@ -133,7 +133,7 @@
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 					<h4 class="modal-title">标段类型设置</h4>
 				</div>
-				<form class="form-horizontal" method="post">
+				<form class="form-horizontal" method="post" onsubmit="return checkform2();">
 					<div class="modal-body">
 						<input id="stid" name="stid" type="hidden" value="0" />
 						<div class="form">
@@ -214,5 +214,27 @@
 			$("#delstid").val(stid);
 		});
 	})
+
+	function checkform() {
+		if ($('#secname').val() == '') {
+			alert('请输入标段类型名称');
+			return false;
+		}
+		if ($('#secname').val().length > 100) {
+			alert('标段类型名称过长了~');
+			return false;
+		}
+	}
+
+	function checkform2() {
+		if ($('#proname').val() == '') {
+			alert('请输入标段类型名称');
+			return false;
+		}
+		if ($('#proname').val().length > 100) {
+			alert('标段类型名称过长了~');
+			return false;
+		}
+	}
     </script>
 </body>

protected/view/w-project.html

@@ -63,7 +63,7 @@
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 					<h4 class="modal-title">添加项目</h4>
 				</div>
-				<form class="form-horizontal" method="post" name="proform">
+				<form class="form-horizontal" method="post" name="proform" onsubmit="return checkform();">
 					<div class="modal-body">
 						<div class="form">
 							<div class="form-group">
@@ -88,7 +88,7 @@
     <div id="editpoj" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
-				<form class="form-horizontal" method="post">
+				<form class="form-horizontal" method="post" onsubmit="return checkform2();">
 					<input type="hidden" id="ppid" name="ppid" value="0" />
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@@ -368,5 +368,28 @@
 			}
 		});
 	}
+
+
+		function checkform() {
+			if ($('#pname').val() == '') {
+				alert('请输入项目名称');
+				return false;
+			}
+			if ($('#pname').val().length > 100) {
+				alert('项目名称过长了~');
+				return false;
+			}
+		}
+
+		function checkform2() {
+			if ($('#target_pname').val() == '') {
+				alert('请输入项目名称');
+				return false;
+			}
+			if ($('#target_pname').val().length > 100) {
+				alert('项目名称过长了~');
+				return false;
+			}
+		}
     </script>
 </body>