merge

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue

@@ -22,7 +22,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: this.companyId,
+        cid: 586583,
         pageNum: 1,
         pageSize: 10,
         companyType: 1

dsk-operate-ui/src/views/detail/party-a/internalCooperation/accessCondition.vue

@@ -11,37 +11,37 @@
         </tr>
         <tr>
           <td class="table-key">公司名称</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.customerName ? supplierAccessInfo.customerName : "-"}}</td>
           <td class="table-key">注册资本（万元）</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerCapital ? supplierAccessInfo.registerCapital : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">证件选择</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.cardType ? supplierAccessInfo.cardType : "-"}}</td>
           <td class="table-key">统一社会信用代码</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.unifySocialCode ? supplierAccessInfo.unifySocialCode : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">工商注册号</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerNo ? supplierAccessInfo.registerNo : "-"}}</td>
           <td class="table-key">组织机构代码证号</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.orgnizationCode ? supplierAccessInfo.orgnizationCode : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">税务登记号</td>
-          <td colspan="3">-</td>
+          <td colspan="3">{{supplierAccessInfo.businessLicense ? supplierAccessInfo.businessLicense : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">身份选择</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.cardType ? supplierAccessInfo.cardType : "-"}}</td>
           <td class="table-key">法人身份证号/护照...</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.idCard ? supplierAccessInfo.idCard : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">纳税人身份</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.paytaxType ? supplierAccessInfo.paytaxType : "-"}}</td>
           <td class="table-key">纳税人税率</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.taxRate ? supplierAccessInfo.taxRate : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key lot">享受优惠政策说明</td>
@@ -52,45 +52,45 @@
       <table style="margin-top:16px;">
         <tr>
           <td class="table-key">法人代表</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.representative ? supplierAccessInfo.representative : "-"}}</td>
           <td class="table-key">公司联系人</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.contactPerson ? supplierAccessInfo.contactPerson : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">公司联系人电话</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.contactPhone ? supplierAccessInfo.contactPhone : "-"}}</td>
           <td class="table-key">主项资质</td>
           <td>-</td>
         </tr>
         <tr>
           <td class="table-key">公司性质</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.ownerKind ? supplierAccessInfo.ownerKind : "-"}}</td>
           <td class="table-key">资质等级</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.credential ? supplierAccessInfo.credential : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">施工承包范围</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.constructJobScope ? supplierAccessInfo.constructJobScope : "-"}}</td>
           <td class="table-key">专业类别</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.groupSpecialty ? supplierAccessInfo.groupSpecialty : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">公司注册地所属区域</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerRegion ? supplierAccessInfo.registerRegion : "-"}}</td>
           <td class="table-key">公司注册地所属省</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerProvince ? supplierAccessInfo.registerProvince : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">公司注册地所属城市</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerCity ? supplierAccessInfo.registerCity : "-"}}</td>
           <td class="table-key">注册地址</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.registerAddress ? supplierAccessInfo.registerAddress : "-"}}</td>
         </tr>
         <tr>
           <td class="table-key">开户行</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.openBank ? supplierAccessInfo.openBank : "-"}}</td>
           <td class="table-key">银行账号</td>
-          <td>-</td>
+          <td>{{supplierAccessInfo.bankAccount ? supplierAccessInfo.bankAccount : "-"}}</td>
         </tr>
       </table>
 

dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue

@@ -93,7 +93,7 @@ export default {
       isSkeleton: true,
       areaList: [],
       // 合作记录弹窗
-      cooperationRecordDialog: true,
+      cooperationRecordDialog: false,
       dialogTitle: "",
       dialogQueryParams: {