1 资金调拨需求

src/components/FinancialModule/CapitalAllocation.vue

@@ -144,6 +144,7 @@
         <tr>
           <th>{{$t('fnc.danhao')}}</th>
           <th>{{$t('fnc.jine')}}</th>
+          <th width="350">调拨账户</th>
           <!-- <th>实付</th> -->
           <!-- <th>原币金额</th> -->
           <!-- <th>交易日期</th> -->
@@ -156,6 +157,30 @@
         <tr v-for="(item, index) in dataList">
           <td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
           <td>{{item.Money}}</td>
+          <td>
+              <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
+                <div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList"
+                  style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:300px">
+                  <p>
+                    <span style="float: left;">{{(tw.AllotType==1?'收':'支')}}</span>
+                    <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">
+                      {{tw.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==""?'无':tw.AccountType}}</span>
+                  </p>
+                  <p style="color:#333333">{{tw.BankNo}}
+                  <span style="float: right;">{{tw.OriginalMoney}}{{tw.CurrencyName}}</span>
+                  </p>
+                </div>
+              </template>
+              <template v-else>
+                <div class="_pad5">
+                  无
+                </div>
+              </template>
+          </td>
           <!-- <td>{{item.PayMoney}}</td> -->
           <!-- <td>{{item.OriginalMoney}}</td> -->
           <!-- <td>{{item.TradeDate}}</td> -->

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -778,13 +778,28 @@
                         </div>
                     </div>
                     <div style="padding-left: 75px;">
-                      <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">{{$t('fnc.bohui')}}</button>
+                      <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5||bossID===1903 || bossID===2786) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" 
+                      @click="bohui()">{{$t('fnc.bohui')}}</button>
                       <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
                     </div>
                 </div>
             </div>
+            <el-dialog custom-class='w400' :title="$t('objFill.tsbh')" :visible.sync="finacialDialog" center>
+      <template>
+        <el-input type="textarea" v-model="AuditOrRefundMsg.Description" rows="3" resize="none"></el-input>
+        <div class="FD_remark_list">
+          <span>{{$t('objFill.zhu')}}：</span>
+          <span>{{$t('objFill.bhtis')}}</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="finacialDialog=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="setBoHui()">{{$t('pub.sureBtn')}}</button>
+        </div>
+      </template>
+    </el-dialog>
     </div>
 </template>
+
 <script>
 import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 export default {
@@ -817,6 +832,12 @@ export default {
       },
       endDate: '',
       huijiShow:false,
+      //驳回弹窗
+      finacialDialog: false,
+      AuditOrRefundMsg: {
+          WorkFlowId: '',
+          Description: ''
+        },
     }
   },
   created(){
@@ -1070,6 +1091,22 @@ export default {
         window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
       }
     },
+    bohui() {
+        this.finacialDialog = true;
+        this.AuditOrRefundMsg.WorkFlowId = this.msg.ID;
+      },
+      //确定驳回
+      setBoHui() {
+        this.apipost('Financial_post_PersonRefund', this.AuditOrRefundMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.finacialDialog = false;
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
+      },
   },
   mounted(){
     this.msg.ID = this.$route.query.id;