1

src/components/FinancialModule/BasicDocuments.vue

@@ -1789,6 +1789,16 @@ class="w135 _border_b_1">
                   </div>
                 </div>
               </div>
+              <div v-if="isShowAttachment&&item.AuditDescription.indexOf('出纳')!=-1" style="display: flex;margin-top: 10px;">
+                <div style="display: flex;align-items: center;">
+                  <span style="font-size: 14px;">流水科目：</span>
+                  <div>
+                    <el-select v-model="AuditOrRefundMsg.BankSubjectId" :placeholder="$t('pub.pleaseSel')" clearable filterable  style="width: 100%;">
+                      <el-option v-for="item in BankSubjectList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+                    </el-select>
+                  </div>
+                </div>
+              </div>
               <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
                 v-model="AuditOrRefundMsg.Description" :placeholder="$t('pub.pleaseImport')+'...'"></textarea>
               <!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" :placeholder="$t('pub.pleaseImport')+'...'"></textarea> -->
@@ -2350,7 +2360,8 @@ class="w135 _border_b_1">
           FCostTypeId:'1851',
           BankAccountId:'40',
           AccountNumber:'',
-          CheckPeriod:''
+          CheckPeriod:'',
+          BankSubjectId:''
         },
         AuditListData: {
           AuditList: []
@@ -2466,6 +2477,7 @@ class="w135 _border_b_1">
         clientBankAccountData:{},
         helpBranchData:{},
         isSeeOrderLog:0,
+        BankSubjectList:[]
       }
     },
     components: {
@@ -4089,7 +4101,9 @@ else if (Type==2) {
             }
             this.GetDetail.AuditSteps.forEach(x => {
               if (x.NextStep == 1 && (x.SpecialNode == 1 || x.SpecialNode == 2)) {
-                this.isShowAttachment = true
+                this.isShowAttachment = true;
+                this.getSubjectList();
+                if(this.GetDetail.BankSubjectId&&this.GetDetail.BankSubjectId>0){this.AuditOrRefundMsg.BankSubjectId = this.GetDetail.BankSubjectId;}
               }
             })
             this.StandCurrBranchId = this.GetDetail.RB_Branch_Id
@@ -4383,6 +4397,14 @@ else if (Type==2) {
           }
         });
       },
+      getSubjectList(){
+          this.apipost('Financial_post_GetBankSubjectList',{}, res => {
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data;
+                    this.BankSubjectList = data;
+                }
+            }, err => {})
+        },
     },
     created() {
       if (this.$route.query.pageIndex) {

src/components/FinancialModule/accDetail/AccountStatementDetail.vue

@@ -135,13 +135,26 @@
                           <el-switch v-model="msg.IsSelectCNTG" inactive-text="" active-value="true" ></el-switch>
                             </el-form-item>
                     </el-col>
-
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="流水对账科目">
+                            <el-select  filterable  v-model='msg.BankSubjectId'>
+                                <el-option label="不限" :value='0'></el-option>
+                                <el-option label="只看未绑定" :value='-2'></el-option>
+                                <el-option v-for='item in SubjectList'
+                                    :label='item.Name'
+                                    :value='item.Id'
+                                    :key='item.Id'>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
 			<ul>
 				<li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
           <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click="Export"/>
+          <input type="button" class="normalBtn" value="绑定流水科目"  @click="showSubject=true"/>
           </li>
 			</ul>
 		</div>
@@ -151,6 +164,7 @@
                     <th width="60"><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()"/></th>
                     <th>{{$t('fnc.jiaoyiriqi')}}</th>
                     <th>{{$t('fnc.djleixing')}}</th>
+                    <th>流水科目</th>
                     <th width="440">{{$t('objFill.v101.FinancialModule.guanldhhbsh')}}</th>
                     <th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th>
                     <th>{{$t('hotel.hotel_Currency')}}</th>
@@ -160,7 +174,7 @@
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="9">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
                     <td>{{moneyFormat(StartMoney)}}</td>
                 </tr>
                 <tr v-for="(item,index) in DataList">
@@ -170,6 +184,7 @@
                     <td>{{item.AllotDate}}</td>
                     <td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
                     <!-- <td>{{item.FrIdStr}}</td> -->
+                    <td>{{item.SubjectName}}</td>
                     <td>
                       <span v-for="(qitem,qindex) in item.FrIdList" class="cursorpointer" :class="item.FType === 1 ? 'CAcc_bg_green' :item.FType === 2 ? 'CAcc_bg_red':'CAcc_bg_bule'" @click="goUrlNew(item.FType,qitem)">{{(qindex>0?',':'') + qitem}}</span>
                     </td>
@@ -181,7 +196,7 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="8">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
                     <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
                     <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
                     <td>{{ moneyFormat(allMoney) }}</td>
@@ -189,6 +204,24 @@
             </table>
         </div>
 
+        <!-- 修改科目 -->
+        <el-dialog title="修改流水科目" width="300px" :visible.sync="showSubject" center>
+        <el-form class="cdForm" label-width="90px">
+          <el-form-item label="流水科目" prop="SubjectId">
+            <template>
+              <el-select filterable v-model='SubjectId' :placeholder="$t('pub.pleaseSel')" class="w135 _border_b_1">
+                <el-option v-for='item in SubjectList' :label='item.Name' :value='item.Id' :key='item.Id'>
+                </el-option>
+              </el-select>
+            </template>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="hollowFixedBtn" @click="showSubject=false">{{$t('pub.cancelBtn')}}</el-button>
+          <el-button class="normalBtn" type="primary" @click="BindSubject()">{{$t('pub.sureBtn')}}</el-button>
+        </div>
+      </el-dialog>
+
     </div>
 </template>
 <script>
@@ -221,6 +254,7 @@ export default {
                 BankList:[],
                 Is_Cashier:-1,
                 IsSelectCNTG:false,
+                BankSubjectId:0
             },
             Type:1,
             AccountId:'',
@@ -278,6 +312,9 @@ export default {
             isCheckAll:false,
             //是否显示全选框
             isShowCheckAll:false,
+            showSubject:false,
+            SubjectId:0,
+            SubjectList:[]
         }
     },
     created(){
@@ -313,7 +350,7 @@ export default {
                     Type:this.Type,
                     AccountId:this.AccountId
                 })
-      this.bankaccount_post_GetList();
+      this.bankaccount_post_GetList();      
       this.getList();
 
     }
@@ -393,6 +430,14 @@ export default {
                 }
             }, err => {})
         },
+        getSubjectList(){
+          this.apipost('Financial_post_GetBankSubjectList',{}, res => {
+                if(res.data.resultCode == 1) {
+                    let data = res.data.data;
+                    this.SubjectList = data;
+                }
+            }, err => {})
+        },
         BankAccount_post_GetAccountType(){   //获取账户类型列表
             this.apipost('BankAccount_post_GetAccountType',{}, res => {
                 if(res.data.resultCode == 1) {
@@ -625,6 +670,27 @@ export default {
           }
         }, err => {})
       },
+      //绑定科目
+      BindSubject(){
+        let FrIdList =[];
+        this.DataList.forEach((x,index)=>{
+          if(x.check){
+            FrIdList.push(x.FrIdStr)
+          }
+        })
+        if(FrIdList.length<=0){ this.$message.error('请选择单据后再试');return;}
+        if(this.SubjectId<=0){this.$message.error('请选择科目后再试');return;}
+
+        this.apipost('Financial_post_SetBatchFBankSubject',{SubjectId:this.SubjectId,FrIds:FrIdList.join(',')}, res => {
+                if(res.data.resultCode == 1) {
+                  this.$message.success(res.data.message);
+                  this.showSubject=false;
+                  this.getList();
+                }else{
+                  this.$message.error(res.data.message)
+                }
+            }, err => {})
+      }
     },
     mounted(){
 
@@ -632,6 +698,7 @@ export default {
         this.AccountType_post_GetList();
         this.BankAccount_post_GetAccountType();
         this.Financial_post_GetBranchAccountList();
+        this.getSubjectList();
     }
 }
 </script>

src/components/FinancialModule/platformFinancial.vue

@@ -151,6 +151,12 @@
               <span v-else>{{ scope.row.ComplaintMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="ptRemark" label="平台余额" sortable>
+            <template slot-scope="scope">
+              <span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.Remark }}</span>
+              <span v-else>{{ scope.row.Remark }}</span>
+            </template>
+          </el-table-column>
         </el-table>
 
       </div>