来款方式修改

src/components/ProjectDetailModal.vue

@@ -25,15 +25,15 @@
           <span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
-<!--      来款方式为合同的显示-->
+      <!--      来款方式为合同的显示-->
       <a-row :gutter="24" v-if="!!basicInfo.contractNum">
         <a-col :span="12">
-          <label>来款方式：</label>
+          <label>{{createIncomeType(basicInfo.projectType)}}：</label>
-          <span>合同</span>
+          <span>{{ basicInfo.chargeWay_dictText }}</span>
         </a-col>
         <a-col :span="12">
           <label>合同编号：</label>
-          <span class="contract-num" @click="toContractDetail">{{basicInfo.contractNum}}</span>
+          <span class="contract-num" @click="toContractDetail">{{ basicInfo.contractNum }}</span>
         </a-col>
       </a-row>
     </section>
@@ -48,33 +48,33 @@
         </a-col>
         <a-col :span="12">
           <label>企业联系人：</label>
-          <span>{{basicInfo.name}}</span>
+          <span>{{ basicInfo.name }}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人性别：</label>
-          <span>{{basicInfo.gender_dictText}}</span>
+          <span>{{ basicInfo.gender_dictText }}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人职务：</label>
-          <span>{{basicInfo.post}}</span>
+          <span>{{ basicInfo.post }}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人电话：</label>
-          <span>{{basicInfo.phone}}</span>
+          <span>{{ basicInfo.phone }}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人邮箱：</label>
-          <span>{{basicInfo.email}}</span>
+          <span>{{ basicInfo.email }}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业联系人邮编：</label>
-          <span>{{basicInfo.postalCodeContacts}}</span>
+          <span>{{ basicInfo.postalCodeContacts }}</span>
         </a-col>
         <a-col :span="12">
           <label>企业联系人地址：</label>
@@ -84,17 +84,17 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>是否需要发票：</label>
-          <span>{{basicInfo.needInvoice_dictText}}</span>
+          <span>{{ basicInfo.needInvoice_dictText }}</span>
         </a-col>
         <a-col :span="12">
           <label>是否打包：</label>
-          <span>{{basicInfo.pack_dictText}}</span>
+          <span>{{ basicInfo.pack_dictText }}</span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>企业邮编：</label>
-          <span>{{basicInfo.postalCodeCompany}}</span>
+          <span>{{ basicInfo.postalCodeCompany }}</span>
         </a-col>
         <a-col :span="12">
           <label>企业地址：</label>
@@ -107,7 +107,9 @@
     <section class="payment-info">
       <h3 class="title">到账信息</h3>
       <section class="payment-info-title">到账信息</section>
-      <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">{{item.paymentDate}}到账{{item.amountReceived}}元</div>
+      <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+        {{ item.paymentDate }}到账{{ item.amountReceived }}元
+      </div>
     </section>
     <!--到账信息end-->
     <!--开票邮寄信息begin-->
@@ -126,9 +128,9 @@
         <span slot="action" class="action-span-cell">
           <a @click="lookLogistics()">查看物流</a>
         </span>
-<!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
+          <!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
-<!--            {{ record.sendDate }}-->
+          <!--            {{ record.sendDate }}-->
-<!--          </p>-->
+          <!--          </p>-->
         </a-table>
       </div>
     </section>
@@ -237,7 +239,7 @@ export default {
       // 企业信息
       enterpriseInfo: {},
       // 联系人信息
-      contactsInfo:{},
+      contactsInfo: {},
       columns,
       // 到账信息
       paymentInfoList,
@@ -245,7 +247,8 @@ export default {
       logisticsInfoList,
     }
   },
-  components:{
+  computed: {},
+  components: {
     JEllipsis
   },
   methods: {
@@ -253,16 +256,16 @@ export default {
       // 记录当前项目id
       this.currentProjectId = record.id
       // 通过id查询项目详情
-      queryCommonProjectById({id:this.currentProjectId}).then(res => {
+      queryCommonProjectById({id: this.currentProjectId}).then(res => {
-        if(res.success){
+        if (res.success) {
-          console.log(res.result,'res.result')
+          console.log(res.result, 'res.result')
           // 项目信息
           this.basicInfo = res.result
           // 到账信息
           this.paymentInfoList = res.result.paymentRecord
           // 开票邮寄信息
           this.logisticsInfoList = res.result.mailBill
-        }else {
+        } else {
           console.log('未查到相应的信息')
         }
       })
@@ -296,10 +299,24 @@ export default {
     /*
     * 去合同详情 传入合同id
     * */
-    toContractDetail(){
+    toContractDetail() {
-      this.$router.push({path:'/contractManagement/RevenueContractDetail',query:{
+      this.$router.push({
-          revenueId:this.basicInfo.contractId
+        path: '/contractManagement/RevenueContractDetail', query: {
-        }})
+          revenueId: this.basicInfo.contractId
+        }
+      })
+    },
+    /*
+    * 每一个项目的来款方式不同
+    * */
+    createIncomeType(val) {
+      if (val === 1 || val === 2 || val === 4) {
+        return  '来款方式'
+      }else {
+        return  '缴费方式'
+      }
+
+
     }
   }
 }
@@ -317,10 +334,12 @@ h3 {
 label {
   color: #666;
 }
+
 .contract-num {
   color: #42b983;
   cursor: pointer;
 }
+
 h3.title::before {
   position: absolute;
   top: 4px;