Skip to content

C
confucius
Commit 6afd09c6 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 1dc3bb08
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 95 deletions
src/components/global/notify.vue
View file @ 6afd09c6
......@@ -236,7 +236,7 @@
Time: "1天前"
},
],
imgCov: 'http://192.168.1.214:8130/Upload/studentIcon/20201201044129361.png',
imgCov: 'http://192.168.20.214:8130/Upload/studentIcon/20201201044129361.png',
//通知请求参数
noticeMsg:{
......
src/pages/financial/AccountType.vue
View file @ 6afd09c6
......@@ -252,8 +252,9 @@
<div class="query-box">
<ul>
<li>
<button v-if="transitionShow2" class="normalBtn"
@click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
<!-- <button v-if="transitionShow2" 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('pub.qhpaiban')" placement="top-end">
<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>
......@@ -374,9 +375,11 @@
<div>
<ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="cancelEdit(),resetForm('addMsg')"/>
</li>
</ul>
</div>
......
src/pages/financial/CostType.vue
View file @ 6afd09c6
......@@ -15,7 +15,6 @@
position:fixed;
bottom:0;
left:180px;
font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#fff;padding:10px;z-index: 999}
.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}
......@@ -76,7 +75,7 @@
}
.CostType .query-box .iconfont{
cursor: pointer;
background-color: #E95252;
background-color: var(--q-color-primary);
color: white;
width: 30px;
height: 30px;
......@@ -145,21 +144,22 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<el-col :span="4" style="float:right;diaplay:flex;justify-content:flex-end">
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),initTableInfo()" style="marginRight:10px"/>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">导入</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<!-- <button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()" >{{$t('pub.addBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.addBtn')"  @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()"/>
<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="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</el-tooltip>
<!-- <button type="button" class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
</el-col>
</el-row>
</el-form>
</div>
<div class="cm_content _scrollbar" :style="{height:transitionShow2?contenHeight+'px':''}" :class="addShow==true?'_edHeight':''">
<div class="clearfix" v-if="transitionShow2" >
......@@ -290,8 +290,10 @@
<p class="_tit">{{text}}{{$t('fnc.feiyongleixing')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg')" style="marginRight:10px"/>
<!-- <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-row>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
......
src/pages/financial/HistoryRateQuery.vue
View file @ 6afd09c6
......@@ -128,8 +128,8 @@
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList" />
</li>
</ul>
</div>
......
src/pages/financial/Maninfo.vue
View file @ 6afd09c6
......@@ -344,7 +344,8 @@
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="getList"/>
</li>
</ul>
</div>
......
src/pages/financial/css/cssReset.css
View file @ 6afd09c6
......@@ -127,17 +127,17 @@ input:-webkit-autofill {
/*}*/
::selection {
background: #E95252;
background: var(--q-color-primary);
color: white;
}
::-moz-selection {
background: #E95252;
background: var(--q-color-primary);
color: white;
}
::-webkit-selection {
background: #E95252;
background: var(--q-color-primary);
color: white;
}
......@@ -192,7 +192,7 @@ input:-webkit-autofill {
}
.colorE95252 {
color: #E95252!important;
color: var(--q-color-primary)!important;
}
.cursorpointer {
......@@ -611,8 +611,8 @@ input:-webkit-autofill {
color: #fff;
padding: 0 15px;
height: 30px;
background: #E95252;
border: 1px solid #E95252;
background: var(--q-color-primary);
border: 1px solid var(--q-color-primary);
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
......@@ -630,7 +630,7 @@ input:-webkit-autofill {
}
.normalBtn:hover {
background: #E95252;
background: var(--q-color-primary);
box-shadow: 2px 0px 4px rgba(144, 6, 6, 0.25)
}
......@@ -640,10 +640,10 @@ input:-webkit-autofill {
.hollowFixedBtn {
background: #fff;
color: #E95252;
color: var(--q-color-primary);
padding: 0 15px;
height: 30px;
border: 1px solid #E95252;
border: 1px solid var(--q-color-primary);
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
......@@ -679,10 +679,10 @@ input:-webkit-autofill {
line-height: 30px;
text-align: center;
background: #fff;
color: #E95252;
color: var(--q-color-primary);
padding: 0 15px;
height: 30px;
border: 1px solid #E95252;
border: 1px solid var(--q-color-primary);
cursor: pointer;
border-radius: 15px
}
......@@ -811,12 +811,12 @@ input:-webkit-autofill {
.el-input .el-input__inner:focus,
.el-select .el-input.is-focus .el-input__inner {
border-color: #E95252 !important;
border-color: var(--q-color-primary) !important;
}
.el-textarea .el-textarea__inner:focus,
.el-select .el-input.is-focus .el-textarea__inner {
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
}
.el-pagination__sizes .el-input .el-input__inner {
......@@ -825,15 +825,15 @@ input:-webkit-autofill {
.el-select-dropdown__item.selected {
color: #fff !important;
background: #E95252 !important;
background: var(--q-color-primary) !important;
}
.el-date-table td.today span {
color: #E95252;
color: var(--q-color-primary);
}
.el-date-table td.available:hover span {
color: #E95252;
color: var(--q-color-primary);
}
.el-date-table td.current {
......@@ -841,22 +841,22 @@ input:-webkit-autofill {
}
.el-date-table td.current:not(.disabled) span {
background-color: #E95252!important;
background-color: var(--q-color-primary)!important;
color: #fff;
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #E95252!important;
background-color: var(--q-color-primary)!important;
;
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
}
.el-checkbox__input .el-checkbox__inner:hover {
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
}
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #E95252!important;
color: var(--q-color-primary)!important;
}
.el-pagination {
......@@ -872,15 +872,15 @@ input:-webkit-autofill {
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #E95252 !important;
background-color: var(--q-color-primary) !important;
color: #fff !important;
border-radius: 14px;
border-color: #E95252 !important;
/* border-radius: 14px; */
/* border-color: var(--q-color-primary) !important; */
}
.el-pagination.is-background .el-pager li:not(.disabled):hover {
color: #E95252 !important;
border-color: #E95252 !important
color: var(--q-color-primary) !important;
border-color: var(--q-color-primary) !important
}
.el-pagination.is-background .el-pager li:not(.disabled).active:hover {
......@@ -888,17 +888,17 @@ input:-webkit-autofill {
}
.el-select .el-input__inner:focus {
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
;
}
.el-select .el-input.is-focus .el-input__inner {
border-color: #E95252 !important;
border-color: var(--q-color-primary) !important;
}
.el-input.is-active .el-input__inner,
.el-input__inner:focus {
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
;
outline: 0;
}
......@@ -910,7 +910,7 @@ input:-webkit-autofill {
}
.el-dialog__header {
background-color: #E95252!important;
background-color: var(--q-color-primary)!important;
}
.red-theme .el-dialog__header {
......@@ -926,7 +926,7 @@ input:-webkit-autofill {
display: block;
width: 4px;
height: 14px;
background: rgba(233, 81, 81, 1);
background-color: var(--q-color-primary);
content: ' ';
left: 20px;
top: 19px;
......@@ -966,15 +966,15 @@ input:-webkit-autofill {
}
.el-tabs__item.is-active {
color: #e95252;
color: var(--q-color-primary);
}
.el-tabs__active-bar {
background-color: #e95252;
background-color: var(--q-color-primary);
}
.el-tabs__item:hover {
color: #e95252;
color: var(--q-color-primary);
}
.el-button-group .el-button {
......@@ -986,9 +986,9 @@ input:-webkit-autofill {
}
.el-message-box__btns .el-button--primary {
background: #E95252!important;
background: var(--q-color-primary)!important;
;
border-color: #E95252!important;
border-color: var(--q-color-primary)!important;
;
}
......@@ -1008,7 +1008,7 @@ input:-webkit-autofill {
}
.el-loading-spinner .path {
stroke: #E95252!important;
stroke: var(--q-color-primary)!important;
}
.el-button-group .el-button {
......@@ -1559,7 +1559,7 @@ input[type="number"] {
.combottomTitle {
padding-left: 10px;
border-left: 3px solid #E95252;
border-left: 3px solid var(--q-color-primary);
font-size: 16px;
color: #000000;
margin-bottom: 20px;
......@@ -1649,7 +1649,7 @@ input[type="number"] {
}
.column-cell-class-name-test-red .v-table-body-cell {
background-color: #e95252;
background-color: var(--q-color-primary);
color: #fff;
}
......@@ -1718,7 +1718,7 @@ input[type="number"] {
}
.el-checkbox.is-bordered.is-checked {
border-color: #e95252;
border-color: var(--q-color-primary);
}
.page_paySetting .seleRelationList.el-select .el-input {
......@@ -1746,7 +1746,7 @@ input[type="number"] {
.bottom-box .btm-title {
padding-left: 10px;
border-left: 3px solid #E95252;
border-left: 3px solid var(--q-color-primary);
font-size: 16px;
color: #000000;
margin-bottom: 20px;
......
src/pages/financial/currencyManagement.vue
View file @ 6afd09c6
......@@ -59,7 +59,7 @@
}
.currentManage .query-box .iconfont{
cursor: pointer;
background-color: #E95252;
background-color:var(--q-color-primary);
color: white;
width: 30px;
height: 30px;
......@@ -119,8 +119,10 @@
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="addShow=true,addCuren=true" >{{$t('system.btn_addCoin')}}</button>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),initTableInfo()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="addShow=true,addCuren=true" >{{$t('system.btn_addCoin')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('system.btn_addCoin')" @click="addShow=true,addCuren=true"/>
<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="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -265,8 +267,10 @@
<div>
<ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> -->
<q-btn tetx-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="cancelEdit(),resetForm('addMsg')"/>
</li>
</ul>
</div>
......@@ -307,8 +311,10 @@
<div>
<ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;" >
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('fnc.qrtijiao')" @click="submitForm('SetProfitLossMsg',2)" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')"  @click="cancelEdit(),resetForm('SetProfitLossMsg')" style="marginRight:10px"/>
</li>
</ul>
</div>
......
src/pages/financial/institutionsManagement.vue
View file @ 6afd09c6
......@@ -294,7 +294,7 @@
.instMg .query-box .iconfont {
cursor: pointer;
background-color: #E95252;
background-color: var(--q-color-primary);
color: white;
width: 30px;
height: 30px;
......@@ -363,20 +363,21 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),cancelEdit(),imageUrl=''" />
<el-col :span="4" style="float:right;text-algin:right;height:100%;display:flex;justify-content:flex-end;">
<!-- <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" style="marginRight:10px"/>
<!-- <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),cancelEdit(),imageUrl=''" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn'),cancelEdit(),imageUrl=''"/>
<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="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</el-tooltip>
</li>
</ul>
</el-col>
</el-row>
</el-form>
</div>
<div class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<div class="clearfix" v-loading='loading' v-if="transitionShow">
......@@ -438,7 +439,7 @@
</div>
<div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</div>
......@@ -482,9 +483,11 @@
<div>
<ul class="clearfix" style="text-align: right;">
<li class="_add_saveBtn" style="float: initial;">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
<!-- <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"/>
</li>
</ul>
</div>
......@@ -511,10 +514,12 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary"
@click="submitForm('addMsg'),resetPageIndex()">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<!-- <button class="normalBtn" type="primary"
@click="submitForm('addMsg'),resetPageIndex()">{{$t('pub.saveBtn')}}</button> &nbsp; -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg'),resetPageIndex()" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> -->
<q-btn tetx-color="primary" size="11px" :label="$t('pub.cancelBtn') "@click="outerVisible = false,resetForm('addMsg')" style="marginRight:10px"/>
</div>
</el-dialog>
</div>
......
src/pages/financial/paySetting.vue
View file @ 6afd09c6
......@@ -345,10 +345,12 @@
<el-switch v-model="addMsg.Status" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
<el-col :span="6" :offset="11" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<el-col :span="6" class="_add_saveBtn" style="float:right">
<!-- <button type="button" class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg')" style="marginRight:10px"/>
<!-- <button class="hollowFixedBtn" type="button"
@click="cancelEdit(),addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="cancelEdit(),addShow=false,resetForm('addMsg')"/>
</el-col>
</el-row>
</el-form>
......
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