Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_web into rongxin_dev

.gitignore

@@ -0,0 +1,2 @@
+.idea
+/*.zip

view/announcement/attestation.html

@@ -156,31 +156,19 @@
                     <td>项目编号</td>
                     <td>{{announcementInformationDetail.projectCode}}</td>
                 </tr>
+
                 <tr>
-                    <td rowspan="3">转出方</td>
-                    <td style="color: #777777;">所有权人</td>
+                    <td>转出方</td>
+                    <td style="color: #777777;">名称</td>
                     <td style="color: #000000;">{{announcementInformationDetail.outName}}</td>
-                    <td></td>
-                    <td></td>
-                </tr>
-                <tr>
-                    <td style="border-left: none;">转出方</td>
-                    <td>{{announcementInformationDetail.outName}}</td>
-                    <td>转出行为批准机构名称</td>
-                    <td>{{announcementInformationDetail.pzjg}}</td>
-                </tr>
-                <tr>
-                    <td style="border-left: none;">负责人</td>
-                    <td>{{announcementInformationDetail.legalPerson}}</td>
-                    <td>注册号(身份证号)</td>
-                    <td>{{announcementInformationDetail.idCardNum}}</td>
+                    <td style="color: #777777;">负责人</td>
+                    <td style="color: #000000;">{{announcementInformationDetail.legalPerson}}</td>
                 </tr>
+
                 <tr>
-                    <td rowspan="3">受让方</td>
-                    <td style="color: #777777;">受让方</td>
-                    <td style="color: #000000;">{{announcementInformationDetail.inName}}</td>
-                    <td></td>
-                    <td></td>
+                    <td rowspan="2">受让方</td>
+                    <td style="color: #777777;">名称</td>
+                    <td style="color: #000000;" colspan="3">{{announcementInformationDetail.inName}}</td>
                 </tr>
                 <tr>
                     <td style="border-left: none;">法定代表人</td>
@@ -188,12 +176,6 @@
                     <td>公司性质</td>
                     <td>{{announcementInformationDetail.companyNature}}</td>
                 </tr>
-                <tr>
-                    <td style="border-left: none;">注册资本</td>
-                    <td>{{announcementInformationDetail.companyCapital}}</td>
-                    <td><p>注册号(身份证号)</p></td>
-                    <td>{{announcementInformationDetail.companyLicense}}</td>
-                </tr>
                 <tr>
                     <td rowspan="8"><p>转出</p>
                         <p>标的</p>

view/listingItems/itemsDetail.html

@@ -396,7 +396,7 @@
                         <td colspan="27" nowrap="nowrap" class="s0" style="font-size: 1px;">&nbsp;</td>
                     </tr>
                     <tr>
-                        <td rowspan="6">
+                        <td rowspan="4">
                             {{outProjectInformationDetail.projectNumber == '集体资产采购类' ? '建设方':'转出方'}}
 
                             <br/>基本情况</td>
@@ -413,18 +413,6 @@
                         <td colspan="6">统一社会信用代码</td>
                         <td colspan="6">{{outProjectInformationDetail.areaNum}}</td>
                     </tr>
-                    <tr>
-                        <td colspan="7">法人/负责人</td>
-                        <td colspan="8">{{outProjectInformationDetail.legalPerson}}</td>
-                        <td colspan="6">身份证号</td>
-                        <td colspan="6">{{outProjectInformationDetail.idCardNum}}</td>
-                    </tr>
-                    <tr>
-                        <td colspan="7">联系电话</td>
-                        <td colspan="8">{{outProjectInformationDetail.phone}}</td>
-                        <td colspan="6"></td>
-                        <td colspan="6"></td>
-                    </tr>
                     <tr>
                         <td colspan="7">项目联系人</td>
                         <td colspan="8">{{outProjectInformationDetail.linkPerson}}</td>