save

src/components/FinancialModule/BasicDocuments.vue

@@ -563,6 +563,11 @@
                     </p>
                     <p>业务单据：<span>{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> -->
                 </div>
+              <!-- 关联客户 -->
+              <div v-if="GetDetail.SigningCustomerId>0">
+                <a>
+                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">关联客户：{{GetDetail.SigningCustomerName}}</span></a>
+              </div>
             </div>
             <div class="_fujian_box" v-if="GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0">
                 <div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -991,6 +991,11 @@
               </el-popover>
             </div>
           </div>
+              <!-- 关联客户 -->
+              <div v-if="GetDetail.SigningCustomerId>0">
+                <a>
+                <span style="text-decoration: underline;cursor: pointer;color: #000;font-size: 12px;" @click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">关联客户：{{GetDetail.SigningCustomerName}}</span></a>
+              </div>
         </div>
         <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
           :isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
@@ -1711,6 +1716,17 @@
           }
         });
       },
+      goSigningCustomer(id,name) {
+        this.$router.push({
+          name: 'signedFinanceAll',
+          query: {
+            id: id,
+            name: name,
+            blank: "y",
+            tab: "签约客户管理"
+          }
+        });
+      },
       GourlHotelZr() {
         this.$router.push({
           name: 'HotelDiscount',

src/components/SalesModule/signedFinance.vue

-<style>
+<style scoped>
   .page_MyCustomer ._mc_addbox {
     height: 52px;
     width: 100%;
@@ -380,7 +380,488 @@
 }
 .page_fnDm {
   background-color: white;
-}</style>
+}
+.page_fnDm {
+  background-color: white;
+}
+.query-box {
+  overflow: inherit;
+}
+._nav {
+  margin: 20px 0 0 0;
+  background-color: #f5f5f5;
+}
+._nav li {
+  float: left;
+  font-size: 14px;
+  color: #666666;
+  padding: 15px 20px;
+  cursor: pointer;
+  position: relative;
+  background-color: #f1f1f1;
+  margin-right: 5px;
+}
+._nav li._active {
+  background-color: #ffffff;
+  color: #333333;
+}
+._nav li._active::after {
+  content: "";
+  width: 20px;
+  height: 3px;
+  background-color: #e95252;
+  display: inline-block;
+  position: absolute;
+  bottom: 0;
+  left: 38%;
+}
+.el-range-editor.el-input__inner {
+  border-radius: 0;
+}
+.query-box {
+  border: none;
+}
+.hight_query {
+  position: relative;
+}
+.hight_query span {
+  height: 34px;
+  line-height: 34px;
+  color: #e95252;
+}
+.hight_query span .icon-gengduo {
+  font-size: 12px;
+}
+.hight_query span em {
+  text-decoration: underline;
+  cursor: pointer;
+}
+.hight_query_box {
+  position: absolute;
+  background-color: white;
+  z-index: 2000;
+  right: 200px;
+  width: 800px;
+}
+._hqb_shadow {
+  box-shadow: 3px 2px 10px rgb(204, 203, 203);
+  border: 1px solid #ececec;
+}
+.query-box ul {
+  overflow: initial;
+}
+.hqb_t {
+  padding: 10px 20px;
+  font-size: 16px;
+  background-color: #e95252;
+  border: 1px solid #e95252;
+  color: #fff;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.query-box li:last-child {
+  float: left;
+}
+.query-box > ul > li:last-child {
+  float: right;
+}
+.query-box .hight_query ul .el-input {
+  width: inherit;
+}
+.hight_query_box ul li {
+  margin-top: 0;
+  float: left;
+  margin-right: 15px;
+}
+.hight_query_box ul li label {
+  font-size: 14px;
+}
+.hight_query_box .el-form {
+  padding: 0 20px;
+}
+.hight_query_box ul li._hqb_btn {
+  float: right;
+  margin-right: 25px;
+  padding-top: 5px;
+  position: inherit;
+}
+.Receipt_box {
+  padding: 15px;
+  color: #c94052;
+  width: 614px;
+  background-color: rgba(242, 242, 242, 1);
+  border: 1px solid rgba(228, 228, 228, 1);
+}
+.Receipt_box.color_blur {
+  color: #106baf;
+}
+.Receipt_box.color_blur .rb_stit span {
+  display: inline-block;
+  border-bottom: 2px solid #106baf;
+  padding: 0 20px;
+}
+.rb_tit {
+  font-size: 18px;
+  text-align: center;
+}
+.rb_stit {
+  font-size: 14px;
+  text-align: center;
+}
+.rb_stit span {
+  display: inline-block;
+  border-bottom: 2px solid #c94052;
+  padding: 0 20px;
+}
+.rb_top_row {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+}
+.rb_top_row span._r_name {
+  color: #333333;
+}
+.rb_top_row span._r_bold {
+  font-weight: bold;
+}
+.rb_top_row ._r_time span {
+  color: #333333;
+}
+._r_mb5 {
+  margin-bottom: 5px;
+}
+.Receipt_table {
+  width: 100%;
+  font-size: 14px;
+  text-align: center;
+}
+.Receipt_table .th {
+  font-weight: 200 !important;
+}
+._r_mt10 {
+  margin-top: 10px;
+}
+._bg__ {
+  display: inline-block;
+  padding: 2px 8px;
+  color: white;
+  border-radius: 4px;
+}
+._bg_red {
+  background-color: #e95252;
+}
+.zhuiClass {
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 20px;
+  color: #e95252;
+  border: 1px solid #e95252;
+  font-size: 12px;
+}
+._bg_green {
+  background-color: #2bb87c;
+}
+.text_d {
+  text-decoration: underline;
+  cursor: pointer;
+}
+.PingFangSC {
+  font-weight: bold;
+}
+.Bill_par {
+  position: relative;
+}
+tr th,
+tr td {
+  text-align: left;
+  padding-left: 10px;
+}
+tr._item_list {
+  border-bottom: 1px solid #e5e5e5;
+  height: 78px;
+}
+tr._item_list td {
+  border-bottom: 1px solid #e5e5e5;
+  padding: 10px;
+}
+/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
+tr._item_list td:first-child {
+  border-left: 1px solid #e5e5e5;
+}
+tr._item_list td:last-child {
+  border-right: 1px solid #e5e5e5;
+}
+._head_img {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  vertical-align: middle;
+}
+._btn_group {
+  font-size: 14px;
+}
+.icon-daiqueren {
+  color: #4bca81;
+}
+.icon-yiqueren {
+  color: #4bca81;
+}
+.icon-yiquxiao {
+  color: #959595;
+}
+.icon-shenhebohui {
+  color: #e95252;
+}
+.icon-icon-zancun {
+  color: #ff9c01;
+}
+.singeRowTable tr:hover {
+  background-color: white;
+}
+._TradeWayList {
+  padding: 5px 10px;
+  background-color: #eeeeee;
+  border-radius: 4px;
+  margin: 10px 0;
+  width: 190px;
+}
+._bold {
+  font-weight: bold;
+}
+._bank_name,
+._bank_type {
+  display: inline-block;
+  background-color: #333333;
+  color: white;
+  padding: 2px 4px;
+  border-radius: 4px;
+  margin-left: 10px;
+}
+._bank_name {
+  margin-left: 10px;
+}
+._bank_type {
+  background-color: #2aaef2;
+}
+._bank_type2 {
+  background-color: #ff9c01;
+}
+._font_init {
+  color: #333333;
+  font-size: 12px;
+  vertical-align: top;
+}
+.InfoChangeLog {
+  height: auto;
+  max-height: 220px;
+  background-color: #ffffff;
+}
+.changLogList {
+  padding-left: 20px;
+  max-height: 180px;
+  overflow: auto;
+}
+.changLogList_l {
+  border-left: 1px solid #e9e9e9;
+  position: relative;
+  padding-bottom: 10px;
+  padding-left: 20px;
+  padding-top: 10px;
+}
+._radius_green {
+  background-color: #47bf8c;
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  display: inline-block;
+  position: absolute;
+  left: -4px;
+  top: 19px;
+}
+.changLog_time {
+  color: #666666;
+  font-size: 12px;
+  display: inline-block;
+  padding-right: 10px;
+}
+._icon_btn i {
+  width: 28px;
+  height: 28px;
+  display: inline-block;
+  color: white !important;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 28px;
+  margin-right: 10px;
+  cursor: pointer;
+  outline: none;
+}
+._icon_btn i.edit {
+  background-color: #00c6ff;
+  font-size: 16px;
+}
+._icon_btn i.edit:hover {
+  background-color: #59daff;
+}
+._icon_btn i.edit:active {
+  background-color: #00b8ec;
+}
+._icon_btn i.icon-sousuo,
+.icon-zhuanhuan1 {
+  background-color: #47bf8c;
+}
+._icon_btn i.icon-sousuo:hover {
+  background-color: #66bb97;
+}
+._icon_btn i.icon-sousuo:active {
+  background-color: #35ab79;
+}
+._icon_btn i.icon-ico_commodity_defaul {
+  background-color: #f16c3c;
+}
+._icon_btn i.icon-ico_commodity_defaul:hover {
+  background-color: #e87c54;
+}
+._icon_btn i.icon-ico_commodity_defaul:active {
+  background-color: #f76630;
+}
+._icon_btn i.icon-quxiao1 {
+  background-color: #e95252;
+}
+._icon_btn i.icon-quxiao1:hover {
+  background-color: #ea6d6d;
+}
+._icon_btn i.icon-quxiao1:active {
+  background-color: #e42d2d;
+}
+._icon_btn i.icon-zhuanjiao1,
+._icon_btn i.icon-cuishou {
+  background-color: #e6a014;
+  font-size: 16px;
+}
+._icon_btn i.icon-zhuanjiao1:hover,
+._icon_btn i.icon-cuishou:hover {
+  background-color: rgb(235, 184, 84);
+}
+._icon_btn i.icon-zhuanjiao1:active,
+._icon_btn i.icon-cuishou:active {
+  background-color: rgb(223, 150, 6);
+}
+._tag_span {
+  background-color: rgba(64, 158, 255, 0.1);
+  display: inline-block;
+  padding: 0 5px;
+  height: 22px;
+  line-height: 20px;
+  font-size: 12px;
+  color: #409eff;
+  border-radius: 4px;
+  box-sizing: border-box;
+  border: 1px solid rgba(64, 158, 255, 0.2);
+  white-space: nowrap;
+  margin-bottom: 4px;
+}
+._tag_span._tag_warr {
+  background-color: rgba(103, 194, 58, 0.1);
+  border-color: rgba(103, 194, 58, 0.2);
+  color: #67c23a;
+}
+._fex_cen {
+  display: flex;
+  align-items: center;
+}
+._pad5 {
+  padding: 5px 10px;
+}
+._color_gar {
+  color: gray;
+}
+.page_fnDm .query-box li:last-child {
+  top: 97px !important;
+}
+._TCIDAndTCNUMList {
+  display: flex;
+}
+.w216 {
+  width: 216px;
+}
+._icon_btn i.icon-tiaozheng {
+  background-color: #1296db;
+  font-size: 16px;
+}
+._icon_btn i.icon-zhifupeizhiguanli {
+  background-color: #1296db;
+  font-size: 16px;
+}
+
+.boss_btn_tips,
+.boss_btn {
+  text-align: center;
+}
+.boss_btn_tips {
+  padding-bottom: 25px;
+}
+.boss_btn span {
+  color: #2bb87c;
+}
+.cdForm .el-form-item {
+  display: inline-block;
+}
+.leaderPayTable {
+  width: 100%;
+  margin: 10px auto;
+  text-align: center;
+  font-size: 12px;
+  color: #333;
+  border-collapse: collapse;
+  background-color: #fff;
+  border: 1px solid #d1d1d1;
+}
+
+.leaderPayTable th {
+  background: #e6e6e6;
+  padding: 8px 0;
+  color: #333;
+  border: 1px solid #d1d1d1;
+  font-weight: bold;
+}
+
+.leaderPayTable tr td {
+  background-color: #fff;
+  padding: 8px 0;
+  height: 32px;
+  border: 1px solid #d1d1d1;
+  text-align: center;
+}
+
+.leaderPayTable2 tr td {
+  border: 1px solid #ccc;
+  line-height: 17px;
+  height: 25px;
+  font-size: 12px;
+  background: #fff;
+  text-align: center;
+  padding: 0;
+  margin: 0;
+}
+.Myquery-box li {
+  float: left;
+  font-size: 12px;
+  color: #666;
+  margin: 20px 30px 20px 0;
+}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+
+input[type="number"] {
+  -moz-appearance: textfield;
+}
+</style>
 <template>
   <div class="page_MyCustomer MyCustomerDiv page_fnDm">
     <ul class=" _mc_addbox">
@@ -412,7 +893,8 @@
       <el-checkbox v-model="allCheck" @change="changeSelect">全选</el-checkbox>
       <el-button style="margin-left: 10px" type="primary" size="small" @click="eidtItems">批量操作</el-button>
     </div>
-    <div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''"><table v-loading='loading' class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
+    <div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''">
+      <!-- <table v-loading='loading' class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
                 <tr>
                 <th v-if="type == 1"></th>
                 <th>单号</th>
@@ -442,7 +924,207 @@
                 <tr v-if="czList.length==0">
           <td colspan="13">暂无数据</td>
         </tr>
-      </table>
+      </table> -->
+      
+            <table  v-loading='loading' border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-bottom:30px;">
+                <tr class="_t_head">
+                   <!-- <th v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" v-model="isCkedAll"  @click='checkedAll()'></th> -->
+                   <th width="90">{{$t('system.query_company')}}</th>
+                   <th>{{$t('fnc.danhao')}}</th>
+                   <th width="90">{{$t('fnc.djleixing')}}</th>
+                   <th>{{$t('hotel.hotel_corrlelatition')}}</th>
+                   <th>{{$t('fnc.feiyongleixing')}}</th>
+                   <th>{{$t('tips.jiaoyifangshi')}}</th>
+                   <th>{{$t('fnc.jine')}}</th>
+                   <th>{{msg.Type==1? $t('fnc.shoukuan') : $t('fnc.fukuan')}}{{$t('fnc.duixiang')}}</th>
+                   <th width="150">{{$t('fnc.zdrenyuan')}}</th>
+                   <th>{{$t('fnc.dqzhuangtai')}}</th>
+                   <th v-if="type == 1">{{$t('system.table_operation')}}</th>
+                </tr>
+                <tr class="_item_list" v-for="(item,index) in czList">
+                    <!-- <td v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td> -->
+                  <td>{{item.BranchName}}</td>
+                    <td class="Bill_par">
+                        <el-popover
+                            popper-class="detailsIT_Journal"
+                            placement="bottom-start"
+                            trigger="click">
+                                <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                    <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
+                                </template>
+                                <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                    <my-RVB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
+                                </template>
+                                <template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                    <my-GZ-Bill :ID="item.FrID" :width="'1000px'"  :color="colorSon"></my-GZ-Bill>
+                                </template>
+                                <template v-else-if="item.Is_Merge===1&&item.modelShow">
+                                  <my-HB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-HB-Bill>
+                                </template>
+                            <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span>
+                        </el-popover>
+                    </td>
+                    <td>
+                        <span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
+                        <el-tooltip class="item" effect="dark" content="追加团款"  placement="top">
+                           <span v-if="item.OtherType == 1" class="zhuiClass">追</span>
+                        </el-tooltip>
+
+                    </td>
+                    <td class="_number">
+                        <template v-if="item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length>0">
+                            <div class="_TCIDAndTCNUMList">
+                                <span>{{$t('visa.v_tuanhao')}}：</span>
+                                <template v-if="item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length>0">
+                                    <p><span v-for="(i,ix) in item.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span v-if="ix!=item.TCIDAndTCNUMList.length-1">,<br/></span></span></p>
+                                </template>
+                                <template v-else>
+                                    <span>{{$t('fnc.no')}}</span>
+                                </template>
+                            </div>
+                            <p v-if="item.OrderID>0 && item.OrderSource==8">{{$t('fnc.danhao')}}：<span class="">{{item.OrderID}}</span></p>
+                        </template>
+                        <template v-else-if="item.OrderSource==8 &&item.TCIDAndTCNUMList&& item.TCIDAndTCNUMList.length==0">
+                             <p class="_TCIDAndTCNUMList">{{$t('tips.zwtqxinxi')}}</p>
+                        </template>
+                        <template v-else-if="item.OrderSource==4 && item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length==0">
+                          <p class="_TCIDAndTCNUMList text_d"  @click="goTicketPage(item)">{{$t('fnc.jpbianhao')}}：{{item.SourceID}}</p>
+                          <p style="margin-top: 5px;">{{$t('advmanager.v_line')}}：<span>{{item.LineName?item.LineName:$t('tips.jpswxzxianlu')}}</span></p>
+                        </template>
+                        <template v-else-if="item.OrderSource==9 && item.TCIDAndTCNUMList&&item.TCIDAndTCNUMList.length==0">
+                             <p class="_TCIDAndTCNUMList">{{$t('fnc.gnjpqishu')}}：{{item.Term}}</p>
+                        </template>
+                        <template v-else-if="item.OrderSource==10 &&item.TCIDAndTCNUMList&& item.TCIDAndTCNUMList.length==0">
+                             <p class="_TCIDAndTCNUMList">{{$t('fnc.qzbianhao')}}：{{item.SourceID}}</p>
+                        </template>
+                        <template v-else-if="item.OrderSource==11 &&item.TCIDAndTCNUMList&& item.TCIDAndTCNUMList.length==0">
+                             <p class="_TCIDAndTCNUMList">{{$t('fnc.tsbianhao')}}：{{item.SourceID}}</p>
+                        </template>
+                      <template v-else-if="item.OrderSource==12 &&item.TCIDAndTCNUMList&& item.TCIDAndTCNUMList.length==0">
+                             <p class="_TCIDAndTCNUMList">{{$t('fnc.smjpbianhao')}}：{{item.SourceID}}</p>
+                        </template>
+                        <template v-else-if="item.OrderSource==0">
+                             <p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
+                        </template>
+                        <template v-else>
+                             <p class="_TCIDAndTCNUMList">{{$t('active.cl_zanwu')}} </p>
+                        </template>
+                    </td>
+                    <td>
+                        <template v-for="(s,si) in item.CostTypeList">
+                            <span  class="_tag_span">{{s}}</span><br/>
+                        </template>
+                    </td>
+                    <td class="_number">
+                        <template v-if="item.TradeWayList&&item.TradeWayList.length>0">
+                            <div class="_TradeWayList"   v-for="(tw,twIn) in item.TradeWayList">
+                                <p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type" :class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span> </p>
+                                <p>{{tw.BankNo}}</p>
+                            </div>
+                        </template>
+                        <template v-else>
+                            <div class="_pad5">
+                                {{$t('fnc.no')}}
+                            </div>
+                        </template>
+                    </td>
+                    <td>
+                        <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.Money)}}</span></p>
+                        <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
+                    </td>
+                    <td>
+                        <template v-if='item.Type===1'>
+                        <span class="_color_gar">{{$t('fnc.huikuanren')}}：</span><span>{{item.RemitterName}}</span>
+                        </template>
+                        <template v-if='item.Type===2'>
+                        <span class="_color_gar">{{$t('fnc.fkduixiang')}}：</span><span>{{item.RemitterName}}</span>
+                        </template>
+                        <template v-if='item.Type===4'>
+                        <span class="_color_gar">{{$t('fnc.no')}}</span>
+                        </template>
+                    </td>
+                    <td valign="middle">
+                        <img class="_head_img" :src="item.EmPhoto" alt="">
+                        <span>{{item.EmName}}</span>
+                        <div>{{item.CreateDate}}</div>
+                    </td>
+                    <td class="_btn_group">
+                        <i v-if="item.Status==1" class="iconfont icon-daiqueren"></i>
+                        <i v-if="item.Status==4" class="iconfont icon-yiquxiao"></i>
+                        <i v-if="item.Status==2" class="iconfont icon-yiqueren"></i>
+                        <i  v-if="item.Status==3" class="iconfont icon-shenhebohui"></i>
+                        <i  v-if="item.Status==0 || item.Status==5" class="iconfont icon-zancun"></i>
+                        <el-popover
+                            popper-class="detailsIT_Journal"
+                            width="250"
+                            trigger="click">
+                                <div class="InfoChangeLog" >
+                                    <div class="changLog">
+                                        <p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
+                                        <ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
+                                            <li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
+                                                <span style="background-color: #47BF8C"  class="_radius_green"></span>
+                                                <p> <span class="_color_blue">{{log.EmName}}</span>  <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
+                                                <p class="_dtel">{{log.StartValue}}</p>
+                                            </li>
+                                        </ul>
+                                        <ul v-else>
+                                            <li>{{$t('hotel.hotel_zanwu')}}</li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            <span slot="reference" class="text_d _font_init"  @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
+                        </el-popover>
+                    </td>
+                <td v-if="type == 1">
+                    <el-button size="small" type="primary" @click="checkFinance(item)">结算</el-button>
+                </td>
+                    <!-- <td class="_icon_btn">
+                        <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')"  placement="top">
+                            <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex, item)"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')"  placement="top">
+                            <i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
+                            <i class="iconfont icon-sousuo" v-if='item.Type===4' @click="goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item"  effect="dark" :content="$t('fnc.shenhe')"   placement="top">
+                            <i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item"  effect="dark" content="催审"   placement="top">
+                            <i v-if="msg.Conditon==1 && item.IsFinancePushOn==1" class="iconfont icon-cuishou" @click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item"  effect="dark" :content="$t('fnc.zhuanjiao')"   placement="top">
+                            <i v-if="msg.Conditon==3 && !BOSSBtn2" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
+                        </el-tooltip>
+                        <el-tooltip  class="item" effect="dark" content="转交"  placement="top">
+                            <i v-if="msg.Conditon==7" class="iconfont icon-zhuanhuan1" @click="getExchange(item.FrID)"></i>
+                        </el-tooltip>
+                        <el-tooltip  class="item" effect="dark" :content="$t('active.cl_zuofei')"  placement="top">
+                            <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
+                        </el-tooltip>
+                         <el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1"  class="item" :content="$t('fnc.tzjyriqi')"  placement="top">
+                            <i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
+                        </el-tooltip>
+                        <el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
+                            <i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
+                              @click="showjiaoyi(item.FrID)"></i>
+                          </el-tooltip>
+                        <el-tooltip class="item" content="手续费设置" placement="top"
+                        v-if="active==2 && item.Type==1 &&(istransaction == true || isJapanCommission == true)">
+                          <i class="iconfont icon-zhifupeizhiguanli"
+                            @click="showTranTax(item.FrID,'1')"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item" content="付款对象设置" placement="top" v-if="(active==2 || active==3)&& istransaction == true && item.Type==2">
+                          <i class="iconfont icon-zhifupeizhiguanli"
+                            @click="showTranTax(item.FrID,'2')"></i>
+                        </el-tooltip>
+                        <el-tooltip class="item" content="修改汇率" placement="top" v-if="(active==2 || active==3) && F_Update_CurrencyRate == true">
+                          <i class="iconfont icon-money" style="background-color: #47BF8C;color: white;"
+                            @click="showhuilv(item)"></i>
+                        </el-tooltip>
+                    </td> -->
+                </tr>
+            </table>
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
         layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
       </el-pagination>
@@ -483,9 +1165,25 @@
   </div>
 </template>
 <script>
+import myBill from "../FinancialModule/FinancialSubmodule/BillModule.vue";
+import myrbvBill from "../FinancialModule/FinancialSubmodule/ReceivablesModule.vue";
+import myhrBill from "../FinancialModule/FinancialSubmodule/MergeBillModule.vue";
+import myGZBill from "../FinancialModule/FinancialSubmodule/GZBillModule.vue";
   export default {
+  components: {
+    "my-Bill": myBill,
+    "my-RVB-Bill": myrbvBill,
+    "my-HB-Bill": myhrBill,
+    "my-GZ-Bill": myGZBill,
+  },
     data() {
       return {
+      colorSon: "#f5f5f5",
+      widthSon: "700px",
+      active: 1,
+        ActionMenuCode: [],
+      LogLoading: false,
+        GetFinancLogList: [],
         uploadLoading: false,
         totalData: {},
       allCheck: false,
@@ -540,6 +1238,26 @@
       }
     },
     methods: {
+    Financial_post_GetFinancLogList(id) {
+      // 获取单据日志
+      if (this.checkboxShow) return;
+      this.LogLoading = true;
+      this.apipost(
+        "Financial_post_GetFinancLogList",
+        { ID: id, Type: 2 },
+        res => {
+          if (res.data.resultCode == 1) {
+            let data = res.data.data;
+            data.forEach(x => {
+              x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate);
+            });
+            this.LogLoading = false;
+            this.GetFinancLogList = data;
+          }
+        },
+        err => {}
+      );
+    },
     changeSelect() {
       console.log("changeSelect");
       this.czList.forEach((element) => {
@@ -689,6 +1407,23 @@
       },
     },
     mounted() {
+    let userinfo = this.getLocalStorage();
+    let ActionMenuCode = userinfo.ActionMenuCode;
+    if (ActionMenuCode.indexOf("F_AccountantFinanceMerge") != -1) {
+      this.hbShow = true;
+    }
+    if (ActionMenuCode.indexOf("F_HandWithFee") != -1) {
+      this.HandShow = true;
+    }
+    if (ActionMenuCode.indexOf("F_Trademodify") != -1) {
+      this.istransaction = true;
+    }
+    if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
+      this.F_Update_CurrencyRate=true;
+    }
+    if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
+      this.isJapanCommission=true;
+    }
       this.msg.CustomerId = this.$route.query.id
       this.getList()
       this.getTotalData()