1

src/components/FinancialModule/BasicDocuments.vue

@@ -872,7 +872,7 @@
               <span style="text-decoration: underline;"
                 @click="goHand(2,GetDetail)">相关单据：{{GetDetail.ReFinanceId}}</span>
             </span>
-            <span v-if="GetDetail.OtherType==71" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
+            <span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
               <span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span>
             </span>
             <!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
@@ -1263,7 +1263,7 @@
               v-if="son.AuditStatus!=2 && MsgUrl">
               <span class="_sm">
                 <p class="_name">
-                  <span class="_n">{{son.AuditName}}</span>
+                  <span class="_n">{{son.AuditName}}ffffffffffff</span>
                   <span class="_sm" v-if="son.AuditStatus==1">待审</span>
                   <span class="_sn" v-if="son.AuditStatus==2">通过</span>
                   <span class="_m" v-if="son.AuditStatus==4">驳回</span>
@@ -1276,6 +1276,7 @@
                 </template>
               </span>
             </div>
+            <div><span>ffffffffffffff</span></div>
             <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
               v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
             <div v-else-if="item.SpecialNode!==0&&AuditOrRefundMsg.Status=='5'">
@@ -1566,6 +1567,25 @@
                     <p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
                   </div>
                 </template>
+                <span v-if="GetDetail.RB_Branch_Id == 1220 && GetDetail.IsShowFY==0 && (GetDetail.TemplateId == 247 || GetDetail.TemplateId == 245) && son.AuditEmId == 2739"> 
+                    &nbsp;&nbsp;&nbsp; <span style="color:red">*返佣制单</span>：<el-checkbox v-model="AuditOrRefundMsg.AutoFinanceType" :true-label="1" :false-label="0" ></el-checkbox>
+                    <el-select v-if="AuditOrRefundMsg.AutoFinanceType==1" filterable v-model='AuditOrRefundMsg.FCostTypeId' class=" _border_b_1" style="width:130px">
+                          <el-option label='房费送客手数料' value='1851' key='1851'></el-option>
+                          <el-option label='餐费送客手数料' value='1852' key='1852'></el-option>
+                          <el-option label='门票送客手数料' value='1853' key='1853'></el-option>
+                      </el-select>
+                      <el-select v-if="AuditOrRefundMsg.AutoFinanceType==1" filterable v-model='AuditOrRefundMsg.BankAccountId' class=" _border_b_1" style="width:150px">
+                          <el-option label='兹贺银行25440' value='40' key='40'></el-option>
+                          <el-option label='京都银行1080738 ' value='44' key='44'></el-option>
+                          <el-option label='京都银行1070078' value='45' key='45'></el-option>
+                          <el-option label='兹贺银行975121' value='46' key='46'></el-option>
+                          <el-option label='PIC瑞穗銀行みずほ' value='109' key='109'></el-option>
+                      </el-select>
+                      <span v-if="AuditOrRefundMsg.AutoFinanceType==1">返佣金额：</span>
+                      <el-input v-if="AuditOrRefundMsg.AutoFinanceType==1"  v-model="AuditOrRefundMsg.FinanceMoney" class="w80" placeholder="请输入返佣金额" />
+                  </span>
+                  <br/>
+                  <span v-if="AuditOrRefundMsg.AutoFinanceType==1" style="font-size:12px;color: green">注释：此处返佣制单为台湾请求书未标记返佣金额，需日本自行设置返佣金额，系统会自动创建返佣收入单</span>
               </p>
               <!-- 出纳审核 -->
               <div v-if="GetDetail.Type==1&&isShowAttachment&&item.AuditDescription.indexOf('出纳')!=-1" style="display: flex;margin-top: 10px;">
@@ -1836,6 +1856,18 @@
                       </el-date-picker>
                     </td>
                   </tr>
+                  <!-- <tr v-if="GetDetail.RB_Branch_Id == 1220 && GetDetail.TemplateId == 245">
+                    <td>返佣 &nbsp; <el-checkbox v-model="AuditOrRefundMsg.AutoFinanceType" :true-label="1" :false-label="0" ></el-checkbox></td>
+                    <td colspan="7">
+                      <el-select v-if="AuditOrRefundMsg.AutoFinanceType==1" filterable v-model='AuditOrRefundMsg.FCostTypeId' class=" _border_b_1">
+                          <el-option label='房费送客手数料' value='1851' key='1851'></el-option>
+                          <el-option label='餐费送客手数料' value='1852' key='1852'></el-option>
+                          <el-option label='门票送客手数料' value='1853' key='1853'></el-option>
+                      </el-select>
+                      <span v-if="AuditOrRefundMsg.AutoFinanceType==1">返佣金额：</span>
+                      <el-input v-if="AuditOrRefundMsg.AutoFinanceType==1"  v-model="AuditOrRefundMsg.FinanceMoney" class="w80" placeholder="请输入返佣金额" />
+                    </td>
+                  </tr> -->
                 </table>
               </div>
               <div class="_upload_box">
@@ -2082,6 +2114,10 @@
           PayReceiptNo: '',
           KingdeeInvoice: '0',
           KingdeeInvoiceState: '1',
+          AutoFinanceType:'0',
+          FinanceMoney:0,
+          FCostTypeId:'1851',
+          BankAccountId:'40'
         },
         AuditListData: {
           AuditList: []

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -896,7 +896,7 @@
                 <span style="text-decoration: underline;"
                   @click="goHand(2,GetDetail)">相关单据：{{GetDetail.ReFinanceId}}</span>
               </span>
-              <span v-if="GetDetail.OtherType==71" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
+              <span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
                 <span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span>
               </span>
               <!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;">