1

src/components/dmc/manager/dmcTotalTable.vue

@@ -585,10 +585,7 @@
               </td>
                 <td>
                 <!-- @click="OpenCompanyAlipay(item)"  :class="item.CompanyAlipay==1?'colorE95252':''" -->
-                 <div @click="GoCompanyAlipay(item)" v-if="item.CompanyAlipay==1" class="colorE95252" style="text-decoration: underline;padding-top:5px;padding-bottom:4px;font-size:13px;cursor: pointer;">
-                  {{$t('objFill.v101.dmc.yikqqydf')}}
-                    <!-- {{item.CompanyAlipay==1?"已开启企业代付":"开启企业代付"}} -->
-                 </div>
+                 <div @click="GoCompanyAlipay(item)" v-if="item.CompanyAlipay==1" class="colorE95252" style="text-decoration: underline;padding-top:5px;padding-bottom:4px;font-size:13px;cursor: pointer;"> {{$t('objFill.v101.dmc.yikqqydf')}}</div>
               </td>
 
             </tr>

src/components/leaderPay2.vue

@@ -639,6 +639,33 @@
           </template>
         </template>
       </table>
+      <template v-if="LeaderOtherExpensesList&&LeaderOtherExpensesList.length>0" >
+      <table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
+        <tr>
+          <th colspan="5" class="bgwhite">其他支出</th>
+        </tr>
+        <tr>
+          <th width="">项目名称</th>
+          <th width="">金额</th>
+          <th width="">币种</th>
+          <th width="100">支付方式</th>
+        </tr>
+       
+          <tr v-for='(item,index) in LeaderOtherExpensesList' :key="index">
+            <td>{{item.OtherName}}</td>
+            <td>
+              {{item.OtherPrice }}
+            </td>
+            <td >
+              {{item.CurrencyName}}
+            </td>
+            <td>
+              {{item.PayTypeName}}
+            </td>
+          </tr>
+      
+      </table>
+    </template>
       <table border="0" cellspacing="1" class="leaderPayTable">
         <tr>
           <th>{{$t('advmanager.v_type')}}</th>
@@ -662,6 +689,7 @@
             <span v-if="item.UserType==1">{{$t('hotel.hotel')}}</span>
             <span v-if="item.UserType==2">餐饮</span>
             <span v-if="item.UserType==4">交通</span>
+             <span v-if="item.UserType==5">其他支出</span>
             (<span style="color:red">{{item.CurrencyName}}</span>)
           </td>
           <td>{{item.PlanTotalPrice}}</td>
@@ -830,6 +858,8 @@
                     @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span>
                 </p>
               </template>
+              <template v-if="item.CompanyAlipay==1">
+                <span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > {{$t('objFill.v101.dmc.yikqqydf')}}</span></template>
             </div>
           </td>
           <td>
@@ -1371,7 +1401,7 @@
         },
         checkList2: [],
         cdState2: false,
-
+        LeaderOtherExpensesList:[],
       };
     },
     methods: {
@@ -2055,6 +2085,16 @@
           err => {}
         );
       },
+      GoCompanyAlipay(obj){
+        let routeData = this.$router.resolve({
+          name: 'AlipayManagementDetail',
+          query: {
+            Id: obj.TCID,
+            searchTitle: '费控制度详情'
+          }
+        })
+        window.open(routeData.href, '_blank')
+      },
       //获取顶部数据
       getNav() {
         this.apipost(
@@ -2161,6 +2201,7 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.list = res.data.data;
+            this.LeaderOtherExpensesList=res.data.data.leaderOtherExpensesList;
             // 预计金额
             this.planPriceList = this.list.planPriceList;
             // 车