1

src/components/FinancialModule/BankStatementReconciliation/index.vue

@@ -125,12 +125,33 @@
         <div class='query-box'>
             <el-form class="_info_box clearfix"  label-width="110px">
                 <el-row style="padding: 10px 0 0 0;">
+                    <!-- <el-col :span="4" :gutter="35">
+                        <el-form-item :label="$t('fnc.zhanghuleixing')">
+                            <el-select  filterable  v-model='accType' @change="getAccountList(msg.BankType),msg.BankId=''">
+                                <el-option v-for='item in AccList'
+                                    :label='item.Name'
+                                    :value='item.ID'
+                                    :key='item.ID'>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col> -->
+                    <el-col :span="4" :gutter="35">
+                      <el-form-item :label="$t('tips.jiaoyifangshi')">
+                        <el-select filterable v-model='msg.BankType'
+                          @change="getAccountList(msg.BankType),msg.BankId=''">
+                          <el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                          <el-option v-for='item in BranchAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
                     <el-col :span="4" :gutter="35">
                         <el-form-item :label="$t('fnc.zhanghuleixing')">
                             <el-select filterable  v-model='msg.BankId' 
                             @change="getList">
-                                <el-option v-for='item in AccList'
-                                    :label='item.Name'
+                                <el-option v-for='item in accountList'
+                                    :label='item.Alias'
                                     :value='item.ID'
                                     :key='item.ID'>
                                 </el-option>
@@ -149,9 +170,11 @@
                                 </el-date-picker>
                             </el-form-item>
                     </el-col>
-
                 </el-row>
             </el-form>
+        <div>
+            <span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span>
+        </div>
 			<ul>
 				<li>
                     <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
@@ -254,11 +277,20 @@ export default {
                 BankId:1,
                 StartDate:'',
                 EndDate:'',
+                BankType:1
             },
             AccList: [
-                {Name: '和工',ID: 1},
-                {Name: '中信',ID: 35},
+                {Name: '公帐账户',ID: 3},
+                {Name: '私帐账户',ID: 4},
+                {Name: '现金账户',ID: 8},
+                {Name: '微信支付宝',ID: 13},
+            ],
+            BranchAccountList:[
+                {Name: '银行',ID: 1},
+                {Name: '现金',ID: 3},
             ],
+            accountList:[],
+            accType:0,
             loadingTable:false,
             DateList: [],
             SubjectList: [],
@@ -305,7 +337,8 @@ export default {
         this.msg.EndDate=mon1;
         let userInfo = this.getLocalStorage();
         this.userId = userInfo.EmployeeId;
-        this.getSubjectList()
+        this.getSubjectList();
+        this.getAccountList(1);
         this.getList();
   },
   methods:{
@@ -315,7 +348,8 @@ export default {
           name: "AccountStatementDetail",
           query: {
             ID: this.msg.BankId,
-            TypeId: 3,
+            Type: this.msg.BankType,
+            TypeId: 0,
             sTradeDate: item.StartDate,
             eTradeDate: item.StartDate,
             SubjectId: row.SubjectId>0?row.SubjectId:-2,
@@ -458,6 +492,42 @@ export default {
             this.titleEnd = this.msg.EndDate.slice(5,7)>9?this.msg.EndDate.slice(5,7):this.msg.EndDate.slice(6,7)
             this.getList()
         },
+        getAccountList(i){
+          if(i===1){
+            this.bankaccount_post_GetListS()
+          }
+          if(i===3){
+            this.BankAccount_post_GetCashAccountList()
+          }
+          
+        },
+        BankAccount_post_GetCashAccountList(){  // 获取现金账户
+          let msg = {
+            TypeId:this.accType,
+            BranchId:-1,
+            Alias:''
+          };
+          this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
+            if(res.data.resultCode === 1) {
+              let data = res.data.data;
+              data.forEach(x=>{
+                x.allName = x.Alias;
+              });
+              this.accountList = data;
+            }
+          }, err => {})
+        },
+        bankaccount_post_GetListS(){  // 获取银行账户
+          this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
+            if(res.data.resultCode === 1) {
+              let data = res.data.data;
+              data.forEach(x=>{
+                x.allName = x.Alias+' '+x.BackNo;
+              });
+              this.accountList = data;
+            }
+          }, err => {})
+        },
         
     },
     mounted(){

src/components/FinancialModule/accDetail/AccountStatementDetail.vue

@@ -175,7 +175,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>{{moneyFormat(StartMoney)}}</td>
                 </tr>
                 <tr v-for="(item,index) in DataList">
@@ -198,7 +198,7 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="8">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="9">{{$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>
@@ -342,7 +342,12 @@ export default {
                     Type:this.Type,
                     AccountId:this.AccountId
                 })
-      this.bankaccount_post_GetList();      
+      if(this.$route.query.Type){this.Type=parseInt(this.$route.query.Type)}
+      if(this.Type==1){
+        this.bankaccount_post_GetList();      
+      }else if(this.Type==3){
+        this.BankAccount_post_GetCashAccountList();
+      }
       this.getList();
 
     }