Skip to content

C
confucius
Commit 9b6a2b4e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent dea98545
Show whitespace changes
Inline Side-by-side
Showing with 2629 additions and 1942 deletions
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 9b6a2b4e
<style> <style>
@import "../css/cssReset.css"; @import "../css/cssReset.css";
.page_CompanyAccDetail .query-box li label{display: inline-block;min-width: 80px;text-align: right;font-style: normal;margin: 0 20px 0 0;}
.page_CompanyAccDetail .query-box{ .page_CompanyAccDetail .query-box li label {
display: inline-block;
min-width: 80px;
text-align: right;
font-style: normal;
margin: 0 20px 0 0;
}
.page_CompanyAccDetail .query-box {
padding-bottom: 0; padding-bottom: 0;
margin-top: 20px; margin-top: 20px;
} }
.page_CompanyAccDetail .query-box li:last-child{top: 48px;}
._shoufu_date input.el-input__inner{padding: 0px 0 0 27px;} .page_CompanyAccDetail .query-box li:last-child {
.page_CompanyAccDetail .el-date-editor .el-range-separator{width: 9% !important;} top: 48px;
.page_CompanyAccDetail .el-date-editor--daterange.el-input__inner{width: auto !important;} }
._bg__{
._shoufu_date input.el-input__inner {
padding: 0px 0 0 27px;
}
.page_CompanyAccDetail .el-date-editor .el-range-separator {
width: 9% !important;
}
.page_CompanyAccDetail .el-date-editor--daterange.el-input__inner {
width: auto !important;
}
._bg__ {
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
} }
._bg__ .CAcc_bg_red:hover{
._bg__ .CAcc_bg_red:hover {
color: rgb(230, 97, 97); color: rgb(230, 97, 97);
} }
._bg__ .CAcc_bg_green:hover{
color:rgb(66, 182, 132); ._bg__ .CAcc_bg_green:hover {
color: rgb(66, 182, 132);
}
.page_CompanyAccDetail .CAcc_bg_red {
color: #E95252;
} }
.page_CompanyAccDetail .CAcc_bg_red{color: #E95252;}
.page_CompanyAccDetail .CAcc_bg_green{color: #2BB87C} .page_CompanyAccDetail .CAcc_bg_green {
._addChuNa_tit{color: gray;margin-bottom: 10px;} color: #2BB87C
._addChuNa_tit span{ color:#333333} }
.page_CompanyAccDetail ._addUpload_box{
._addChuNa_tit {
color: gray;
margin-bottom: 10px;
}
._addChuNa_tit span {
color: #333333
}
.page_CompanyAccDetail ._addUpload_box {
display: block; display: block;
margin-top: 20px; margin-top: 20px;
width:590px; width: 590px;
} }
.page_CompanyAccDetail ._addUpload_box>div{
.page_CompanyAccDetail ._addUpload_box>div {
float: left; float: left;
width: 138px; width: 138px;
height: 92px; height: 92px;
border: 1px dashed rgba(210,210,210,1); border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px; border-radius: 2px;
cursor: pointer; cursor: pointer;
padding: 5px; padding: 5px;
margin:0 10px 10px 0; margin: 0 10px 10px 0;
position: relative; position: relative;
} }
.page_CompanyAccDetail .el-upload-dragger { .page_CompanyAccDetail .el-upload-dragger {
width: 126px!important; width: 126px !important;
height: 80px!important; height: 80px !important;
} }
.page_CompanyAccDetail ._addUpload_box .icon-guanbi1 { .page_CompanyAccDetail ._addUpload_box .icon-guanbi1 {
font-size: 12px; font-size: 12px;
color: white; color: white;
...@@ -59,10 +99,12 @@ ...@@ -59,10 +99,12 @@
text-align: center; text-align: center;
line-height: 20px; line-height: 20px;
} }
.page_CompanyAccDetail ._addUpload_box .icon-guanbi1:hover { .page_CompanyAccDetail ._addUpload_box .icon-guanbi1:hover {
font-size: 12px; font-size: 12px;
color: #c94052; color: #c94052;
} }
</style> </style>
<template> <template>
<div class='flexOne page_CompanyAccDetail page-body'> <div class='flexOne page_CompanyAccDetail page-body'>
...@@ -72,10 +114,7 @@ ...@@ -72,10 +114,7 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')"> <el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList"> <el-select filterable v-model='accType' @change="bankaccount_post_GetList">
<el-option v-for='item in AccList' <el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -83,10 +122,7 @@ ...@@ -83,10 +122,7 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.a_yhzhanghu')"> <el-form-item :label="$t('fnc.a_yhzhanghu')">
<el-select filterable v-model='AccountId' @change="accountListChange"> <el-select filterable v-model='AccountId' @change="accountListChange">
<el-option v-for='item in accountList' <el-option v-for='item in accountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
:label='item.Alias'
:value='item.ID'
:key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -102,7 +138,7 @@ ...@@ -102,7 +138,7 @@
</el-col> --> </el-col> -->
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.a_djztai')"> <el-form-item :label="$t('fnc.a_djztai')">
<el-select filterable v-model='msg.Status' > <el-select filterable v-model='msg.Status'>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option :label='$t("fnc.a_shezhong")' :value='1'></el-option> <el-option :label='$t("fnc.a_shezhong")' :value='1'></el-option>
<el-option :label='$t("visa.v_tongguo")' :value='2'></el-option> <el-option :label='$t("visa.v_tongguo")' :value='2'></el-option>
...@@ -114,52 +150,40 @@ ...@@ -114,52 +150,40 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.fkduixiang')"> <el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' @change='getClientId(msg.ClientID)'> <el-select filterable v-model='msg.ClientID' @change='getClientId(msg.ClientID)'>
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList' :label='`${item.AccountAlias}(${item.AccountHolder})`'
:label='`${item.AccountAlias}(${item.AccountHolder})`' :value='item.ID' :key='item.ID'>
:value='item.ID'
:key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="8" :gutter="35">
<el-form-item :label="$t('fnc.a_hkfkriqi')"> <el-form-item :label="$t('fnc.a_hkfkriqi')">
<el-date-picker class="h34" <el-date-picker class="h34" @change="timeAdd" v-model="productionDate" type="daterange"
@change="timeAdd" value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="8" :gutter="35">
<el-form-item label="发团日期"> <el-form-item label="发团日期">
<el-date-picker class="h34" <el-date-picker class="h34" @change="timeAddByTC" v-model="productionDateByTC" type="daterange"
@change="timeAddByTC" value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="费用类型"> <el-form-item label="费用类型">
<el-select filterable v-model='msg.CostTypeID' > <el-select filterable v-model='msg.CostTypeID'>
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option> <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="所属校区"> <el-form-item label="所属校区">
<el-select filterable v-model='msg.RB_Branch_Id' > <el-select filterable v-model='msg.RB_Branch_Id'>
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -167,20 +191,22 @@ ...@@ -167,20 +191,22 @@
<el-col :span="6" :gutter="35"> <el-col :span="6" :gutter="35">
<el-form-item style="float:right"> <el-form-item style="float:right">
<!-- <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> --> <!-- <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> -->
<q-btn color="primary" size="11px" :label="$t('fnc.a_hbdanju')" @click="addChuNaFun" style="marginRight:10px"/> <q-btn color="primary" size="11px" :label="$t('fnc.a_hbdanju')" @click="addChuNaFun" style="marginRight:10px" />
<!-- <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> --> <!-- <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px"/> <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px" />
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/> --> <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/> -->
<q-btn color="primary" size="11px" :label="$t('visa.v_daochu')" @click="Export"/> <q-btn color="primary" size="11px" :label="$t('visa.v_daochu')" @click="Export" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div class="cm_content"> <div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loadingTable"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loadingTable">
<tr> <tr>
<th width="60"><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()"/></th> <th width="60"><input type="checkbox" v-if="isShowCheckAll" v-model="isCheckAll" @change="checkAllOrder()" />
</th>
<th>{{$t('system.query_company')}}</th> <th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th> <th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.a_zhaiyao')}}</th> <th>{{$t('fnc.a_zhaiyao')}}</th>
...@@ -204,11 +230,13 @@ ...@@ -204,11 +230,13 @@
<td>{{ item.BName }}</td> <td>{{ item.BName }}</td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'CAcc_bg_green':'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> --> <!-- <td><span class="cursorpointer" :class="item.Type==1?'CAcc_bg_green':'CAcc_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td> <td>
<span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span> <span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'"
@click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td> </td>
<td> <td>
<p>{{item.CostTypeName}}</p> <p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.ClassName }} ( <span> {{ son.ClassId }} </span> )</span> </p> <p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.ClassName }} ( <span> {{ son.ClassId }}
</span> )</span> </p>
</td> </td>
<td> <td>
<span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}：{{ item.RemitterName }}</span> <span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}：{{ item.RemitterName }}</span>
...@@ -226,18 +254,21 @@ ...@@ -226,18 +254,21 @@
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td> <td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }}
{{$t('hotel.hotel_item')}}）</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td> <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td> <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td> <td>{{ moneyFormat(allMoney) }}</td>
</tr> </tr>
</table> </table>
</div> </div>
<el-dialog custom-class='w750 height="34px"' :title="$t('fnc.a_hbdanju')" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750 height="34px"' :title="$t('fnc.a_hbdanju')" :visible.sync="addChuNa" center
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p> :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span>
{{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template> <template>
<tr > <tr>
<th height="34px">{{$t('fnc.zhfenlei')}}</th> <th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th> <th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th> <th height="34px">{{$t('fnc.acc')}}</th>
...@@ -265,79 +296,69 @@ ...@@ -265,79 +296,69 @@
<tr v-else class="_show_class"> <tr v-else class="_show_class">
<td> <td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1"> <el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT' <el-option v-for='i in AccListT' :label='i.Name' :value='i.Name' :key='i.ID'>
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1"> <el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType' <el-option v-for='i in GetAccountType' :label='i.Name' :value='i.ID' :key='i.ID'>
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1"> <el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')"
<el-option v-for='i in accountList' @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
:label='i.allName' <el-option v-for='i in accountList' :label='i.allName' :value='i.ID' :key='i.ID'>
:value='i.ID'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)" @blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input> <el-input v-model="item.OriginalMoney" @change="Calculation(1,index)"
@blur="item.show=false,CalculationMoney" :placeholder="$t('rule.qsrjine')" type="number"
class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{item.CurrenName}}</p> <p>{{item.CurrenName}}</p>
</td> </td>
<td> <td>
<el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney" @change="Calculation(1,index)" type="number" class=" _border_b_1"></el-input> <el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney" @change="Calculation(1,index)"
type="number" class=" _border_b_1"></el-input>
</td> </td>
<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney" class="_delete_row iconfont icon-img_delete_small"></i></td> <td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney"
class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr> </tr>
</template> </template>
<tr> <tr>
<td> <td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1"> <el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT' <el-option v-for='i in AccListT' :label='i.Name' :value='i.Name' :key='i.ID'>
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1"> <el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType' <el-option v-for='i in GetAccountType' :label='i.Name' :value='i.ID' :key='i.ID'>
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1"> <el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')"
<el-option v-for='i in accountList' @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
:label='i.allName' <el-option v-for='i in accountList' :label='i.allName' :value='i.ID' :key='i.ID'>
:value='i.ID'
:key='i.ID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input> <el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()"
:placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{payMsg.CurrenName}}</p> <p>{{payMsg.CurrenName}}</p>
</td> </td>
<td> <td>
<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input> <el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number"
class=" _border_b_1"></el-input>
</td> </td>
<td>{{moneyFormat(payMsg.allMoney)}}</td> <td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr> </tr>
...@@ -345,20 +366,16 @@ ...@@ -345,20 +366,16 @@
<tr> <tr>
<td height="34px">{{$t('fnc.a_zongjine')}}</td> <td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7"> <td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input> <el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1">
</el-input>
<!--{{moneyFormat(listAllMoney)}}--> <!--{{moneyFormat(listAllMoney)}}-->
</td> </td>
</tr> </tr>
<tr v-if="BillType===2"> <tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td> <td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="7"> <td colspan="7">
<el-date-picker <el-date-picker class="width100b" v-model="addMsg.TradeDate" type="date" :default-value="TradeDate"
class="width100b" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
v-model="addMsg.TradeDate"
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker> </el-date-picker>
</td> </td>
</tr> </tr>
...@@ -369,11 +386,7 @@ ...@@ -369,11 +386,7 @@
</td> </td>
<td>{{$t('fnc.jiaoyiriqi')}}</td> <td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3"> <td colspan="3">
<el-date-picker <el-date-picker class="width100b" v-model="addMsg.TradeDate" type="date" value-format="yyyy-MM-dd"
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"> :placeholder="$t('admin.admin_choDate')">
</el-date-picker> </el-date-picker>
</td> </td>
...@@ -383,7 +396,7 @@ ...@@ -383,7 +396,7 @@
<el-row> <el-row>
<el-col :span="12" :gutter="35"> <el-col :span="12" :gutter="35">
<el-form-item label="上传凭证"> <el-form-item label="上传凭证">
<div class="_addUpload_box clearfix" > <div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in saveMsg"> <template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3"> <div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;"> <div style="width:100%;height:100%;overflow: hidden;">
...@@ -392,7 +405,9 @@ ...@@ -392,7 +405,9 @@
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div> </div>
<div v-if="file.Type==1"> <div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)"> <div class="iconfont "
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)">
</div> </div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
...@@ -405,10 +420,7 @@ ...@@ -405,10 +420,7 @@
</div> </div>
</template> </template>
<div class="_pic_upload"> <div class="_pic_upload">
<el-upload <el-upload drag :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div> <div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload> </el-upload>
...@@ -426,10 +438,11 @@ ...@@ -426,10 +438,11 @@
</el-dialog> </el-dialog>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]"> <div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;"> <div
style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
<el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click"> <el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click">
<el-carousel-item style="height: 600px;overflow:auto;" v-for="(item,index) in picObj" :key="index"> <el-carousel-item style="height: 600px;overflow:auto;" v-for="(item,index) in picObj" :key="index">
<img :src="item" style=""/> <img :src="item" style="" />
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
...@@ -439,92 +452,99 @@ ...@@ -439,92 +452,99 @@
</template> </template>
<script> <script>
import moment from "moment" import moment from "moment"
import {getSchoolPage} from '../../../api/school/index' import {
import {UploadSelfFile} from '../../../api/common/common' getSchoolPage
import {getClassNameList} from '../../../api/finance/index' } from '../../../api/school/index'
import {
UploadSelfFile
} from '../../../api/common/common'
import {
getClassNameList,
queryStudyNameList
} from '../../../api/finance/index'
export default { export default {
data(){ data() {
return{ return {
msg:{ msg: {
pageIndex:1, pageIndex: 1,
pageSize:5, pageSize: 5,
ClientID:'', ClientID: '',
CostTypeID:0, CostTypeID: 0,
RB_Branch_Id:-1, RB_Branch_Id: -1,
sTradeDate:'', sTradeDate: '',
eTradeDate:'', eTradeDate: '',
QStartDate:'', QStartDate: '',
QEndDate:'', QEndDate: '',
BankList:[], BankList: [],
Is_Cashier:-1, Is_Cashier: -1,
}, },
Type:1, Type: 1,
AccountId:'', AccountId: '',
DataList:[], DataList: [],
StartMoney:0, StartMoney: 0,
AccountTypeList:[], AccountTypeList: [],
AccList:[], AccList: [],
GetAccountType:[], GetAccountType: [],
accountList:[], accountList: [],
productionDate:[], productionDate: [],
productionDateByTC:[], productionDateByTC: [],
ClientAccountList:[], ClientAccountList: [],
GetCostTypeList:[], GetCostTypeList: [],
CompanyList:[], CompanyList: [],
loadingTable:false, loadingTable: false,
loading:false, loading: false,
date:'', date: '',
accType:'', accType: '',
allMoney:0, allMoney: 0,
OutMoney:0, OutMoney: 0,
InMoney:0, InMoney: 0,
BillType:1, //1 收 2 支 , BillType: 1, //1 收 2 支 ,
addChuNa:false, addChuNa: false,
allLoading: false, allLoading: false,
payMsgList:[], payMsgList: [],
payMsg: { payMsg: {
ID:0, ID: 0,
FinanceId:'', FinanceId: '',
Type:'', Type: '',
AccountId:'', AccountId: '',
OriginalMoney:0, OriginalMoney: 0,
CurrencyId:'', CurrencyId: '',
Rate:0, Rate: 0,
Fee:0, Fee: 0,
Name:'', Name: '',
CurrenName:'', CurrenName: '',
Account:'', Account: '',
balance:'', balance: '',
allMoney:0, allMoney: 0,
show:false, show: false,
}, },
addMsg:{ addMsg: {
FrIDs:'', FrIDs: '',
RemitterName:'', RemitterName: '',
TradeDate:'', TradeDate: '',
BankList:[], BankList: [],
vorcherInos:[] vorcherInos: []
}, },
AccListT:[], AccListT: [],
accountListT:[], accountListT: [],
listAllMoney:0, listAllMoney: 0,
checkList:[], checkList: [],
count:0, count: 0,
allBPrice:0, allBPrice: 0,
allWPrice:0, allWPrice: 0,
userInfo:{}, userInfo: {},
//是否全选 //是否全选
isCheckAll:false, isCheckAll: false,
//是否显示全选框 //是否显示全选框
isShowCheckAll:false, isShowCheckAll: false,
picIsShow:false, picIsShow: false,
picObj:[], picObj: [],
imgList:[], imgList: [],
//上传数组 //上传数组
saveMsg:[], saveMsg: [],
TradeDate:'', TradeDate: '',
initialIndex: 0, initialIndex: 0,
schoolMsg:{ schoolMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 99999, pageSize: 99999,
rowsPerPage: 12, rowsPerPage: 12,
...@@ -533,100 +553,117 @@ ...@@ -533,100 +553,117 @@
} }
} }
}, },
created(){ created() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
if(this.$route.query.DayReport && this.$route.query.DayReport=='1'){ if (this.$route.query.DayReport && this.$route.query.DayReport == '1') {
this.msg.IsFromDayReport =1; this.msg.IsFromDayReport = 1;
} }
if(this.$route.query.TypeId&&!this.$route.query.ID){ if (this.$route.query.TypeId && !this.$route.query.ID) {
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate?this.$route.query.sTradeDate:""; this.msg.sTradeDate = this.$route.query.sTradeDate ? this.$route.query.sTradeDate : "";
this.msg.eTradeDate = this.$route.query.eTradeDate?this.$route.query.eTradeDate:""; this.msg.eTradeDate = this.$route.query.eTradeDate ? this.$route.query.eTradeDate : "";
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList(); this.getList();
this.bankaccount_post_GetListS("query"); this.bankaccount_post_GetListS("query");
} }
if(this.$route.query.ID){ if (this.$route.query.ID) {
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID); this.AccountId = parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD"); let mon1 = moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD"); let mon2 = moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1]; this.productionDate = [mon2, mon1];
this.msg.sTradeDate=mon2; this.msg.sTradeDate = mon2;
this.msg.eTradeDate=mon1; this.msg.eTradeDate = mon1;
this.msg.BankList=[]; this.msg.BankList = [];
this.msg.BankList.push({ this.msg.BankList.push({
Type:this.Type, Type: this.Type,
AccountId:this.AccountId AccountId: this.AccountId
}) })
this.bankaccount_post_GetList(); this.bankaccount_post_GetList();
this.getList(); this.getList();
} }
},methods:{ },
methods: {
//选择付款对象出现全选框 //选择付款对象出现全选框
getClientId(id){ getClientId(id) {
if(id>0||this.AccountId>0){ if (id > 0 || this.AccountId > 0) {
this.isShowCheckAll=true; this.isShowCheckAll = true;
}else{ } else {
this.isShowCheckAll=false; this.isShowCheckAll = false;
} }
}, },
Export(){ Export() {
let msg=this.msg; let msg = this.msg;
msg.EmployeeId = this.userInfo.EmployeeId; msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=2; msg.AccountToExcelType = 2;
var fileName = "银行账户明细.xls"; var fileName = "银行账户明细.xls";
this.GetErpLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName); this.GetErpLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
}, },
goUrlNew(item){ goUrlNew(item) {
let status=false; let status = false;
if(item.CostTypeList){ if (item.CostTypeList) {
item.CostTypeList.forEach(cost=>{ item.CostTypeList.forEach(cost => {
if(cost=="资金调拨"){ if (cost == "资金调拨") {
status=true; status = true;
} }
}) })
} }
if(status){ if (status) {
this.$router.push({ path: "/financial/financalDocument/CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} }) this.$router.push({
}else{ path: "/financial/financalDocument/CapitalAllocationDetail",
this.$router.push({ path: "/financial/financalDocument/FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} }) query: {
"id": item.FinanceId,
blank: 'y'
}
})
} else {
this.$router.push({
path: "/financial/financalDocument/FinancialDocumentsDetail",
query: {
"id": item.FinanceId,
blank: 'y'
}
})
} }
}, },
goUrl(path,id){ goUrl(path, id) {
this.$router.push({ path: path,query:{"id":id,blank:'y'} }) this.$router.push({
path: path,
query: {
"id": id,
blank: 'y'
}
})
}, },
accountListChange(){ accountListChange() {
this.msg.BankList = []; this.msg.BankList = [];
this.msg.BankList.push( this.msg.BankList.push({
{ Type: this.Type,
Type:this.Type, AccountId: this.AccountId
AccountId:this.AccountId })
} if (this.AccountId > 0 || this.msg.ClientID > 0) {
) this.isShowCheckAll = true;
if(this.AccountId>0||this.msg.ClientID>0){ } else {
this.isShowCheckAll=true; this.isShowCheckAll = false;
}else{
this.isShowCheckAll=false;
} }
}, },
financeinfo_post_GetClientAccountList(){ //获取付款对象 financeinfo_post_GetClientAccountList() { //获取付款对象
let msg = { let msg = {
ID:0, ID: 0,
Type:0, Type: 0,
ObjID:0, ObjID: 0,
CardNum:'' CardNum: ''
}; };
this.apipost('financeinfo_post_GetClientAccountList',msg, res => { this.apipost('financeinfo_post_GetClientAccountList', msg, res => {
let data = res.data.data; let data = res.data.data;
this.ClientAccountList = data; this.ClientAccountList = data;
}, err => {}) }, err => {})
}, },
timeAdd(){ // 日期格式 timeAdd() { // 日期格式
if(!this.productionDate){ if (!this.productionDate) {
this.msg.sTradeDate = ''; this.msg.sTradeDate = '';
this.msg.eTradeDate = ''; this.msg.eTradeDate = '';
return return
...@@ -634,8 +671,8 @@ ...@@ -634,8 +671,8 @@
this.msg.sTradeDate = this.productionDate[0]; this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1]; this.msg.eTradeDate = this.productionDate[1];
}, },
timeAddByTC(){ // 日期格式 timeAddByTC() { // 日期格式
if(!this.productionDateByTC){ if (!this.productionDateByTC) {
this.msg.QStartDate = ''; this.msg.QStartDate = '';
this.msg.QEndDate = ''; this.msg.QEndDate = '';
return return
...@@ -643,69 +680,70 @@ ...@@ -643,69 +680,70 @@
this.msg.QStartDate = this.productionDateByTC[0]; this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
bankaccount_post_GetList(){ // 获取银行账户 bankaccount_post_GetList() { // 获取银行账户
// this.AccountId = ''; // this.AccountId = '';
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => { this.apipost('bankaccount_post_GetList', {
if(res.data.resultCode == 1) { TypeId: this.accType
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.accountList = data; this.accountList = data;
} }
}, err => {}) }, err => {})
}, },
BankAccount_post_GetAccountType(){ //获取账户类型列表 BankAccount_post_GetAccountType() { //获取账户类型列表
this.apipost('BankAccount_post_GetAccountType',{}, res => { this.apipost('BankAccount_post_GetAccountType', {}, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.GetAccountType = res.data.data; this.GetAccountType = res.data.data;
} }
}, err => {}) }, err => {})
}, },
AccountType_post_GetList(){ //获取账户类型下拉 AccountType_post_GetList() { //获取账户类型下拉
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.AccList = res.data.data; this.AccList = res.data.data;
this.AccListT = res.data.data; this.AccListT = res.data.data;
}else{ } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
getAccountTypeList() { //获取账户类型 getAccountTypeList() { //获取账户类型
this.apipost('AccountType_post_GetList',{}, res => { this.apipost('AccountType_post_GetList', {}, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.AccountTypeList = res.data.data; this.AccountTypeList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getList(){ //获取列表 getList() { //获取列表
this.checkList=[]; this.checkList = [];
this.loadingTable = true this.loadingTable = true
if( this.msg.ClientID == '' ){ if (this.msg.ClientID == '') {
this.msg.ClientID = 0; this.msg.ClientID = 0;
} }
if(this.$route.query.BankID){ if (this.$route.query.BankID) {
this.msg.BankList.push( this.msg.BankList.push({
{ Type: 1,
Type:1, AccountId: parseInt(this.$route.query.BankID)
AccountId:parseInt(this.$route.query.BankID)
}) })
} }
this.allMoney = ''; this.allMoney = '';
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList', this.msg, res => {
this.loadingTable = false this.loadingTable = false
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
if(data.length){ if (data.length) {
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; this.StartMoney = data[0].StartMoney ? data[0].StartMoney : 0;
let Money = data[0].StartMoney?data[0].StartMoney:0, let Money = data[0].StartMoney ? data[0].StartMoney : 0,
InMoney = 0, InMoney = 0,
OutMoney = 0; OutMoney = 0;
data.forEach( ( x , i ) => { data.forEach((x, i) => {
if(x.Type==1){ if (x.Type == 1) {
x.EndMoney = Money + x.Money; x.EndMoney = Money + x.Money;
Money = x.EndMoney; Money = x.EndMoney;
InMoney = InMoney + x.Money; InMoney = InMoney + x.Money;
}else if(x.Type==2){ } else if (x.Type == 2) {
x.EndMoney = Money - x.Money; x.EndMoney = Money - x.Money;
Money = x.EndMoney; Money = x.EndMoney;
OutMoney = OutMoney + x.Money; OutMoney = OutMoney + x.Money;
...@@ -716,125 +754,150 @@ ...@@ -716,125 +754,150 @@
this.OutMoney = OutMoney; this.OutMoney = OutMoney;
} }
this.DataList = data; this.DataList = data;
let da = [] let da = [];
this.DataList.forEach(x=>{ let study = [];
this.DataList.forEach(x => {
this.checkList.push({ this.checkList.push({
FinanceId:null, FinanceId: null,
Type:null, Type: null,
ClientID:null, ClientID: null,
ClientType:null, ClientType: null,
OriginalMoney:0, OriginalMoney: 0,
Money:0, Money: 0,
}) })
if(x.TCIDList.length>0){ if (x.TCIDList.length > 0) {
da =da.concat(x.TCIDList) if (x.OrderSource == 17) {
da = da.concat(x.TCIDList)
} else if (x.OrderSource == 18) {
study = study.concat(x.TCIDList)
}
} }
}); });
this.DataList = data this.DataList = data
if(da.length>0){ if (da && da.length > 0) {
let str = da.join(',') let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => { getClassNameList({
this.DataList.forEach(x=>{ ClassIds: str
if(x.TCIDList.length>0){ }).then(res => {
x.TCIDList.forEach(z=>{ this.DataList.forEach(x => {
res.Data.forEach(j=>{ if (x.TCIDList.length > 0) {
if(z == j.ClassId){ x.TCIDList.forEach(z => {
res.Data.forEach(j => {
if (z == j.ClassId && x.OrderSource == 17) {
x.TCIDAndTCNUMList.push(j) x.TCIDAndTCNUMList.push(j)
} }
}) })
}) })
} }
}) })
}).catch(() => { }).catch(() => {})
}
if (study && study.length > 0) {
let str = study.join(',')
queryStudyNameList({
Ids: str
}).then(res => {
this.DataList.forEach(x => {
if (x.TCIDList.length > 0) {
x.TCIDList.forEach(z => {
res.Data.forEach(j => {
if (z == j.ClassId && x.OrderSource == 18) {
x.TCIDAndTCNUMList.push(j)
}
})
})
}
}) })
}).catch(() => {})
} }
if( this.msg.ClientID == 0 ){ if (this.msg.ClientID == 0) {
this.msg.ClientID = ''; this.msg.ClientID = '';
} }
}else{ } else {
this.Error(res.data.message) this.Error(res.data.message)
if( this.msg.ClientID == 0 ){ if (this.msg.ClientID == 0) {
this.msg.ClientID = ''; this.msg.ClientID = '';
} }
} }
},err=>{}) }, err => {})
}, },
initAddChuNa(){ initAddChuNa() {
this.payMsgList = []; this.payMsgList = [];
this.saveMsg=[]; this.saveMsg = [];
this.listAllMoney = 0; this.listAllMoney = 0;
this.huikuanren = ''; this.huikuanren = '';
this.TradeDate=''; this.TradeDate = '';
this.addChuNa = false; this.addChuNa = false;
this.payMsg = { this.payMsg = {
ID:0, ID: 0,
FinanceId:'', FinanceId: '',
Type:'', Type: '',
AccountId:'', AccountId: '',
OriginalMoney:0, OriginalMoney: 0,
CurrencyId:'', CurrencyId: '',
Rate:0, Rate: 0,
Fee:0, Fee: 0,
Name:'', Name: '',
CurrenName:'', CurrenName: '',
Account:'', Account: '',
balance:'', balance: '',
allMoney:0, allMoney: 0,
show:false, show: false,
}; };
this.addMsg = { this.addMsg = {
FrIDs:'', FrIDs: '',
RemitterName:'', RemitterName: '',
TradeDate:'', TradeDate: '',
BankList:[], BankList: [],
} }
}, },
Calculation(i,index){ // 计算价格 Calculation(i, index) { // 计算价格
if(i===1){ if (i === 1) {
this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee))?0:parseFloat(this.payMsgList[index].Fee); this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee)) ? 0 : parseFloat(this.payMsgList[
this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate))?0:parseFloat(this.payMsgList[index].Rate); index].Fee);
this.payMsgList[index].OriginalMoney = isNaN(parseFloat(this.payMsgList[index].OriginalMoney))?0:parseFloat(this.payMsgList[index].OriginalMoney); this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate)) ? 0 : parseFloat(this.payMsgList[
index].Rate);
this.payMsgList[index].OriginalMoney = isNaN(parseFloat(this.payMsgList[index].OriginalMoney)) ? 0 :
parseFloat(this.payMsgList[index].OriginalMoney);
let fee = this.payMsgList[index].Fee, let fee = this.payMsgList[index].Fee,
Rate = this.payMsgList[index].Rate===0?1:this.payMsgList[index].Rate, Rate = this.payMsgList[index].Rate === 0 ? 1 : this.payMsgList[index].Rate,
Money = this.payMsgList[index].OriginalMoney; Money = this.payMsgList[index].OriginalMoney;
this.payMsgList[index].allMoney = (Money*Rate)+fee; this.payMsgList[index].allMoney = (Money * Rate) + fee;
}else{ } else {
this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee); this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee)) ? 0 : parseFloat(this.payMsg.Fee);
this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate); this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate)) ? 0 : parseFloat(this.payMsg.Rate);
this.payMsg.OriginalMoney = isNaN(parseFloat(this.payMsg.OriginalMoney))?0:parseFloat(this.payMsg.OriginalMoney); this.payMsg.OriginalMoney = isNaN(parseFloat(this.payMsg.OriginalMoney)) ? 0 : parseFloat(this.payMsg
.OriginalMoney);
let fee = this.payMsg.Fee, let fee = this.payMsg.Fee,
Rate = this.payMsg.Rate===0?1:this.payMsg.Rate, Rate = this.payMsg.Rate === 0 ? 1 : this.payMsg.Rate,
Money = this.payMsg.OriginalMoney; Money = this.payMsg.OriginalMoney;
this.payMsg.allMoney = (Money*Rate)+fee; this.payMsg.allMoney = (Money * Rate) + fee;
} }
}, },
deleteRow(obj,index){ deleteRow(obj, index) {
obj.show = false; obj.show = false;
this.payMsgList.splice(index,1); this.payMsgList.splice(index, 1);
this.$forceUpdate(); this.$forceUpdate();
}, },
setAccountName(i,type,index){ setAccountName(i, type, index) {
if(type===2){ if (type === 2) {
this.accountList.forEach(x=>{ this.accountList.forEach(x => {
if(x.ID===i){ if (x.ID === i) {
this.payMsg.Account = x.allName; this.payMsg.Account = x.allName;
this.payMsg.CurrenName =x.CurrencyName; this.payMsg.CurrenName = x.CurrencyName;
this.payMsg.Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate; this.payMsg.Rate = x.CurrencyRate ? x.CurrencyRate : x.CurrentRate;
this.payMsg.CurrencyId = x.CurrencyId; this.payMsg.CurrencyId = x.CurrencyId;
this.payMsg.balance = x.Initialbalance; this.payMsg.balance = x.Initialbalance;
} }
}) })
this.addList() this.addList()
}else{ } else {
this.accountList.forEach(x=>{ this.accountList.forEach(x => {
if(x.ID===i){ if (x.ID === i) {
this.payMsgList[index].Account = x.allName; this.payMsgList[index].Account = x.allName;
this.payMsgList[index].CurrenName =x.CurrencyName; this.payMsgList[index].CurrenName = x.CurrencyName;
this.payMsgList[index].Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate; this.payMsgList[index].Rate = x.CurrencyRate ? x.CurrencyRate : x.CurrentRate;
this.payMsgList[index].CurrencyId = x.CurrencyId; this.payMsgList[index].CurrencyId = x.CurrencyId;
this.payMsgList[index].balance = x.Initialbalance; this.payMsgList[index].balance = x.Initialbalance;
} }
...@@ -843,65 +906,65 @@ ...@@ -843,65 +906,65 @@
} }
}, },
getAccountList(i){ getAccountList(i) {
this.payMsg.AccountId = ''; this.payMsg.AccountId = '';
this.GetAccountType.forEach(x=>{ this.GetAccountType.forEach(x => {
if(x.ID===i){ if (x.ID === i) {
this.payMsg.Name = x.Name; this.payMsg.Name = x.Name;
} }
}); });
if(i===1){ if (i === 1) {
this.bankaccount_post_GetListS() this.bankaccount_post_GetListS()
} }
if(i===2){ if (i === 2) {
this.BankAccount_post_GetPlatformList() this.BankAccount_post_GetPlatformList()
} }
if(i===3){ if (i === 3) {
this.BankAccount_post_GetCashAccountList() this.BankAccount_post_GetCashAccountList()
} }
if(i===4){ if (i === 4) {
this.BankAccount_post_GetCashPoolList() this.BankAccount_post_GetCashPoolList()
} }
}, },
BankAccount_post_GetPlatformList(){ //获取平台账户 BankAccount_post_GetPlatformList() { //获取平台账户
let msg = { let msg = {
BackId:0, BackId: 0,
TypeId:0, TypeId: 0,
BranchId:-1, BranchId: -1,
Alias:'' Alias: ''
}; };
this.apipost('BankAccount_post_GetPlatformList',msg, res => { this.apipost('BankAccount_post_GetPlatformList', msg, res => {
if(res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
x.allName = x.Alias+' '+x.PlatformNo; x.allName = x.Alias + ' ' + x.PlatformNo;
}); });
this.accountList = data; this.accountList = data;
} }
}, err => {}) }, err => {})
}, },
BankAccount_post_GetCashAccountList(){ // 获取现金账户 BankAccount_post_GetCashAccountList() { // 获取现金账户
let msg = { let msg = {
TypeId:0, TypeId: 0,
BranchId:-1, BranchId: -1,
Alias:'' Alias: ''
}; };
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { this.apipost('BankAccount_post_GetCashAccountList', msg, res => {
if(res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
x.allName = x.Alias; x.allName = x.Alias;
}); });
this.accountList = data; this.accountList = data;
} }
}, err => {}) }, err => {})
}, },
bankaccount_post_GetListS(query){ // 获取银行账户 bankaccount_post_GetListS(query) { // 获取银行账户
this.apipost('bankaccount_post_GetList',{}, res => { this.apipost('bankaccount_post_GetList', {}, res => {
if(res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
x.allName = x.Alias+' '+x.BackNo; x.allName = x.Alias + ' ' + x.BackNo;
}); });
this.accountList = data; this.accountList = data;
if (query) { if (query) {
...@@ -910,130 +973,135 @@ ...@@ -910,130 +973,135 @@
} }
}, err => {}) }, err => {})
}, },
BankAccount_post_GetCashPoolList(){ // 获取资金池账 BankAccount_post_GetCashPoolList() { // 获取资金池账
this.apipost('BankAccount_post_GetCashPoolList',{TypeId:2,BranchId:-1,Alias:''}, res => { this.apipost('BankAccount_post_GetCashPoolList', {
if(res.data.resultCode === 1) { TypeId: 2,
BranchId: -1,
Alias: ''
}, res => {
if (res.data.resultCode === 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
x.allName = x.Alias; x.allName = x.Alias;
}); });
this.accountList = data; this.accountList = data;
} }
}, err => {}) }, err => {})
}, },
clearAccBank(){ // 选择账户类型清空数据 clearAccBank() { // 选择账户类型清空数据
this.payMsg.Type = ''; this.payMsg.Type = '';
this.payMsg.AccountId = ''; this.payMsg.AccountId = '';
}, },
submitAddChuNa(){ submitAddChuNa() {
// if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！'); // if(this.payMsgList.length===0) return this.$message.error('请选择交易方式！');
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi')); if (this.addMsg.TradeDate === '') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ; if (this.BillType === 1 && this.addMsg.RemitterName === '') return this.$message.error(this.$t(
'rule.qtxhkuanren'));
let str = ''; let str = '';
this.checkList.forEach(x=>{ this.checkList.forEach(x => {
if(x.FinanceId){ if (x.FinanceId) {
str = str+x.FinanceId+',' str = str + x.FinanceId + ','
} }
}); });
this.addMsg.FrIDs = str.substring(0,str.length-1); this.addMsg.FrIDs = str.substring(0, str.length - 1);
this.addMsg.BankList = this.payMsgList; this.addMsg.BankList = this.payMsgList;
this.addMsg.Money = this.listAllMoney; this.addMsg.Money = this.listAllMoney;
this.allLoading = true this.allLoading = true
this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{ this.apipost('Financial_post_MergeFinance', this.addMsg, r => {
if(r.data.resultCode === 1) { if (r.data.resultCode === 1) {
this.addChuNa = false; this.addChuNa = false;
this.saveMsg=[]; this.saveMsg = [];
this.getList() this.getList()
}else{ } else {
this.$message.error(r.data.message) this.$message.error(r.data.message)
} }
this.allLoading = false this.allLoading = false
},null) }, null)
}, },
addCheckbox(obj,index){ addCheckbox(obj, index) {
this.DataList.forEach((x)=>{ // 循环改变check disabled 状态 this.DataList.forEach((x) => { // 循环改变check disabled 状态
if(x.FinanceId===obj.FinanceId){ if (x.FinanceId === obj.FinanceId) {
x.disabled=false x.disabled = false
}else if(x.Type===obj.Type&&x.ClientID===obj.ClientID&&x.ClientType===obj.ClientType){ } else if (x.Type === obj.Type && x.ClientID === obj.ClientID && x.ClientType === obj.ClientType) {
x.disabled=false x.disabled = false
}else{ } else {
x.disabled=true x.disabled = true
} }
}); });
if(obj.check){ if (obj.check) {
this.checkList[index] = { this.checkList[index] = {
FinanceId:obj.FinanceId, FinanceId: obj.FinanceId,
Type:obj.Type, Type: obj.Type,
ClientID:obj.ClientID, ClientID: obj.ClientID,
ClientType:obj.ClientType, ClientType: obj.ClientType,
OriginalMoney:obj.OriginalMoney, OriginalMoney: obj.OriginalMoney,
Money:obj.Money, Money: obj.Money,
} }
this.BillType = obj.Type; this.BillType = obj.Type;
}else{ } else {
this.checkList[index] = { this.checkList[index] = {
FinanceId:null, FinanceId: null,
Type:null, Type: null,
ClientID:null, ClientID: null,
ClientType:null, ClientType: null,
OriginalMoney:0, OriginalMoney: 0,
Money:0, Money: 0,
} }
} }
let count = false; let count = false;
this.checkList.forEach(x=>{ this.checkList.forEach(x => {
if(x.FinanceId){ if (x.FinanceId) {
return count = true; return count = true;
} }
}); });
if(!count){ if (!count) {
this.DataList.forEach((x,i)=>{ this.DataList.forEach((x, i) => {
x.disabled=false x.disabled = false
}) })
} }
}, },
//点击全选 //点击全选
checkAllOrder(){ checkAllOrder() {
this.checkList=[] this.checkList = []
if(this.isCheckAll){ if (this.isCheckAll) {
this.DataList.forEach(x=>{ this.DataList.forEach(x => {
x.check=true; x.check = true;
}) })
}else{ } else {
this.DataList.forEach(x=>{ this.DataList.forEach(x => {
x.check=false; x.check = false;
}) })
} }
this.checkList=[]; this.checkList = [];
this.DataList.forEach((x,index)=>{ this.DataList.forEach((x, index) => {
if(x.check){ if (x.check) {
let obj = { let obj = {
FinanceId:x.FinanceId, FinanceId: x.FinanceId,
Type:x.Type, Type: x.Type,
ClientID:x.ClientID, ClientID: x.ClientID,
ClientType:x.ClientType, ClientType: x.ClientType,
OriginalMoney:x.OriginalMoney, OriginalMoney: x.OriginalMoney,
Money:x.Money, Money: x.Money,
} }
this.checkList.push(obj); this.checkList.push(obj);
} }
}) })
}, },
addChuNaFun(){ // 添加出纳按钮点击事件 addChuNaFun() { // 添加出纳按钮点击事件
let count = 0; let count = 0;
let allBPrice = 0; let allBPrice = 0;
let allWPrice = 0; let allWPrice = 0;
this.checkList.forEach(x=>{ this.checkList.forEach(x => {
if(x.FinanceId){ if (x.FinanceId) {
count++; count++;
allBPrice = allBPrice + x.Money; allBPrice = allBPrice + x.Money;
allWPrice = allWPrice + x.OriginalMoney; allWPrice = allWPrice + x.OriginalMoney;
this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId + ','; this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId + ',';
} }
}); });
if(this.addMsg.FrIDs){ if (this.addMsg.FrIDs) {
let s = this.addMsg.FrIDs; let s = this.addMsg.FrIDs;
s = s.substring(0,s.length - 1); s = s.substring(0, s.length - 1);
this.count = count; this.count = count;
this.allWPrice = allWPrice; this.allWPrice = allWPrice;
this.allBPrice = allBPrice; this.allBPrice = allBPrice;
...@@ -1042,49 +1110,53 @@ ...@@ -1042,49 +1110,53 @@
this.payMsg.allMoney = allBPrice * 1; this.payMsg.allMoney = allBPrice * 1;
this.addMsg.FrIDs = s; this.addMsg.FrIDs = s;
this.addChuNa = true; this.addChuNa = true;
}else{ } else {
this.$message.error(this.$t('fnc.a_qxzdanju')) this.$message.error(this.$t('fnc.a_qxzdanju'))
} }
}, },
addList(){ addList() {
if(this.payMsg.AccountId==='')return; if (this.payMsg.AccountId === '') return;
if(this.payMsg.OriginalMoney===0||this.payMsg.OriginalMoney==='')return; if (this.payMsg.OriginalMoney === 0 || this.payMsg.OriginalMoney === '') return;
if(this.payMsg.AccountId==='')return; if (this.payMsg.AccountId === '') return;
this.payMsgList.push(this.payMsg); this.payMsgList.push(this.payMsg);
this.payMsg = { this.payMsg = {
ID:0, ID: 0,
FinanceId:'', FinanceId: '',
Type:'', Type: '',
AccountId:'', AccountId: '',
OriginalMoney:0, OriginalMoney: 0,
CurrencyId:'', CurrencyId: '',
Rate:0, Rate: 0,
Fee:0, Fee: 0,
Name:'', Name: '',
CurrenName:'', CurrenName: '',
Account:'', Account: '',
balance:'', balance: '',
allMoney:0, allMoney: 0,
show:false, show: false,
}; };
this.CalculationMoney(); this.CalculationMoney();
}, },
CalculationMoney(){ CalculationMoney() {
// this.listAllMoney = 0; // this.listAllMoney = 0;
// this.payMsgList.forEach(x=>{ // this.payMsgList.forEach(x=>{
// this.listAllMoney = this.listAllMoney + x.allMoney // this.listAllMoney = this.listAllMoney + x.allMoney
// }) // })
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型 financeinfo_post_GetCostTypeList() { // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{ this.apipost('financeinfo_post_GetCostTypeList', {
if(res.data.resultCode==1){ Name: '',
type: 0,
DepartIDs: this.DepartIDs
}, res => {
if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
}else{ } else {
} }
},err=>{}) }, err => {})
}, },
getCompanyList(){ //获取校区列表 getCompanyList() { //获取校区列表
getSchoolPage(this.schoolMsg).then(res => { getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData; this.CompanyList = res.Data.PageData;
}).catch(() => { }).catch(() => {
...@@ -1092,42 +1164,46 @@ ...@@ -1092,42 +1164,46 @@
}) })
}, },
showUpLoadFile(i){ // 预览上传文件 showUpLoadFile(i) { // 预览上传文件
if(i.Type==3){ if (i.Type == 3) {
this.picObj.push(i.Url); this.picObj.push(i.Url);
this.imgList.push(i.Url); this.imgList.push(i.Url);
this.picIsShow= false; this.picIsShow = false;
// this.hideFlashMan = true; // this.hideFlashMan = true;
}else{ } else {
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){ if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
this.previewPDF(i.Url) this.previewPDF(i.Url)
}else{ } else {
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url) window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i.Url)
} }
} }
}, },
deleteUploadFile(i){ // 删除上传文件 deleteUploadFile(i) { // 删除上传文件
this.saveMsg.splice(i,1); this.saveMsg.splice(i, 1);
this.addMsg.vorcherInos = this.saveMsg; this.addMsg.vorcherInos = this.saveMsg;
}, },
uploadFileBtn(file) { //上传 uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) { if (file.file.size > 1024 * 1024 * 10) {
this.Error('文件大小不能超过10M！') this.Error('文件大小不能超过10M！')
return return
} }
// 1 文档 2 数据 3 图片 // 1 文档 2 数据 3 图片
let typeArr=[ let typeArr = [{
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3}, stringArr: 'GIF|JPG|JPEG|PNG|BMP',
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1}, type: 3
},
{
stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
type: 1
},
] ]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase(); let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let fileTypeNumber = 2; let fileTypeNumber = 2;
let typeOk = false; let typeOk = false;
typeArr.forEach(x=>{ typeArr.forEach(x => {
if(x.stringArr.indexOf(ft)!='-1') if (x.stringArr.indexOf(ft) != '-1') {
{ fileTypeNumber = x.type
fileTypeNumber=x.type
typeOk = true; typeOk = true;
} }
}) })
...@@ -1137,19 +1213,20 @@ ...@@ -1137,19 +1213,20 @@
let path = "/Upload/Temporary/" let path = "/Upload/Temporary/"
this.$message.info('上传中...') this.$message.info('上传中...')
UploadSelfFile('Temporary', file.file, x => { UploadSelfFile('Temporary', file.file, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Content: x.FileUrl, Content: x.FileUrl,
ID:0, ID: 0,
Type:fileTypeNumber, Type: fileTypeNumber,
Url: x.FileUrl, Url: x.FileUrl,
}) })
this.addMsg.vorcherInos = this.saveMsg; this.addMsg.vorcherInos = this.saveMsg;
this.Success('上传成功'); this.Success('上传成功');
}); });
}, },
},mounted(){ },
let userInfo=this.getLocalStorage(); mounted() {
let userInfo = this.getLocalStorage();
this.getAccountTypeList(); this.getAccountTypeList();
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
...@@ -1158,4 +1235,5 @@ ...@@ -1158,4 +1235,5 @@
this.getCompanyList(); this.getCompanyList();
} }
} }
</script> </script>
src/pages/financial/financalDocument/BasicDocuments.vue
View file @ 9b6a2b4e
This source diff could not be displayed because it is too large. You can view the blob instead.
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ 9b6a2b4e
...@@ -508,7 +508,8 @@ ...@@ -508,7 +508,8 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="费用部门："> <el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' <el-select filterable v-model='msg.RB_Depart_Id'
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''" class=""> @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class="">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId' <el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DeptId'> :key='item.DeptId'>
...@@ -520,8 +521,7 @@ ...@@ -520,8 +521,7 @@
<el-form-item label="制单人员："> <el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class=""> <el-select filterable v-model='msg.UpdateBy' class="">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id' <el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'>
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -661,38 +661,35 @@ ...@@ -661,38 +661,35 @@
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em> <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> </span>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> --> <!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/> <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px" />
<!-- <button class="normalBtn" @click="method5()">导出</button> --> <!-- <button class="normalBtn" @click="method5()">导出</button> -->
<q-btn color="primary" size="11px" label="导出" @click="method5()"/> <q-btn color="primary" size="11px" label="导出" @click="method5()" />
</li> </li>
</ul> </ul>
</div> </div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
<!-- <v-table is-horizontal-resize column-width-drag style="width:100%" :columns="columns" :table-data="DataList"--> <!-- <v-table is-horizontal-resize column-width-drag style="width:100%" :columns="columns" :table-data="DataList"-->
<!-- :filter-method="filterMethod" :row-height='100' @on-custom-comp="customCompFunc" @sort-change="sortChange"--> <!-- :filter-method="filterMethod" :row-height='100' @on-custom-comp="customCompFunc" @sort-change="sortChange"-->
<!-- multiple-sort>--> <!-- multiple-sort>-->
<!-- &lt;!&ndash; 多个排序 &ndash;&gt;--> <!-- &lt;!&ndash; 多个排序 &ndash;&gt;-->
<!-- </v-table>--> <!-- </v-table>-->
<el-table <el-table :data="DataList" border style="width: 100%;font-size: 12px">
:data="DataList"
border
style="width: 100%;font-size: 12px">
<el-table-column prop="FrID" label="单号" width="100"> <el-table-column prop="FrID" label="单号" width="100">
<template slot-scope='scope'> <template slot-scope='scope'>
<el-popover <el-popover popper-class="detailsIT_Journal" placement="bottom-start" trigger="click">
popper-class="detailsIT_Journal" <template
placement="bottom-start" v-if="(scope.row.Type==2 || scope.row.Type==6)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)">
trigger="click">
<template v-if="(scope.row.Type==2 || scope.row.Type==6)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)">
<my-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template> </template>
<template v-else-if="(scope.row.Type==1 || scope.row.Type==5)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)"> <template
v-else-if="(scope.row.Type==1 || scope.row.Type==5)&&scope.row.modelShow&&(scope.row.Is_Merge==0||scope.row.Is_Merge==null)">
<my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template> </template>
<template v-else-if="scope.row.Is_Merge==1&&scope.row.modelShow"> <template v-else-if="scope.row.Is_Merge==1&&scope.row.modelShow">
<my-HB-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill> <my-HB-Bill :ID="scope.row.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template> </template>
<span slot="reference" @click="scope.row.modelShow = true" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{scope.row.FrID}}</span> <span slot="reference" @click="scope.row.modelShow = true"
style="text-decoration: underline;cursor: pointer;font-weight: bold">{{scope.row.FrID}}</span>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
...@@ -753,19 +750,22 @@ ...@@ -753,19 +750,22 @@
<div class="_TCIDAndTCNUMList" style="display: flex;"> <div class="_TCIDAndTCNUMList" style="display: flex;">
<span>团号：</span> <span>团号：</span>
<div v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0"> <div v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.ClassName}}（{{i.ClassId}}） <span v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p> <p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.ClassName}}（{{i.ClassId}}） <span
v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p>
</div> </div>
<div v-else> <div v-else>
<span>无</span> <span>无</span>
</div> </div>
</div> </div>
<p v-if="scope.row.OrderID>0 && scope.row.OrderSource==8">单号：<span class="">{{scope.row.OrderID}}</span></p> <p v-if="scope.row.OrderID>0 && scope.row.OrderSource==8">单号：<span class="">{{scope.row.OrderID}}</span>
</p>
</div> </div>
<div v-else-if="scope.row.OrderSource==8 && scope.row.TCIDAndTCNUMList.length==0"> <div v-else-if="scope.row.OrderSource==8 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">暂无团期信息</p> <p class="_TCIDAndTCNUMList">暂无团期信息</p>
</div> </div>
<div v-else-if="scope.row.OrderSource==4 && scope.row.TCIDAndTCNUMList.length==0"> <div v-else-if="scope.row.OrderSource==4 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList" style="text-decoration: underline;cursor: pointer;" @click="goTicketPage(scope.row)">机票编号：{{scope.row.SourceID}}</p> <p class="_TCIDAndTCNUMList" style="text-decoration: underline;cursor: pointer;"
@click="goTicketPage(scope.row)">机票编号：{{scope.row.SourceID}}</p>
<p style="margin-top: 5px;">线路：<span>{{scope.row.LineName?scope.row.LineName:'机票尚未选择线路'}}</span></p> <p style="margin-top: 5px;">线路：<span>{{scope.row.LineName?scope.row.LineName:'机票尚未选择线路'}}</span></p>
</div> </div>
<div v-else-if="scope.row.OrderSource==9 && scope.row.TCIDAndTCNUMList.length==0"> <div v-else-if="scope.row.OrderSource==9 && scope.row.TCIDAndTCNUMList.length==0">
...@@ -787,7 +787,8 @@ ...@@ -787,7 +787,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<div v-for="(s,si) in scope.row.CostTypeList" :index="si"> <div v-for="(s,si) in scope.row.CostTypeList" :index="si">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br> <span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
</div> </div>
</div> </div>
</template> </template>
...@@ -797,8 +798,13 @@ ...@@ -797,8 +798,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<div v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0"> <div v-if="scope.row.TradeWayList&&scope.row.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px"> <div class="_TradeWayList" v-for="(tw,twIn) in scope.row.TradeWayList"
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p> style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p> <p style="color:#333333">{{tw.BankNo}}</p>
</div> </div>
</div> </div>
...@@ -815,14 +821,16 @@ ...@@ -815,14 +821,16 @@
<span> <span>
<p style="line-height:20px">{{scope.row.Type==1?'应收':'应付'}}：<span>{{scope.row.Money}}</span></p> <p style="line-height:20px">{{scope.row.Type==1?'应收':'应付'}}：<span>{{scope.row.Money}}</span></p>
<p style="line-height:20px">{{scope.row.Type==1?'实收':'实付'}}：<span>{{scope.row.PayMoney}}</span></p> <p style="line-height:20px">{{scope.row.Type==1?'实收':'实付'}}：<span>{{scope.row.PayMoney}}</span></p>
<p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">冲抵：<span>{{scope.row.MatchMoney}}</span></p> <p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">冲抵：<span>{{scope.row.MatchMoney}}</span>
</p>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ClientTypeName" label="付款对象"> <el-table-column prop="ClientTypeName" label="付款对象">
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
<span style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}</span><span>{{scope.row.RemitterName}}</span> <span
style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}</span><span>{{scope.row.RemitterName}}</span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -843,8 +851,8 @@ ...@@ -843,8 +851,8 @@
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
background-color: #47BF8C; background-color: #47BF8C;
outline: none;" outline: none;" class="iconfont icon-sousuo"
class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',scope.row)"> @click="goUrl('FinancialDocumentsDetail',scope.row)">
</i> </i>
<i v-if="scope.row.Type === 4" style="width: 30px; <i v-if="scope.row.Type === 4" style="width: 30px;
height: 30px; height: 30px;
...@@ -856,12 +864,12 @@ ...@@ -856,12 +864,12 @@
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
background-color: #47BF8C; background-color: #47BF8C;
outline: none;" outline: none;" class="iconfont icon-sousuo"
class="iconfont icon-sousuo" @click="goUrl('CapitalAllocationDetail',scope.row)"> @click="goUrl('CapitalAllocationDetail',scope.row)">
</i> </i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top"> <el-tooltip class="item" effect="dark" content="转交" placement="top">
<!-- <i v-if="scope.row.isExchange" style="width: 30px;--> <!-- <i v-if="scope.row.isExchange" style="width: 30px;-->
<i style="width: 30px; <i style="width: 30px;
height: 30px; height: 30px;
display: inline-block; display: inline-block;
...@@ -872,8 +880,7 @@ ...@@ -872,8 +880,7 @@
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
background-color: #47BF8C; background-color: #47BF8C;
outline: none;" outline: none;" class="iconfont icon-zhuanhuan1" @click="getExchange(scope.row)">
class="iconfont icon-zhuanhuan1" @click="getExchange(scope.row)">
</i> </i>
</el-tooltip> </el-tooltip>
</span> </span>
...@@ -893,7 +900,8 @@ ...@@ -893,7 +900,8 @@
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item label="制单人转交："> <el-form-item label="制单人转交：">
<el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword <el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate(),choicereciveN(zhuanjiaoMsg.CreateBy)"> :placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod"
@change="$forceUpdate(),choicereciveN(zhuanjiaoMsg.CreateBy)">
<el-option v-for="item in searchList" :key="item.Id" :label="item.EmployeeName" :value="item.Id"> <el-option v-for="item in searchList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span> <span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.PostName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.PostName }}</span>
...@@ -914,7 +922,10 @@ ...@@ -914,7 +922,10 @@
import myBill from "../components/BillModule.vue"; import myBill from "../components/BillModule.vue";
import myrbvBill from "../components/ReceivablesModule.vue"; import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue"; import myhrBill from "../components/MergeBillModule.vue";
import {getClassNameList} from '../../../api/finance/index' import {
getClassNameList,
queryStudyNameList
} from '../../../api/finance/index'
import { import {
queryEmployee queryEmployee
...@@ -934,8 +945,8 @@ ...@@ -934,8 +945,8 @@
userId: 0, userId: 0,
zhuanjiaoBox: false, zhuanjiaoBox: false,
searchList: [], searchList: [],
widthSon:'700px', widthSon: '700px',
colorSon:"#f5f5f5", colorSon: "#f5f5f5",
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
...@@ -969,7 +980,7 @@ ...@@ -969,7 +980,7 @@
Remark: '', //备注查询 Remark: '', //备注查询
Sort: '2', Sort: '2',
EmployeeId: '', EmployeeId: '',
IsSellOrderForm:1 IsSellOrderForm: 1
}, },
getCompanyMsg: { // 校区 getCompanyMsg: { // 校区
RB_Group_Id: '0', RB_Group_Id: '0',
...@@ -1039,7 +1050,7 @@ ...@@ -1039,7 +1050,7 @@
pageSize: 5, pageSize: 5,
pageIndex: 1, pageIndex: 1,
heightQueryBox: false, heightQueryBox: false,
schoolMsg:{ schoolMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 12, pageSize: 12,
rowsPerPage: 12, rowsPerPage: 12,
...@@ -1124,7 +1135,7 @@ ...@@ -1124,7 +1135,7 @@
}); });
}, },
methods: { methods: {
getExchange(rowData){ getExchange(rowData) {
this.zhuanjiaoMsg.CreateBy = ''; this.zhuanjiaoMsg.CreateBy = '';
this.zhuanjiaoMsg.RB_CreateByName = ''; this.zhuanjiaoMsg.RB_CreateByName = '';
this.zhuanjiaoMsg.FrIDList = []; this.zhuanjiaoMsg.FrIDList = [];
...@@ -1156,9 +1167,9 @@ ...@@ -1156,9 +1167,9 @@
var qMsg = { var qMsg = {
EmployeeName: 0 EmployeeName: 0
} }
qMsg.EmployeeName=query; qMsg.EmployeeName = query;
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
if(res.Code==1){ if (res.Code == 1) {
this.searchList = res.Data; this.searchList = res.Data;
} }
}).catch(() => { }).catch(() => {
...@@ -1168,10 +1179,10 @@ ...@@ -1168,10 +1179,10 @@
this.searchList = []; this.searchList = [];
} }
}, },
choicereciveN(Id){ choicereciveN(Id) {
if(this.searchList.length>0){ if (this.searchList.length > 0) {
this.searchList.forEach(x=>{ this.searchList.forEach(x => {
if(x.Id==Id){ if (x.Id == Id) {
this.zhuanMsg.AuditEmIdName = x.EmployeeName; this.zhuanMsg.AuditEmIdName = x.EmployeeName;
this.zhuanjiaoMsg.RB_CreateByName = x.EmployeeName; this.zhuanjiaoMsg.RB_CreateByName = x.EmployeeName;
} }
...@@ -1224,40 +1235,60 @@ ...@@ -1224,40 +1235,60 @@
} }
}) })
this.total = res.data.data.count; this.total = res.data.data.count;
let da = [] let da = [];
let study = [];
if (this.total == 0) { if (this.total == 0) {
this.DataList = []; this.DataList = [];
} else { } else {
data.forEach(x => { data.forEach(x => {
// this.columns[0].filters.push({label:x.FrID,value:x.FrID})
x.modelShow = false; x.modelShow = false;
if(x.TCIDList.length>0){ if (x.TCIDList.length > 0) {
da =da.concat(x.TCIDList) if (x.OrderSource == 17) {
da = da.concat(x.TCIDList)
} else if (x.OrderSource == 18) {
study = study.concat(x.TCIDList)
}
} }
}) })
this.DataList = data; this.DataList = data;
if(da.length>0){ if (da && da.length > 0) {
let str = da.join(',') let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => { getClassNameList({
this.DataList.forEach(x=>{ ClassIds: str
if(x.TCIDList.length>0){ }).then(res => {
x.TCIDList.forEach(z=>{ this.DataList.forEach(x => {
res.Data.forEach(j=>{ if (x.TCIDList.length > 0) {
if(z == j.ClassId){ x.TCIDList.forEach(z => {
res.Data.forEach(j => {
if (z == j.ClassId) {
x.TCIDAndTCNUMList.push(j) x.TCIDAndTCNUMList.push(j)
} }
}) })
}) })
} }
}) })
}).catch(() => { }).catch(() => {})
}
if (study && study.length > 0) {
let str = study.join(',')
queryStudyNameList({
Ids: str
}).then(res => {
this.DataList.forEach(x => {
if (x.TCIDList.length > 0) {
x.TCIDList.forEach(z => {
res.Data.forEach(j => {
if (z == j.ClassId) {
x.TCIDAndTCNUMList.push(j)
}
})
})
}
}) })
}).catch(() => {})
} }
} }
this.loading = false; this.loading = false;
} else { } else {
...@@ -1463,8 +1494,8 @@ ...@@ -1463,8 +1494,8 @@
} }
}, err => {}) }, err => {})
}, },
getDepartment:function(id) { //部门 getDepartment: function (id) { //部门
let msg={ let msg = {
pageIndex: 1, pageIndex: 1,
pageSize: 999, pageSize: 999,
rowsPerPage: 12, rowsPerPage: 12,
...@@ -1477,18 +1508,17 @@ ...@@ -1477,18 +1508,17 @@
} }
msg.School_Id = id; msg.School_Id = id;
getDeptPage(msg).then(res => { getDeptPage(msg).then(res => {
this.DepartmentList=res.Data.PageData; this.DepartmentList = res.Data.PageData;
}).catch(() => { }).catch(() => {})
})
}, },
getEmployee(id) { //员工 getEmployee(id) { //员工
var qMsg = { var qMsg = {
Dept_Id: 0 Dept_Id: 0
} }
qMsg.Dept_Id=id; qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
if(res.Code==1){ if (res.Code == 1) {
this.EmployeeList = res.Data; this.EmployeeList = res.Data;
} }
}).catch(() => { }).catch(() => {
...@@ -1627,7 +1657,7 @@ ...@@ -1627,7 +1657,7 @@
}, },
goUrl(path, rowData, Conditon, pageIndex) { goUrl(path, rowData, Conditon, pageIndex) {
this.$router.push({ this.$router.push({
path:'/financial/financalDocument/'+ path, path: '/financial/financalDocument/' + path,
query: { query: {
"id": rowData.FrID, "id": rowData.FrID,
......
src/pages/sale/orderStatistics.vue
View file @ 9b6a2b4e
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL" :isEdit="false"> <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL" >
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
isShowSaleRemark: true, //显示修改销售备注 isShowSaleRemark: true, //显示修改销售备注
isShowBackClass: true, //显示退课按钮 isShowBackClass: true, //显示退课按钮
isShowRenewClass: true, //显示续课按钮 isShowRenewClass: true, //显示续课按钮
isShowOperate:false,//不显示操作列
}, },
EmployeeList:[],//业务员 EmployeeList:[],//业务员
} }
......
src/pages/school/receiveNumList.vue
View file @ 9b6a2b4e
...@@ -307,9 +307,8 @@ ...@@ -307,9 +307,8 @@
}) })
}, },
getEmpInfoInfo(row){ getEmpInfoInfo(row){
console.log(row)
}
}
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment