Commit 7d1ee30b authored by 罗超's avatar 罗超

修改财务模块样式

parent 826add77
module.exports = { module.exports = {
presets: [ presets: [
'@quasar/babel-preset-app' '@quasar/babel-preset-app',
] ],
} }
...@@ -8,11 +8,9 @@ ...@@ -8,11 +8,9 @@
/* eslint-env node */ /* eslint-env node */
module.exports = function (ctx) { module.exports = function (ctx) {
console.log(ctx)
return { return {
// https://quasar.dev/quasar-cli/supporting-ts // https://quasar.dev/quasar-cli/supporting-ts
supportTS: false, supportTS: false,
// https://quasar.dev/quasar-cli/prefetch-feature // https://quasar.dev/quasar-cli/prefetch-feature
// preFetch: true, // preFetch: true,
...@@ -48,12 +46,13 @@ module.exports = function (ctx) { ...@@ -48,12 +46,13 @@ module.exports = function (ctx) {
// Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
build: { build: {
vueRouterMode: 'hash', // available values: 'hash', 'history' vueRouterMode: 'hash', // available values: 'hash', 'history'
env: ctx.dev ? { env: ctx.dev ? {
//API: 'http://192.168.1.36:8300/api' //API: 'http://192.168.1.36:8300/api'
// API: 'https://localhost:5001/api' // API: 'https://localhost:5001/api'
API: 'http://192.168.20.6:8085/api', API: 'http://192.168.20.9:8085/api',
// API: 'http://eduapi.oytour.com/api' // API: 'http://eduapi.oytour.com/api'
API_ZC:'http://192.168.20.6:8087/api' API_ZC:'http://192.168.20.9:8087/api'
} : { } : {
API: 'http://eduapi.oytour.com/api', API: 'http://eduapi.oytour.com/api',
API_ZC:'http://propertyedu.oytour.com/api' API_ZC:'http://propertyedu.oytour.com/api'
......
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #fff; background-color: #fff;
padding: 10px; padding: 10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.AccountType ._vMG_edit ._tit { .AccountType ._vMG_edit ._tit {
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 10px; padding: 10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.page_CompanyAccount ._vMG_edit ._tit { .page_CompanyAccount ._vMG_edit ._tit {
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button> <!-- <button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn')"/>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end"> <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i> <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
...@@ -215,9 +216,11 @@ ...@@ -215,9 +216,11 @@
<p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p> <p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> <!-- <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> -->
<button class="hollowFixedBtn" type="button" <q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button> <!-- <button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')"  @click="cancelEdit(),resetForm('addMsg'),addShow=false" style="marginRight:10px"/>
</el-col> </el-col>
</el-row> </el-row>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px"> <el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 10px; padding: 10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.page_CompanyAccount ._vMG_edit ._tit { .page_CompanyAccount ._vMG_edit ._tit {
......
...@@ -12,10 +12,17 @@ ...@@ -12,10 +12,17 @@
._underline{text-decoration: underline;cursor: pointer;} ._underline{text-decoration: underline;cursor: pointer;}
.CostType ._vMG_edit{ .CostType ._vMG_edit{
display: none; display: none;
position:fixed; position:absolute;
bottom:0; bottom:0;
left:180px; left: 0;
font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#fff;padding:10px;z-index: 999} font-family: 'PingFangSc-Fine';
border-top:3px solid #38425d;
background-color:#fff;
padding:10px;
z-index: 999;
margin: 15px;
width: calc(100% - 30px);
}
.CostType ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000} .CostType ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.CostType ._vMG_edit ._tit span{color: #666666;font-size: 14px} .CostType ._vMG_edit ._tit span{color: #666666;font-size: 14px}
._edHeight{height:400px;} ._edHeight{height:400px;}
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
.easyUpdateTime { .easyUpdateTime {
position: absolute; position: absolute;
top: 55px; top: 30px;
right: 0; right: 0;
} }
...@@ -60,17 +60,23 @@ ...@@ -60,17 +60,23 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="12">
<button class="normalBtn page_EasyReport_search" @click="getData(2)">查询</button> <el-form-item>
<!-- <button class="normalBtn page_EasyReport_search" @click="getData(2)">查询</button> -->
<q-btn color="primary" size="11px" label="查询" @click="getData(2)" style="marginRight:10px"/>
<q-btn color="primary" size="11px" label="导出EXCEL" @click="exportExcel"/>
<q-btn color="primary" size="11px" label="保存损失" @click="getData(1)" v-if="userId==1" style="marginLeft:10px"/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="page_EasyReport_export">
<button class="normalBtn " @click="exportExcel">导出EXCEL</button> <!-- <button class="normalBtn page_EasyReport_search" v-if="userId==1" @click="getData(1)">保存损失</button> -->
</div> <p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<button class="normalBtn page_EasyReport_search" v-if="userId==1" @click="getData(1)">保存损失</button> <p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}<br />每日8点、12点、19点、22点数据更新~</p>
<p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}<br />每日8点、12点、19点、22点数据更新~</p>
</div> </div>
<div style="margin-bottom:25px;" v-loading='loading'> <div style="margin-bottom:25px;" v-loading='loading'>
<v-table is-horizontal-resize column-width-drag :show-vertical-border="true" style="width:100%" :columns="columns" <v-table is-horizontal-resize column-width-drag :show-vertical-border="true" style="width:100%" :columns="columns"
......
...@@ -1308,15 +1308,15 @@ ...@@ -1308,15 +1308,15 @@
.page_PlatformAccount ._vMG_edit { .page_PlatformAccount ._vMG_edit {
overflow: auto; overflow: auto;
display: none; display: none;
position: fixed; position: absolute;
font-family: "PingFangSc-Fine"; font-family: "PingFangSc-Fine";
bottom: 0; bottom: 0;
left: 0; left: 0;
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
padding: 10px; padding: 10px;
/* width: 100%; */ margin: 15px;
margin-left: 180px; width: calc(100% - 30px);
} }
.page_PlatformAccount ._vMG_edit ._tit { .page_PlatformAccount ._vMG_edit ._tit {
......
...@@ -562,6 +562,15 @@ ...@@ -562,6 +562,15 @@
<el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading"> <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">
关闭团队收支</el-button> 关闭团队收支</el-button>
</el-col> </el-col>
<el-col :span="4" style="margin-left:110px">
<div style="height: 40px;padding-top: 5px;">
<!-- <button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" @click="method5()">导出</button> -->
<q-btn color="primary" size="11px" label="导出" @click="method5()"/>
</div>
</el-col>
<el-col :span="5"> <el-col :span="5">
<p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p> <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p v-if="UpdateStaus==2"> <p v-if="UpdateStaus==2">
...@@ -569,12 +578,6 @@ ...@@ -569,12 +578,6 @@
每日8点、12点、19点、22点数据更新~ 每日8点、12点、19点、22点数据更新~
</p> </p>
</el-col> </el-col>
<el-col :span="4">
<div style="height: 40px;padding-top: 5px">
<button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button>
</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
......
...@@ -133,15 +133,19 @@ ...@@ -133,15 +133,19 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35">
<el-form-item style="float:right">
<!-- <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"/>
<!-- <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"/>
<!-- <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()" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export()"/>
</li>
</ul>
</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="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
......
...@@ -60,8 +60,10 @@ ...@@ -60,8 +60,10 @@
<div> <div>
<span> <span>
</span> </span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <!-- <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> -->
<button class="normalBtn" @click="method5()">导出</button> <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
<q-btn color="primary" size="11px" label="导出" @click="method5()"/>
</div> </div>
</ul> </ul>
</div> </div>
......
...@@ -164,15 +164,18 @@ ...@@ -164,15 +164,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35">
<el-form-item style="float:right">
<!-- <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"/>
<!-- <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"/>
<!-- <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"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li>
</ul>
</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">
......
...@@ -126,15 +126,18 @@ ...@@ -126,15 +126,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" :gutter="35">
<el-form-item style="float:right">
<!-- <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"/>
<!-- <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"/>
<!-- <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"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li>
</ul>
</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="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
......
...@@ -50,8 +50,10 @@ ...@@ -50,8 +50,10 @@
<div class="hight_query"> <div class="hight_query">
<span> <span>
</span> </span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <!-- <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> -->
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('visa.v_daochu')"@click="method5()" />
</div> </div>
</ul> </ul>
</div> </div>
......
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
</span> </span>
</li> </li>
<li> <li>
<button class="normalBtn" @click="getList">查询</button> <!-- <button class="normalBtn" @click="getList">查询</button> -->
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button> <q-btn color="primary" size="11px" label="查询" @click="getList" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.addBtn')"@click="addShow=true,text=$t('pub.addBtn')" />
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end"> <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i> <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
...@@ -124,9 +126,11 @@ ...@@ -124,9 +126,11 @@
<p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p> <p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> <!-- <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> -->
<button class="hollowFixedBtn" type="button" <q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button> <!-- <button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="cancelEdit(),resetForm('addMsg'),addShow=false"/>
</el-col> </el-col>
</el-row> </el-row>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px"> <el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
......
...@@ -242,8 +242,9 @@ ...@@ -242,8 +242,9 @@
<li v-for="item in showMember">{{item.EmployeeName}}</li> <li v-for="item in showMember">{{item.EmployeeName}}</li>
</ul> </ul>
</div> </div>
<input type="button" class="normalBtn" @click="getMember()" <!-- <input type="button" class="normalBtn" @click="getMember()"
:value="$t('fnc.tjchengyuan')" /> :value="$t('fnc.tjchengyuan')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tjchengyuan')" @click="getMember()" style="marginRight:10px"/>
<div style="margin: 10px 0;" v-if="showMember.length>1"> <div style="margin: 10px 0;" v-if="showMember.length>1">
<el-radio-group v-model="AuditWay"> <el-radio-group v-model="AuditWay">
<el-radio :label="2">{{$t('fnc.huiquandetail')}}</el-radio> <el-radio :label="2">{{$t('fnc.huiquandetail')}}</el-radio>
...@@ -290,15 +291,14 @@ ...@@ -290,15 +291,14 @@
</div> </div>
</div> </div>
<div class="approval_page_layer_bottom"> <div class="approval_page_layer_bottom">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="closeLayer" /> &nbsp;&nbsp; <q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="closeLayer" style="marginRight:10px"/>
<input type="button" class="normalBtn" v-if='addBtn' :value="$t('pub.sureBtn')" @click="addNode" /> <q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="addNode" style="marginRight:10px" v-if='addBtn'/>
<input type="button" class="normalBtn" v-if='!addBtn' :value="$t('fnc.xgjiedian')" @click="saveUpdateNode" /> <q-btn color="primary" size="11px" :label="$t('fnc.xgjiedian')" @click="saveUpdateNode" style="marginRight:10px" v-if='!addBtn'/>
</div> </div>
</div> </div>
</div> </div>
<div v-loading="loading"> <div v-loading="loading">
<input type="button" class="hollowFixedBtn approval_back_btn" :value="$t('pub.returnBack')" <q-btn color="primary" size="11px" :label="$t('pub.returnBack')" @click="goUrl('FProcessManagement')" style="marginLeft:10px" class="approval_back_btn"/>
@click="goUrl('FProcessManagement')" />
<el-form class="_add_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px"> <el-form class="_add_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<div class="approval_page_title">{{$t('fnc.jcxinxi')}}</div> <div class="approval_page_title">{{$t('fnc.jcxinxi')}}</div>
<el-form-item :label="$t('fnc.lcmingcheng')" prop="Name"> <el-form-item :label="$t('fnc.lcmingcheng')" prop="Name">
...@@ -409,7 +409,8 @@ ...@@ -409,7 +409,8 @@
</span> </span>
<i class="iconfont icon-jiantouyou"></i> <i class="iconfont icon-jiantouyou"></i>
</div> </div>
<input type="button" class="hollowFixedBtn" @click="addAppPerson" :value="$t('fnc.tianjia')" /> <!-- <input type="button" class="hollowFixedBtn" @click="addAppPerson" :value="$t('fnc.tianjia')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAppPerson"/>
</div> </div>
</div> </div>
<div class="approval_person_list fl"> <div class="approval_person_list fl">
...@@ -424,15 +425,18 @@ ...@@ -424,15 +425,18 @@
</span> </span>
<i class="iconfont icon-jiantouyou"></i> <i class="iconfont icon-jiantouyou"></i>
</div> </div>
<input type="button" class="hollowFixedBtn" @click="addAuditUser" :value="$t('fnc.tianjia')" /> <!-- <input type="button" class="hollowFixedBtn" @click="addAuditUser" :value="$t('fnc.tianjia')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAuditUser"/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-form> </el-form>
<div style="margin: 30px 0;"> <div style="margin: 20px 0;">
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn" @click="goUrl('FProcessManagement')" /> <!-- <input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn" @click="goUrl('FProcessManagement')" /> -->
<input type="button" :value="$t('pub.saveBtn')" class="normalBtn" @click="saveApproval" /> <q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="goUrl('FProcessManagement')" style="margin:10px"/>
<!-- <input type="button" :value="$t('pub.saveBtn')" class="normalBtn" @click="saveApproval" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="saveApproval"/>
</div> </div>
</div> </div>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center> <el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center>
...@@ -503,8 +507,10 @@ ...@@ -503,8 +507,10 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible2 = false">{{$t('pub.cancelBtn')}}</button> &nbsp; <!-- <button class="hollowFixedBtn" @click="outerVisible2 = false">{{$t('pub.cancelBtn')}}</button> &nbsp; -->
<button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button> <q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="outerVisible2 = false" style="marginRight:10px"/>
<!-- <button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="saveAuditUser"/>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="修改审批人" :visible.sync="Auditshow" width="400px"> <el-dialog title="修改审批人" :visible.sync="Auditshow" width="400px">
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
border-top:3px solid #38425d; border-top:3px solid #38425d;
background-color:#fff; background-color:#fff;
padding:10px; padding:10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.page_CashierWork ._vMG_edit ._tit{ .page_CashierWork ._vMG_edit ._tit{
padding-left: 10px; padding-left: 10px;
...@@ -164,7 +165,7 @@ ...@@ -164,7 +165,7 @@
} }
.page_CashierWork .query-box .iconfont{ .page_CashierWork .query-box .iconfont{
cursor: pointer; cursor: pointer;
background-color: #E95252; background-color: var(--q-color-primary);
color: white; color: white;
width: 30px; width: 30px;
height: 30px; height: 30px;
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
border-top:3px solid #38425d; border-top:3px solid #38425d;
background-color:#fff; background-color:#fff;
padding:10px; padding:10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.page_accountingWork ._vMG_edit ._tit{ .page_accountingWork ._vMG_edit ._tit{
padding-left: 10px; padding-left: 10px;
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
} }
.page_accountingWork .query-box .iconfont{ .page_accountingWork .query-box .iconfont{
cursor: pointer; cursor: pointer;
background-color: #E95252; background-color: var(--q-color-primary);
color: white; color: white;
width: 30px; width: 30px;
height: 30px; height: 30px;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
._benwei{background-color: #2AAEF2!important;color: #0877B0!important} ._benwei{background-color: #2AAEF2!important;color: #0877B0!important}
._benweiA{background-color: #0F80BA!important} ._benweiA{background-color: #0F80BA!important}
._underline{text-decoration: underline;cursor: pointer;} ._underline{text-decoration: underline;cursor: pointer;}
.currentManage ._vMG_edit{overflow: auto;display: none;position:fixed;font-family: 'PingFangSc-Fine';bottom:0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 10px;width: 100%;padding-right: 220px} .currentManage ._vMG_edit{overflow: auto;display: none;position:absolute; bottom:0;left:0;font-family: 'PingFangSc-Fine';bottom:0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 10px; margin: 15px;width: calc(100% - 30px);}
.currentManage ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000} .currentManage ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.currentManage ._vMG_edit ._tit span{color: #666666;font-size: 14px;} .currentManage ._vMG_edit ._tit span{color: #666666;font-size: 14px;}
._edHeight{} ._edHeight{}
......
...@@ -187,9 +187,12 @@ ...@@ -187,9 +187,12 @@
<li> <li>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" <input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')"
@click="goAddurl('addCapitalAllocation')" /> @click="goAddurl('addCapitalAllocation')" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')" /> <!-- <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')" /> -->
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> <q-btn color="primary" size="11px" :label="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')" style="marginRight:10px"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()" /> <!-- <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"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()" /> -->
<q-btn color="primary" size="11px" :label="$t('visa.v_daochu')" @click="method5()"/>
</li> </li>
</ul> </ul>
</div> </div>
......
...@@ -660,8 +660,10 @@ ...@@ -660,8 +660,10 @@
<span> <span>
<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> -->
<button class="normalBtn" @click="method5()">导出</button> <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
<q-btn color="primary" size="11px" label="导出" @click="method5()"/>
</li> </li>
</ul> </ul>
</div> </div>
......
...@@ -359,7 +359,8 @@ ...@@ -359,7 +359,8 @@
</ul> </ul>
</div> </div>
<div class="_submit"> <div class="_submit">
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tijiao')" @click="AddFinancial()"/>
</div> </div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src" style="display: none"> <img v-for="src in images" :src="src" :key="src" style="display: none">
......
...@@ -757,10 +757,13 @@ ...@@ -757,10 +757,13 @@
</el-select> </el-select>
</div> </div>
</div> </div>
<button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" <!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"
@click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"/>
<button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button> <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.returnBack')" @click="AuditOrRefund()"/>
</div> </div>
</div> </div>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]"> <div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
......
...@@ -642,10 +642,13 @@ ...@@ -642,10 +642,13 @@
</div> </div>
</div> </div>
<div class="btn-box"> <div class="btn-box">
<button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" <!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"
@click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> <q-btn color="primary" size="11px" :label="$t('fnc.zancun')" @click="AddFinancial(1)" style="marginRight:10px" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0"/>
<button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button> <!-- <button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tijiao')" @click="AddFinancial()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button> -->
<q-btn text-color="primary" size="11px" label="返回" @click="AuditOrRefund()"/>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -149,20 +149,24 @@ ...@@ -149,20 +149,24 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item >
<!-- <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"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul>
<li>
<button
class="hollowFixedBtn"
@click="resetPageIndex(),getPageList()"
>{{$t('pub.searchBtn')}}</button>
<!-- <button <!-- <button
class="normalBtn" class="normalBtn"
@click="goUrlAdd('invoicesManagerAdd')" @click="goUrlAdd('invoicesManagerAdd')"
>{{$t('pub.addBtn')}}</button> --> >{{$t('pub.addBtn')}}</button> -->
</li>
</ul>
</div> </div>
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr> <tr>
......
...@@ -95,8 +95,9 @@ ...@@ -95,8 +95,9 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" <!-- <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="handleCurrentChange(),getList()" /> @click="handleCurrentChange(),getList()" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')"  @click="handleCurrentChange(),getList()" />
</li> </li>
</ul> </ul>
</div> </div>
......
...@@ -91,15 +91,15 @@ ...@@ -91,15 +91,15 @@
.instMg ._vMG_edit { .instMg ._vMG_edit {
overflow: auto; overflow: auto;
display: none; display: none;
position: fixed; position: absolute;
bottom: 0; bottom: 0;
/* left: 0; */ left: 0;
font-family: 'PingFangSc-Fine'; font-family: 'PingFangSc-Fine';
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #fff; background-color: #fff;
padding: 10px; padding: 10px;
width: 100%; margin: 15px;
padding-right: 230px; width: calc(100% - 30px);
} }
.instMg ._vMG_edit ._tit { .instMg ._vMG_edit ._tit {
......
...@@ -138,9 +138,13 @@ ...@@ -138,9 +138,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" style="float:right"> <el-col :span="5">
<button class="normalBtn " @click="getData()">查询</button> <el-form-item >
<button class="normalBtn " @click="exportExcel">导出EXCEL</button> <!-- <button class="normalBtn " @click="getData()">查询</button> -->
<q-btn color="primary" size="11px" label="查询" @click="getData()" style="marginRight:10px"/>
<!-- <button class="normalBtn " @click="exportExcel">导出EXCEL</button> -->
<q-btn color="primary" size="11px" label="导出EXCEL" @click="exportExcel"/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -153,7 +157,7 @@ ...@@ -153,7 +157,7 @@
<table :boeder="1" class="singeRowTable orderCompleteStatistics" style="width:3000px;border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> <table :boeder="1" class="singeRowTable orderCompleteStatistics" style="width:3000px;border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr> <tr>
<!-- -合同信息-- --> <!-- -合同信息-- -->
<th :width='120'>合同信息</th> <th :width='120'>订单号</th>
<th :width='200'>签订时间</th> <th :width='200'>签订时间</th>
<th :width='220'>合同编号</th> <th :width='220'>合同编号</th>
<th :width='400'>产品名称</th> <th :width='400'>产品名称</th>
...@@ -183,8 +187,9 @@ ...@@ -183,8 +187,9 @@
<th :width='200'>消耗课件费</th> <th :width='200'>消耗课件费</th>
<th :width='150'>上课进度</th> <th :width='150'>上课进度</th>
<th :width='150'>已上课时</th> <th :width='150'>已上课时</th>
<th :width='200'>单价</th> <th :width='200'>折后单价</th>
<th :width='200'>已上课金额</th> <th :width='200'>已上课金额</th>
<th :width='200'>退/付款金额</th>
<!-- -剩余情况-- --> <!-- -剩余情况-- -->
<th :width='200'>协调金额</th> <th :width='200'>协调金额</th>
<th :width='120'>剩余课时</th> <th :width='120'>剩余课时</th>
...@@ -250,6 +255,7 @@ ...@@ -250,6 +255,7 @@
<td>{{item.UseClassHours}}</td><!--已上课时--> <td>{{item.UseClassHours}}</td><!--已上课时-->
<td>{{item.Unit_Price}}</td><!--单价--> <td>{{item.Unit_Price}}</td><!--单价-->
<td>{{item.UseCourseFee}}</td><!--已上课金额--> <td>{{item.UseCourseFee}}</td><!--已上课金额-->
<td>{{item.Expend}}</td><!--退/付款金额-->
<!-- -剩余情况-- --> <!-- -剩余情况-- -->
<td>{{item.AdjustPrice}}</td><!--协调金额--> <td>{{item.AdjustPrice}}</td><!--协调金额-->
<td>{{item.SurplusCourseHours}}</td><!--剩余课时--> <td>{{item.SurplusCourseHours}}</td><!--剩余课时-->
......
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 10px; padding: 10px;
width: 100%; margin: 15px;
width: calc(100% - 30px);
} }
.page_paySetting ._vMG_edit ._tit { .page_paySetting ._vMG_edit ._tit {
......
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