1

src/components/FinancialModule/FinancialDocuments.vue

@@ -1014,7 +1014,7 @@
             width="55">
           </el-table-column>
           <el-table-column prop="BranchName" :label="$t('system.query_company')" width="90"></el-table-column>
-          <el-table-column :label="$t('fnc.danhao')">
+          <el-table-column :label="$t('fnc.danhao')" width="90">
             <template slot-scope="scope">
               <el-popover popper-class="detailsIT_Journal" placement="bottom-start" trigger="click">
                 <template v-if="scope.row.Type!=1&&scope.row.Type!=7&&scope.row.modelShow&&(scope.row.Is_Merge===0||scope.row.Is_Merge===null)">
@@ -1033,7 +1033,7 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('fnc.djleixing')">
+          <el-table-column :label="$t('fnc.djleixing')" width="90">
             <template slot-scope="scope">
               <span class="_bg__" :class="scope.row.Type==1 || scope.row.Type==5?'_bg_green':'_bg_red'">{{scope.row.TypeName}}</span>
               <el-tooltip class="item" effect="dark" :content="$t('ground.zjiatk')" placement="top">
@@ -1041,7 +1041,7 @@
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('hotel.hotel_corrlelatition')" min-width="200">
+          <el-table-column :label="$t('hotel.hotel_corrlelatition')"width="300">
             <template slot-scope="scope">
               <div class="_number">
                 <template v-if="scope.row.TCIDAndTCNUMList.length>0">
@@ -1090,16 +1090,36 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('fnc.feiyongleixing')">
+          <el-table-column :label="$t('fnc.feiyongleixing')" width="120">
             <template slot-scope="scope">
               <template v-for="(s,si) in scope.row.CostTypeList">
                 <span class="_tag_span">{{s}}</span><br />
               </template>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('tips.jiaoyifangshi')" min-width="200">
+          <el-table-column :label="$t('tips.jiaoyifangshi')" show-overflow-tooltip width="300">
             <template slot-scope="scope">
-              <div class="_number">
+              <div>
+              <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
+                <div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList"
+                  style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
+                  <p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
+                      style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">
+                      {{scope.row.TradeWayList[0].TypeName}}</span>
+                    <span
+                      style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
+                      :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
+                  </p>
+                  <p style="color:#333333">{{tw.BankNo}}</p>
+                </div>
+              </template>
+              <template v-else>
+                <div class="_pad5">
+                  {{$t('fnc.no')}}
+                </div>
+              </template>
+            </div>
+              <!-- <div class="_number">
                 <template v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
                   <div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList">
                     <p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span
@@ -1114,10 +1134,10 @@
                     {{$t('fnc.no')}}
                   </div>
                 </template>
-              </div>
+              </div> -->
             </template>
           </el-table-column>
-          <el-table-column :label="$t('fnc.jine')"  width="180">
+          <el-table-column :label="$t('fnc.jine')" >
             <template slot-scope="scope">
               <p v-if="scope.row.IsForeignCurrency && scope.row.IsForeignCurrency ==1">{{$t('fnc.yuanbi')}}：<span
                 class="">{{moneyFormat(scope.row.WBMoney)}}{{scope.row.CurrencyName}}</span></p>
@@ -1127,7 +1147,7 @@
                 class="">{{moneyFormat(scope.row.PayMoney)}}</span></p>
             </template>
           </el-table-column>
-          <el-table-column :label="msg.Type==1? $t('fnc.shoukuan') : $t('fnc.fukuan')+$t('fnc.duixiang')" min-width="150">
+          <el-table-column :label="msg.Type==1? $t('fnc.shoukuan') : $t('fnc.fukuan')+$t('fnc.duixiang')" >
             <template slot-scope="scope">
               <template v-if='scope.row.Type===1'>
                 <span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{scope.row.RemitterName}}</span>
@@ -1140,7 +1160,7 @@
               </template>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('fnc.zdrenyuan')" width="150">
+          <el-table-column :label="$t('fnc.zdrenyuan')" >
             <template slot-scope="scope">
               <div valign="middle">
                 <img class="_head_img" :src="scope.row.EmPhoto" alt="">