From d3107f5986d1dcf61da92f8ec9302c10acb658dd Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Sat, 12 Feb 2022 13:33:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=86=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E7=9A=84=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue | 226 +++++++++++++++-----------
 1 file changed, 130 insertions(+), 96 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 67ca8c1..81c0c4a 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -20,6 +20,16 @@
                             :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>是否需要发票：</label>
+          <span>{{ basicInfo.needInvoice_dictText }}</span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>是否打包：</label>
+          <span>{{ basicInfo.pack_dictText }}</span>
+        </a-col>
+      </a-row>
       <a-row :gutter="24">
         <a-col class="detail-item">
           <label>备注：</label>
@@ -49,7 +59,7 @@
       </a-row>
       <a-row :gutter="24" v-if="basicInfo.files">
         <a-col class="detail-item">
-          <label>资料：</label>
+          <label>项目资料：</label>
           <span><preview-file :file-id="basicInfo.files"></preview-file></span>
         </a-col>
       </a-row>
@@ -64,8 +74,55 @@
           <span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12" class="detail-item">
+          <label>信用代码：</label>
+          <span><j-ellipsis :value="basicInfo.dutyCode" :length="20"></j-ellipsis></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>公司地址：</label>
+          <span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>公司电话：</label>
+          <span><j-ellipsis :value="basicInfo.companyPhone" :length="20"></j-ellipsis></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>邮编：</label>
+          <span>{{ basicInfo.postalCodeCompany }}</span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>银行户名：</label>
+          <span>{{ basicInfo.bankAccountName }}</span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>开户行：</label>
+          <span>{{ basicInfo.openingBank }}</span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>银行账号：</label>
+          <span>{{ basicInfo.bankAccount }}</span>
+        </a-col>
+      </a-row>
+    </section>
+    <!--企业信息end-->
+    <!--    企业联系人信息start-->
+    <section>
+      <h3 class="title">企业联系人信息</h3>
+      <a-row :gutter="24">
+        <a-col :span="12">
           <label>企业联系人：</label>
-          <span><j-ellipsis :value="basicInfo.name" :length="20"></j-ellipsis></span>
+          <span>{{ basicInfo.name }}</span>
+        </a-col>
+        <!--        企业联系人1的备注，只有工作组成员需要这个字段-->
+        <a-col :span="12" class="detail-item"
+               v-if="basicInfo.projectType === 2 && basicInfo.remarksOne && basicInfo.remarksOne !== ''">
+          <label>企业联系人备注：</label>
+          <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
@@ -100,15 +157,7 @@
       </a-row>
       <!--      工作组项目有企业联系人2、3-->
       <template v-if="basicInfo.projectType===2">
-        <!--        企业联系人1的备注-->
-        <template>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人备注：</label>
-              <span><j-ellipsis :value="basicInfo.remarksOne" :length="16"></j-ellipsis></span>
-            </a-col>
-          </a-row>
-        </template>
+        <a-divider/>
         <!--        企业联系人2-->
         <template v-if="basicInfo.nameTwo">
           <a-row :gutter="24">
@@ -116,109 +165,90 @@
               <label>企业联系人2：</label>
               <span><j-ellipsis :value="basicInfo.nameTwo" :length="16"></j-ellipsis></span>
             </a-col>
-            <a-col :span="12">
-              <label>企业联系人2性别：</label>
-              <span>{{ basicInfo.genderTwo_dictText }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人2职务：</label>
-              <span><j-ellipsis :value="basicInfo.postTwo" :length="16"></j-ellipsis></span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人2电话：</label>
-              <span>{{ basicInfo.phoneTwo }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人2邮箱：</label>
-              <span>{{ basicInfo.emailTwo }}</span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人2邮编：</label>
-              <span>{{ basicInfo.postalCodeContactsTwo }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人2地址：</label>
-              <span><j-ellipsis :value="basicInfo.contactAddressTwo" :length="16"></j-ellipsis></span>
-            </a-col>
             <a-col :span="12" class="detail-item">
               <label>企业联系人2备注：</label>
               <span><j-ellipsis :value="basicInfo.remarksTwo" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <label>企业联系人2性别：</label>
+              <span>{{ basicInfo.genderTwo_dictText }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2职务：</label>
+              <span><j-ellipsis :value="basicInfo.postTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2电话：</label>
+              <span>{{ basicInfo.phoneTwo }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2邮箱：</label>
+              <span>{{ basicInfo.emailTwo }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2邮编：</label>
+              <span>{{ basicInfo.postalCodeContactsTwo }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人2地址：</label>
+              <span><j-ellipsis :value="basicInfo.contactAddressTwo" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
         </template>
         <!--        企业联系人3-->
         <template v-if="basicInfo.nameThree">
+          <a-divider/>
           <a-row :gutter="24">
             <a-col :span="12" class="detail-item">
               <label>企业联系人3：</label>
               <span><j-ellipsis :value="basicInfo.nameThree" :length="16"></j-ellipsis></span>
             </a-col>
-            <a-col :span="12">
-              <label>企业联系人3性别：</label>
-              <span>{{ basicInfo.genderThree_dictText }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3职务：</label>
-              <span><j-ellipsis :value="basicInfo.postThree" :length="16"></j-ellipsis></span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3电话：</label>
-              <span>{{ basicInfo.phoneThree }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3邮箱：</label>
-              <span>{{ basicInfo.emailThree }}</span>
-            </a-col>
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3邮编：</label>
-              <span>{{ basicInfo.postalCodeContactsThree }}</span>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12" class="detail-item">
-              <label>企业联系人3地址：</label>
-              <span><j-ellipsis :value="basicInfo.contactAddressThree" :length="16"></j-ellipsis></span>
-            </a-col>
             <a-col :span="12" class="detail-item">
               <label>企业联系人3备注：</label>
               <span><j-ellipsis :value="basicInfo.remarksThree" :length="16"></j-ellipsis></span>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <label>企业联系人3性别：</label>
+              <span>{{ basicInfo.genderThree_dictText }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3职务：</label>
+              <span><j-ellipsis :value="basicInfo.postThree" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3电话：</label>
+              <span>{{ basicInfo.phoneThree }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3邮箱：</label>
+              <span>{{ basicInfo.emailThree }}</span>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3邮编：</label>
+              <span>{{ basicInfo.postalCodeContactsThree }}</span>
+            </a-col>
+            <a-col :span="12" class="detail-item">
+              <label>企业联系人3地址：</label>
+              <span><j-ellipsis :value="basicInfo.contactAddressThree" :length="16"></j-ellipsis></span>
+            </a-col>
+          </a-row>
         </template>
       </template>
       <!--      工作组项目有企业联系人2、3-->
-      <a-row :gutter="24">
-        <a-col :span="12" class="detail-item">
-          <label>是否需要发票：</label>
-          <span>{{ basicInfo.needInvoice_dictText }}</span>
-        </a-col>
-        <a-col :span="12" class="detail-item">
-          <label>是否打包：</label>
-          <span>{{ basicInfo.pack_dictText }}</span>
-        </a-col>
-      </a-row>
-      <a-row :gutter="24">
-        <a-col :span="12" class="detail-item">
-          <label>企业邮编：</label>
-          <span>{{ basicInfo.postalCodeCompany }}</span>
-        </a-col>
-        <a-col :span="12" class="detail-item">
-          <label>企业地址：</label>
-          <span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
-        </a-col>
-      </a-row>
     </section>
-    <!--企业信息end-->
+    <!--    企业联系人信息end-->
     <!--到账信息begin-->
     <section class="payment-info">
       <h3 class="title">到账信息</h3>
@@ -341,9 +371,9 @@ export default {
       contactsInfo: {},
       columns,
       // 到账信息
-      paymentInfoList:[],
+      paymentInfoList: [],
       // 开票邮寄信息
-      logisticsInfoList:[],
+      logisticsInfoList: []
     }
   },
   computed: {},
@@ -398,14 +428,14 @@ export default {
           }
         })
       }
-      return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
+      return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
     },
     /*
     *  查看物流
     * */
     lookLogistics(record) {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
-      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
+      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
     },
     /*
     * 去合同详情 传入合同id
@@ -527,4 +557,8 @@ h3.title::before {
     border-bottom: 1px solid #ccc;
   }
 }
+
+.ant-divider-horizontal {
+  margin: 5px 0;
+}
 </style>