Skip to content

C
confucius
Commit 32d8576d authored by 罗超's avatar 罗超
Browse files
Options

1

parent f15bb057
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 21 deletions
src/api/finance/index.js
View file @ 32d8576d
...@@ -31,5 +31,4 @@ export function getEasyReportList(data) { ...@@ -31,5 +31,4 @@ export function getEasyReportList(data) {
method: 'post', method: 'post',
data data
}) })
} }
\ No newline at end of file
src/api/report/index.js
View file @ 32d8576d
...@@ -10,4 +10,16 @@ export function getRevenueReportPageList(data) { ...@@ -10,4 +10,16 @@ export function getRevenueReportPageList(data) {
method: 'post', method: 'post',
data data
}) })
} }
\ No newline at end of file
/**
* 订单完成统计
*/
export function getOrderCompleteStatisticsPageList(data) {
//参数信息AccountType AccountId
return request({
url: '/finance/GetOrderStudentClassHoursPageList',
method: 'post',
data
})
}
src/components/sale/orderlist.vue
View file @ 32d8576d
...@@ -290,11 +290,11 @@ ...@@ -290,11 +290,11 @@
<!-- <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit" <!-- <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" /> --> style="font-weight:400;color: #02C499" label="修改" /> -->
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div> <div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
<th>姓名</th> <th>姓名</th>
...@@ -308,8 +308,8 @@ ...@@ -308,8 +308,8 @@
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -324,11 +324,11 @@ ...@@ -324,11 +324,11 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div> <div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
<th>姓名</th> <th>姓名</th>
...@@ -342,8 +342,8 @@ ...@@ -342,8 +342,8 @@
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -531,11 +531,11 @@ ...@@ -531,11 +531,11 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent"/> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true"/>
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div> <div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
<th>姓名</th> <th>姓名</th>
...@@ -549,8 +549,8 @@ ...@@ -549,8 +549,8 @@
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -565,11 +565,11 @@ ...@@ -565,11 +565,11 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div> <div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
<th>姓名</th> <th>姓名</th>
...@@ -583,8 +583,8 @@ ...@@ -583,8 +583,8 @@
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
......
src/router/routes.js
View file @ 32d8576d
...@@ -227,6 +227,12 @@ const routes = [{ ...@@ -227,6 +227,12 @@ const routes = [{
component: () => component: () =>
import("pages/financial/EasyReport.vue") import("pages/financial/EasyReport.vue")
}, },
{
path: "/financial/orderCompleteStatistics", //订单完成统计
component: () =>
import("pages/financial/orderCompleteStatistics.vue")
},
{ {
path: "/financial/JumpReport", //单据明细 path: "/financial/JumpReport", //单据明细
component: () => component: () =>
......
src/utils/erpindex.js
View file @ 32d8576d
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = 'http://192.168.20.6:8083'; let domainUrl = 'http://192.168.20.9:8083';
let viewFileUrl = 'http://192.168.1.36:8120'; let viewFileUrl = 'http://192.168.1.36:8120';
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('testerp.oytour') !== -1) { if (locationName.indexOf('testerp.oytour') !== -1) {
......
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