变基master 到 develop

protected/config/routes.conf.php

@@ -39,6 +39,7 @@ $route['*']['/rproject/:pid/section/:pmid/detail'] = array('RProjectController',
 $route['*']['/rproject/:pmid/measure/detail'] = array('RProjectController', 'proMeasure');
 $route['*']['/rproject/:pid/section/:pmid/report/:mpid'] = array('RProjectController', 'proReport');
 $route['*']['/rproject/:pid/section/:pmid/files'] = array('RProjectController', 'proSectionFiles');
+
 $route['*']['/rproject/:pid/section/:pmid/files/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/recover'] = array('RProjectController', 'proSectionFilesRecover');
 $route['*']['/rproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('RProjectController', 'proSectionFilesRecover');
@@ -61,6 +62,7 @@ $route['get']['/sproject/:pid/section'] = array('SProjectController', 'proSectio
 $route['get']['/sproject/:pid/section/:pmid/detail'] = array('SProjectController', 'proDetail');
 $route['get']['/sproject/:pid/section/measure'] = array('SProjectController', 'proMeasure');
 $route['*']['/sproject/:pid/section/:pmid/files'] = array('SProjectController', 'proSectionFiles');
+
 $route['*']['/sproject/:pid/section/:pmid/files/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/recover'] = array('SProjectController', 'proSectionFilesRecover');
 $route['*']['/sproject/section/get/:iaid/attachment'] = array('SProjectController', 'proSectionGetFiles');

protected/controller/SProjectController.php

@@ -428,7 +428,6 @@ class SProjectController extends DooController
             $this->data['itemMeasureArray'][$k]['fileext'] = $fileArray['fileext'];
             $this->data['itemMeasureArray'][$k]['tips'] = $v['tips'];
         }
-
         $this->data['pid'] = $this->params['pid'];
         $this->data['pmid'] = $this->params['pmid'];
         $this->data['mpid'] = $this->params['mpid'];
@@ -596,7 +595,6 @@ class SProjectController extends DooController
         return strtolower(trim(substr(strrchr($filename, '.'), 1, 10)));
     }
 
-
 }
 
 ?>

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

@@ -34,7 +34,12 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
+<<<<<<< HEAD
                             <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+=======
+                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray'
+                                value.stname}}</a></li>
+>>>>>>> 短信类型增加
                             <!-- endloop -->
                         </ul>
                     </li>
@@ -46,7 +51,12 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
+<<<<<<< HEAD
                                 <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+=======
+                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray'
+                                    value.pmname}}</a></li>
+>>>>>>> 短信类型增加
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -57,6 +67,7 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
+<<<<<<< HEAD
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
@@ -65,6 +76,12 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
                 </li>
                 <!-- endif -->
+=======
+                    <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+                </li>
+                <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
+>>>>>>> 短信类型增加
             </ul>
             <!--导航-->
 
@@ -79,7 +96,11 @@
                         <tr>
                             <th width="">文件名</th>
                             <th width="">期</th>
+<<<<<<< HEAD
                             <!--<th width="">节点</th>-->
+=======
+                            <th width="">节点</th>
+>>>>>>> 短信类型增加
                             <th width="">上传者</th>
                             <th width="">上传时间</th>
                             <th width="">删除</th>
@@ -92,8 +113,13 @@
                             <!-- loop itemMeasureArray -->
                             <td width=""><span class="fileico ico-jpg"></span><a
                                     fileext="{{itemMeasureArray' value.fileext}}"
+<<<<<<< HEAD
                                     imnid="{{itemMeasureArray' value.imnid}}"
                                     iaid="{{itemMeasureArray' value.iaid}}"
+=======
+                                    imnid="{{itematta' value.imnid}}"
+                                    iaid="{{itematta' value.iaid}}"
+>>>>>>> 短信类型增加
                                     filename="{{itemMeasureArray' value.filename}}"
                                     realname="{{itemMeasureArray' value.realname}}"
                                     intime="{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}"
@@ -103,7 +129,11 @@
                                     id="fname_{{itemMeasureArray' value.imnid}}"
                                     href="#">{{itemMeasureArray' value.filename}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
+<<<<<<< HEAD
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
+=======
+                            <td>{{itemMeasureArray' value.pmname}}</td>
+>>>>>>> 短信类型增加
                             <td width="">{{itemMeasureArray' value.realname}}</td>
                             <td width="">{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}</td>
                             <td class="text-error">{{itemMeasureArray' value.delname}}</td>
@@ -114,8 +144,13 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
+<<<<<<< HEAD
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a id="down_{{itemMeasureArray' value.imnid}}" iaid="{{itemMeasureArray' value.iaid}}"><i
+=======
+                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                                        <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
+>>>>>>> 短信类型增加
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"
                                                imnid="{{itemMeasureArray' value.imnid}}" href="#"
@@ -157,7 +192,11 @@
                             <th width="60">格式</th>
                             <td id="fileico"><span class="fileico ico-jpg"></span>.jpg</td>
                             <th width="60">所在期</th>
+<<<<<<< HEAD
                             <td id="numpname2">第二期</td>
+=======
+                            <td id="numpname">第二期</td>
+>>>>>>> 短信类型增加
                         </tr>
                         <tr>
                             <th width="60">上传者</th>
@@ -251,7 +290,11 @@
             $("#realname").html(realname);
             $("#intime").html(intime);
             $("#tips").html(tips);
+<<<<<<< HEAD
             $("#numpname2").html(numpname);
+=======
+            $("#numpname").html(numpname);
+>>>>>>> 短信类型增加
             $("#imnid").val(imnid);
             $(".filesDetail").show();
         });
@@ -269,11 +312,19 @@
                 cache: false,
                 contentType: false,
                 data: form_data,
+<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files",
                 processData: false,
                 success: function (data) {
                     if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files";
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files",
+                processData: false,
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files";
+>>>>>>> 短信类型增加
                     }
                 }
             });
@@ -286,11 +337,19 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'reconvery'},
+<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
                         $("#file-replace").show();
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files/recover";
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        $("#file-replace").show();
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
+>>>>>>> 短信类型增加
                     }
                 }
             });
@@ -303,6 +362,7 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'del'},
+<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
@@ -312,15 +372,29 @@
                     if (data['status'] == 2) {
                         $("#file-del2").modal('show');
                         $("#file-del").modal('hide');
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        $("#file-del").hide();
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
+                    }
+                    if (data['status'] == 2) {
+                        $("#file-del2").show();
+                        $("#file-del").hide();
+>>>>>>> 短信类型增加
                     }
                 }
             });
         });
+<<<<<<< HEAD
 
         $("a[id^='down_']").click(function () {
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}rproject/section/get/" + iaid + "/attachment";
         });
+=======
+>>>>>>> 短信类型增加
     });
 </script>
 </body>

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

@@ -34,7 +34,12 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
+<<<<<<< HEAD
                             <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+=======
+                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray'
+                                value.stname}}</a></li>
+>>>>>>> 短信类型增加
                             <!-- endloop -->
                         </ul>
                     </li>
@@ -46,7 +51,12 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
+<<<<<<< HEAD
                                 <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+=======
+                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray'
+                                    value.pmname}}</a></li>
+>>>>>>> 短信类型增加
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -57,9 +67,16 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
+<<<<<<< HEAD
                     <a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+=======
+                    <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+                </li>
+                <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
+>>>>>>> 短信类型增加
             </ul>
             <!--导航-->
 
@@ -74,7 +91,11 @@
                         <tr>
                             <th width="">文件名</th>
                             <th width="">期</th>
+<<<<<<< HEAD
                             <!--<th width="">节点</th>-->
+=======
+                            <th width="">节点</th>
+>>>>>>> 短信类型增加
                             <th width="">上传者</th>
                             <th width="">上传时间</th>
                             <th width="">删除</th>
@@ -87,8 +108,13 @@
                             <!-- loop itemMeasureArray -->
                             <td width=""><span class="fileico ico-jpg"></span><a
                                     fileext="{{itemMeasureArray' value.fileext}}"
+<<<<<<< HEAD
                                     imnid="{{itemMeasureArray' value.imnid}}"
                                     iaid="{{itemMeasureArray' value.iaid}}"
+=======
+                                    imnid="{{itematta' value.imnid}}"
+                                    iaid="{{itematta' value.iaid}}"
+>>>>>>> 短信类型增加
                                     filename="{{itemMeasureArray' value.filename}}"
                                     realname="{{itemMeasureArray' value.realname}}"
                                     intime="{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}"
@@ -98,7 +124,11 @@
                                     id="fname_{{itemMeasureArray' value.imnid}}"
                                     href="#">{{itemMeasureArray' value.filename}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
+<<<<<<< HEAD
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
+=======
+                            <td>{{itemMeasureArray' value.pmname}}</td>
+>>>>>>> 短信类型增加
                             <td width="">{{itemMeasureArray' value.realname}}</td>
                             <td width="">{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}</td>
                             <td class="text-error">{{itemMeasureArray' value.delname}}</td>
@@ -109,8 +139,13 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
+<<<<<<< HEAD
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a id="down_{{itemMeasureArray' value.imnid}}" iaid="{{itemMeasureArray' value.iaid}}"><i
+=======
+                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                                        <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
+>>>>>>> 短信类型增加
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"
                                                imnid="{{itemMeasureArray' value.imnid}}" href="#"
@@ -152,7 +187,11 @@
                             <th width="60">格式</th>
                             <td id="fileico"><span class="fileico ico-jpg"></span>.jpg</td>
                             <th width="60">所在期</th>
+<<<<<<< HEAD
                             <td id="numpname2">第二期</td>
+=======
+                            <td id="numpname">第二期</td>
+>>>>>>> 短信类型增加
                         </tr>
                         <tr>
                             <th width="60">上传者</th>
@@ -246,7 +285,11 @@
             $("#realname").html(realname);
             $("#intime").html(intime);
             $("#tips").html(tips);
+<<<<<<< HEAD
             $("#numpname2").html(numpname);
+=======
+            $("#numpname").html(numpname);
+>>>>>>> 短信类型增加
             $("#imnid").val(imnid);
             $(".filesDetail").show();
         });
@@ -264,11 +307,19 @@
                 cache: false,
                 contentType: false,
                 data: form_data,
+<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files",
                 processData: false,
                 success: function (data) {
                     if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files";
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files",
+                processData: false,
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files";
+>>>>>>> 短信类型增加
                     }
                 }
             });
@@ -281,11 +332,19 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'reconvery'},
+<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
                         $("#file-replace").show();
                         window.location.href = "{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files/recover";
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        $("#file-replace").show();
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
+>>>>>>> 短信类型增加
                     }
                 }
             });
@@ -298,6 +357,7 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'del'},
+<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
@@ -307,16 +367,30 @@
                     if (data['status'] == 2) {
                         $("#file-del2").modal('show');
                         $("#file-del").modal('hide');
+=======
+                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
+                success: function (data) {
+                    if (data['status'] == 1) {
+                        $("#file-del").hide();
+                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
+                    }
+                    if (data['status'] == 2) {
+                        $("#file-del2").show();
+                        $("#file-del").hide();
+>>>>>>> 短信类型增加
                     }
                 }
             });
         });
+<<<<<<< HEAD
 
 
         $("a[id^='down_']").click(function () {
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}sproject/section/get/" + iaid + "/attachment";
         });
+=======
+>>>>>>> 短信类型增加
     });
 </script>
 </body>

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

@@ -412,7 +412,6 @@
                 var nowurl = localurl.replace(/\/num\/\d+/,'');
                 window.location.href = nowurl;
             }
-
         });
 
         $("#uploaduser").change(function () {