Skip to content

C
confucius
Commit 8dd089ff authored by 罗超's avatar 罗超
Browse files
Options

1

parent fa3c9d78
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 22 deletions
src/pages/financial/FProcessManagement.vue
View file @ 8dd089ff
......@@ -519,15 +519,16 @@
<template>
<div class="page_FProcessManagement page-body">
<div class='query-box'>
<ul>
<li><input type="button" class="normalBtn" value="新增流程" @click="gotoSub('addFinancialProcess',0,8)" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex();getTemplateList();" />
</li>
</ul>
</div>
<ul class="_nav clearfix">
<li class="_active" @click="getTemplateList()">流程列表</li>
<li style="float:right;backgroundColor:#fff">
<!-- <input type="button" class="normalBtn" value="新增流程" @click="gotoSub('addFinancialProcess',0,8)" /> -->
<q-btn color="primary" size="11px" label="新增流程"  @click="gotoSub('addFinancialProcess',0,8)" style="marginRight:10px"/>
<!-- <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex();getTemplateList();" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
</li>
</ul>
<ul>
<el-form class="_info_box clearfix" label-width="110px">
......
src/pages/financial/Manfunds.vue
View file @ 8dd089ff
......@@ -205,7 +205,7 @@
<q-btn color="primary" size="11px">
<template v-slot:default>
<a style="color:#fff;width:84px;height:8px" :href="downList">导入模板下载</a>
<a style="color:#fff;width:84px;" :href="downList">导入模板下载</a>
</template>
</q-btn>
</li>
......
src/pages/financial/orderCompleteStatistics.vue
View file @ 8dd089ff
......@@ -47,7 +47,10 @@
color:black !important;
}
.border-b{
border-bottom: 1px solid #333;
border-bottom: 1px solid #999;
}
td .border-b:last-child{
border:none;
}
</style>
......@@ -58,35 +61,45 @@
<el-row style="padding:15px 0 0 0; width:100%">
<el-col :span="6">
<el-form-item label="订单编号：">
<el-input v-model="msg.OrderId" placeholder="请输入内容" filterable></el-input>
<div style="width:190px">
<el-input v-model="msg.OrderId" placeholder="请输入内容" filterable></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号：">
<el-input v-model="msg.ContractNo" placeholder="请输入内容" filterable></el-input>
<div style="width:190px">
<el-input v-model="msg.ContractNo" placeholder="请输入内容" filterable></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="学生姓名：">
<div style="width:190px">
<el-input v-model="msg.StudentName" placeholder="请输入内容" filterable></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班级名称：">
<div style="width:190px">
<el-input v-model="msg.ClassName" placeholder="请输入内容" filterable></el-input>
</div>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="课程名称：">
<div style="width:190px">
<el-input v-model="msg.CourseName" placeholder="请输入内容" filterable></el-input>
</div>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员：">
<el-select v-model="msg.CreateBy" filterable >
<el-option label="不限" :value="-1"></el-option>
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmployeeName" :key="item.Id" :value="item.Id">
{{item.EmployeeName}}</el-option>
</el-select>
......@@ -94,13 +107,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="财务单据id：">
<div style="width:190px">
<el-input v-model="msg.FinanceId" placeholder="请输入内容" filterable></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType'>
<el-option value="" label="不限"></el-option>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -109,7 +124,7 @@
<el-col :span="6">
<el-form-item label="交易方式：">
<el-select v-model="msg.TradeWay" filterable @change="getAccountList(msg.AccountType,msg.TradeWay)">
<el-option label="不限" :value="-1"></el-option>
<el-option label="不限" :value="0"></el-option>
<el-option v-for='item in BranchAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -118,12 +133,12 @@
<el-col :span="6">
<el-form-item label="账号id：">
<el-select v-model="msg.AccountId" filterable >
<el-option label="不限" :value="-1"></el-option>
<el-option label="不限" :value="0"></el-option>
<el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="float:right">
<el-col :span="5" style="float:right">
<button class="normalBtn " @click="getData()">查询</button>
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
</el-col>
......@@ -153,6 +168,7 @@
<th :width='150'>优惠金额</th>
<th :width='180'>合同总金额</th>
<!-- -收款信息（实收金额-- -->
<th :width='150'>单据号</th>
<th :width='300'>收款日期</th>
<th :width='150'>收款金额</th>
<th :width='150'>收款方式</th>
......@@ -167,12 +183,12 @@
<th :width='200'>消耗课件费</th>
<th :width='150'>上课进度</th>
<th :width='150'>已上课时</th>
<th :width='120'>单价</th>
<th :width='200'>单价</th>
<th :width='200'>已上课金额</th>
<!-- -剩余情况-- -->
<th :width='120'>协调金额</th>
<th :width='200'>协调金额</th>
<th :width='120'>剩余课时</th>
<th :width='120'>剩余金额</th>
<th :width='200'>剩余金额</th>
<th :width='120'>操作</th>
</tr>
<template v-for="(item,index) in DataList" v-loading="loading">
......@@ -193,6 +209,11 @@
<td>{{item.TotalDiscountMoney}}</td><!--优惠金额-------------------------->
<td>{{item.TotalMoney}}</td><!--合同总金额-->
<!-- -收款信息（实收金额-- -->
<td>
<div v-for="subitem in item.IncomeList" class="border-b">
{{ subitem.FrID }}
</div>
</td><!--单据号-->
<td>
<div v-for="subitem in item.IncomeList" class="border-b">
{{ subitem.TradeDate }}
......@@ -233,7 +254,7 @@
<td>{{item.AdjustPrice}}</td><!--协调金额-->
<td>{{item.SurplusCourseHours}}</td><!--剩余课时-->
<td :class="{'color-red':item.SurplusMoney<0,'color-green':item.SurplusMoney>0&&item.SurplusMoney<500,'color-black':item.SurplusMoney==0||item.SurplusMoney>=500}">{{item.SurplusMoney}}</td><!--剩余金额-->
<td><q-btn color="primary" style="width:100px;" label="协调金额" @click="show($event),AdjustPriceMsg.ContractId=item.Id,AdjustPriceMsg.AdjustPrice=item.AdjustPrice"/></td><!--操作-->
<td><q-btn color="primary" style="width:80px;font-size:10px" label="协调金额" @click="show($event),AdjustPriceMsg.ContractId=item.Id,AdjustPriceMsg.AdjustPrice=item.AdjustPrice"/></td><!--操作-->
</tr>
</template>
......@@ -258,8 +279,9 @@
type="number"
:rules="[(val) => (val>=0) || '请输入协调金额']"
/>
<div>
<q-btn label="提交" type="Submit" color="primary" />
<div style="display:flex; justify-content:flex-end">
<q-btn label="确认" type="Submit" color="primary" style="margin-right:10px"/>
<q-btn label="取消" text-color="primary" @click="hide"/>
</div>
</q-form>
</div>
......@@ -310,7 +332,7 @@
FinanceId:0,//财务单据id
TradeWay:0,//交易方式
AccountId:0,//账号id
AccountType:"",//账户类型
AccountType:0//账户类型
},
data: [],
DataList: [],
......
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