Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/financial/components/CollectionApproval.vue

@@ -13,6 +13,7 @@
               <div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{ itemAmount.amount}}{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}</div>
           </template>
         </el-descriptions-item>
+        <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
       </el-descriptions>
     <div class="btn">
       <el-button
@@ -46,7 +47,8 @@ export default {
       collectionAmount: [],
       currencyList:[],
       list:[],
-      receiptId:0
+      receiptId:0,
+      reason:''
     }
   },
   watch:{
@@ -74,6 +76,7 @@ export default {
      getReceiptApprove(this.id).then(res => {
          if(res.data.receiptId){
            this.receiptId = res.data.receiptId
+           this.reason = res.data.reason
             this.getReceiptInfo()
          }
      })

src/views/ecw/financial/components/CollectionBankDetail.vue

@@ -8,6 +8,7 @@
             <span>{{ parseTime(form.createTime, '{y}-{m}-{d}') }}</span>
           </template></el-descriptions-item>
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
+        <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
       </el-descriptions>
     <div class="btn">
       <el-table ref="multipleTable" :data="detailed" border row-key="id">
@@ -157,7 +158,8 @@ export default {
       collectionAmount: [],
       addForm:{},
       receiptId:0,
-      receiptItemId:0
+      receiptItemId:0,
+      reason:''
     }
   },
   watch:{
@@ -183,6 +185,7 @@ export default {
           if(res.data.receiptId){
             this.receiptId = res.data.receiptId
             this.receiptItemId = res.data.receiptItemId
+            this.reason = res.data.reason
              this.getReceiptInfo()
           }
       })

src/views/ecw/financial/components/CollectionWriteoff.vue

@@ -14,7 +14,9 @@
               <div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}: {{ itemAmount.amount}}</div>
           </template>
         </el-descriptions-item>
+        <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>
       </el-descriptions>
+      
       </div>
       <el-descriptions :column="3" border>
         <el-descriptions-item >
@@ -85,7 +87,8 @@ export default {
       writeOffAmounts:0,
       detailed:[],
       showCurrencyId:0,
-      receiptId:0
+      receiptId:0,
+      reason:''
     }
   },
   watch:{
@@ -149,6 +152,7 @@ export default {
       getReceiptApprove(this.id).then(res => {
           if(res.data.receiptId){
             this.receiptId = res.data.receiptId
+            this.reason = res.data.reason
              this.getReceiptInfo()
           }
       })