111

src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue

@@ -192,6 +192,7 @@
         <td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
         <td height="34px" colspan="6">
           <span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
+          <span class="_color_b _font_size12" v-if="GetDetail.Merge.TransferFinanceId>0"> &nbsp;/结款调拨单：<span @click="openAllotDetails(GetDetail.Merge.TransferFinanceId)" style="cursor: pointer; color:deepskyblue">{{GetDetail.Merge.TransferFinanceId}}</span></span>
         </td>
       </tr>
       <tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
@@ -272,6 +273,17 @@
               query
             });
         },
+        // 调拨单据详情
+      openAllotDetails(FrId) {
+          let query = {
+            id: FrId,
+            blank: "y",
+          };
+          this.$router.push({
+              path: "/CapitalAllocationDetail",
+              query
+            });
+        },
     },mounted(){
 
       const myDate = new Date();

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -134,7 +134,7 @@
                             </el-form-item>
                     </el-col>
                     <el-col :span="8" :gutter="35">
-                        <el-form-item label="发团日期">
+                        <el-form-item label="制单日期">
                                 <el-date-picker class="h34"
                                     @change="timeAddByTC"
                                     v-model="productionDateByTC"
@@ -196,6 +196,7 @@
                     <th>团队订单</th>
                     <th>{{$t('fnc.danhao')}}</th>
                     <th>结转调拨单</th>
+                    <th>制单日期</th>
                     <th>{{$t('fnc.a_zhaiyao')}}</th>
                     <th>{{$t('fnc.zhidanren')}}</th>
                     <th>{{$t('fnc.a_hkfkshijian')}}</th>
@@ -212,7 +213,7 @@
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
                     <td></td>
                     <td></td>
                     <td></td>
@@ -233,6 +234,7 @@
                     <td>
                       <span v-if="item.CallBackReFrId>0" class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item,1)">{{ item.CallBackReFrId }}</span>
                     </td>
+                    <td><span>{{item.CreateDate}}</span></td>
                     <td>
                         <p>{{item.CostTypeName}}</p>
                         <p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }}</span> </p>
@@ -261,7 +263,7 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="10">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="11">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
                     <td>
                       {{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
                     </td>