1

src/components/FinancialModule/BasicDocuments.vue

@@ -3814,7 +3814,7 @@ else if (Type==2) {
         }, res => {
           if (res.data.resultCode == 1) {
             let data = res.data.data;
-            if (data.Type==2){
+            if (data.Type==2 || data.FTravelID){
               this.isClientBankAccount=true;
             }
             this.clientBankAccountData={
@@ -3828,7 +3828,9 @@ else if (Type==2) {
               JapanFeeRemarks: data.JapanFeeRemarks,
               JapanFeeCurrencyName: data.JapanFeeCurrencyName,
               JapanFeeRate: data.JapanFeeRate,
-              JapanFinanceId: data.JapanFinanceId
+              JapanFinanceId: data.JapanFinanceId,
+              FTravelID: data.FTravelID,
+              FTracelRemark: data.FTracelRemark
             }
             this.helpBranchData={
             Type:data.Type,

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -2734,7 +2734,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let data = res.data.data;
-            if (data.Type==2){
+            if (data.Type==2 || data.FTravelID){
               this.isClientBankAccount=true;
             }
             if(data.Type==2&&data.HelpBranchId>-1){
@@ -2751,7 +2751,9 @@
               JapanFeeRemarks: data.JapanFeeRemarks,
               JapanFeeCurrencyName: data.JapanFeeCurrencyName,
               JapanFeeRate: data.JapanFeeRate,
-              JapanFinanceId: data.JapanFinanceId
+              JapanFinanceId: data.JapanFinanceId,
+              FTravelID: data.FTravelID,
+              FTracelRemark: data.FTracelRemark
             }
           this.helpBranchData={
             Type:data.Type,

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -95,9 +95,9 @@
 
 <template>
   <div class="OrderReceivablesAccount-form"  :style="{'top':ClientBankAccountTop==0?'100px':'160px'}" v-if="clientBankAccountData">
-    <div class="OrderReceivablesAccount-title">供应商信息</div>
+    <div class="OrderReceivablesAccount-title">扩展信息</div>
     <div :style="{'top':ClientBankAccountTop==0?'110px':'170px'}"  class="ClosePopup" @click="clickClosePopup"><i class="el-icon-close"></i> </div>
-    <div class="OrderReceivablesAccount-center">
+    <div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.AccountCreateTime">
       <div><span>供&nbsp;&nbsp;应&nbsp;&nbsp;商：</span> {{clientBankAccountData.AccountTypeStr==='0'?clientBankAccountData.SupplierName:"非供应商"}} </div>
       <div v-if="clientBankAccountData.AccountTypeStr==='0'"><span>税&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</span> {{clientBankAccountData.DutyNo}} </div>
       <div >
@@ -106,23 +106,46 @@
       <div >
         <span>创建日期：</span> {{clientBankAccountData.AccountCreateTime}}
       </div>
-      <div v-if="clientBankAccountData.JapanFeeMoney && clientBankAccountData.JapanFeeMoney>0">
-        -----------------------------------------------
     </div>
-      <div v-if="clientBankAccountData.JapanFeeMoney && clientBankAccountData.JapanFeeMoney>0">
+    <div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanFeeMoney && clientBankAccountData.JapanFeeMoney>0">
+      <div v-if="clientBankAccountData.AccountCreateTime">
+        --------------------------------------------------
+      </div>
+      <div>
         <span>手&nbsp;&nbsp;续&nbsp;&nbsp;费：</span> 
         {{clientBankAccountData.JapanFeeMoney}}&nbsp;({{clientBankAccountData.JapanFeeCurrencyName}})&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单号：
         <!-- <span>关联单号：</span> -->
         <span style="display: inline; cursor: pointer; color: #106BAF;" @click="goUrlDetail('FinancialDocumentsDetail',clientBankAccountData.JapanFinanceId)">{{clientBankAccountData.JapanFinanceId}}</span>
       </div>
     </div>
+    <div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.FTravelID">
+      <div v-if="clientBankAccountData.AccountCreateTime">
+        --------------------------------------------------
+      </div>
+      <div v-if="IsEditTravelRemark==false">
+        <span>团队备注：</span> 
+        {{clientBankAccountData.FTracelRemark}}
+        <el-tooltip effect="dark" :content="$t('pub.updateMsg')" placement="top">
+            <i class="edit el-icon-edit" @click="IsEditTravelRemark=true"></i>
+          </el-tooltip>
+      </div>
+      <div v-else>
+        <span>团队备注：</span> 
+        <div>
+          <el-input  type="textarea" :rows="2" style="width: 88%;" v-model="clientBankAccountData.FTracelRemark" placeholder="请输入团队备注内容"></el-input>
+          <el-button size="mini" type="success" icon="el-icon-check" circle @click="SaveRemark()"></el-button>
+        </div>
+      </div>
     </div>
+  </div>
+
 </template>
 <script>
   export default {
     props:['clientBankAccountData','ClientBankAccountTop'],
     data() {
       return {
+        IsEditTravelRemark:false
        // clientBankAccountData: {}
       }
     },
@@ -153,6 +176,16 @@
           }
         })
       },
+      SaveRemark(){
+        this.apipost('Financial_post_SetFinanceTravelRemark', {TCID:this.clientBankAccountData.FTravelID,Remark:this.clientBankAccountData.FTracelRemark}, res => {
+          if (res.data.resultCode == 1) {
+            this.IsEditTravelRemark=false;
+            this.$message.success(res.data.message);
+          } else {            
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+      }
     },
     mounted() {
 

src/components/dmc/manager/dmcTotalTable.vue

@@ -543,6 +543,10 @@
                     style="padding-top:5px;padding-bottom:4px;font-size:13px;">
                     {{$t('ground.gysduindibeizhu')}}：{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
                   </div>
+                  <div v-show="outItem.PriceCommonList[index].FTravelRemark!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">
+                    财务备注：{{outItem.PriceCommonList[index].FTravelRemark}}
+                  </div>
                 </div>
               </td>
               <td></td>