Skip to content

S
SuperMan
Commit 17972c04 authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 4a2f76eb 36d3f6e4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1319 additions and 3852 deletions
src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue
View file @ 17972c04
......@@ -70,7 +70,7 @@
</el-table-column>
</el-table>
</div>
<div class="totalMoney-box" v-if="OriginalMoneyThe>0">
<div class="totalMoney-box" v-if="OriginalMoneyThe!=0">
<div>
<span style="display: inline-block;
padding: 2px 8px;
......@@ -92,7 +92,7 @@
</div>
</template>
</div>
<div class="totalMoney-box" v-if="OriginalMoneyClosed>0" :style="{padding: OriginalMoneyThe>0&&isHandlingChargeThe?'0':'10px 0'}">
<div class="totalMoney-box" v-if="OriginalMoneyClosed!=0" :style="{padding: OriginalMoneyThe!=0&&isHandlingChargeThe?'0':'10px 0'}">
<div>
<span style="display: inline-block;
padding: 2px 8px;
......@@ -189,10 +189,10 @@
})
this.OriginalMoney = (OriginalMoneyThe-OriginalMoneyClosed)/100
this.HandlingChargeMoney = (HandlingChargeMoneyThe-HandlingChargeMoneyClosed)/100
//支出
this.OriginalMoneyThe = OriginalMoneyThe/100
this.HandlingChargeMoneyThe = HandlingChargeMoneyThe/100
// 收入
this.OriginalMoneyClosed = OriginalMoneyClosed/100
this.HandlingChargeMoneyClosed = HandlingChargeMoneyClosed/100
},
......@@ -205,14 +205,14 @@
let ids
ids = this.dataList.map(x=>{ return x.FrID})
let orderObj = {
CostType: this.OriginalMoneyThe>0?1547:null,
CostType: this.OriginalMoneyThe!=0?1547:null,
CostType2: this.isHandlingChargeThe?1547:null,
CostType3: this.isHandlingChargeThe&&this.balanceMoney?114:null,//114转账手续费
HandlingChargeMoney: this.isHandlingChargeThe?this.HandlingChargeMoneyThe:null,//手续费
balanceMoney: this.isHandlingChargeThe&&this.balanceMoney?this.balanceMoney:null,//差额
OtherType: 75,
Money: this.OriginalMoneyThe>0?this.OriginalMoneyThe:null,
MoneyClosed: this.OriginalMoneyClosed>0?Number(`-${this.OriginalMoneyClosed}`):null,
Money: this.OriginalMoneyThe!=0?this.OriginalMoneyThe:null,
MoneyClosed: this.OriginalMoneyClosed!=0?Number(`-${this.OriginalMoneyClosed}`):null,
isVerifyMoney: true,
ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本
......
src/components/FinancialModule/accountingWork.vue
View file @ 17972c04
......@@ -22,6 +22,21 @@
></el-option>
</el-select>
</span>
<span>
<em>线路</em>
<el-select class="w200"
filterable
v-model="msg.LineID"
>
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option
v-for="(item,index) in LineList"
:label="item.LineName"
:value="item.LineID"
:key="index+60000"
></el-option>
</el-select>
</span>
</li>
<li>
<button class="normalBtn" @click="getList" >查询</button>
......@@ -42,6 +57,7 @@
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.w_ywrenyuan')}}</th>
<th>流程</th>
<th>线路</th>
<th>{{$t('fnc.w_fzfangxiang')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
......@@ -54,6 +70,9 @@
<td>
<span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span>
</td>
<td>
<span v-for="(i,ix) in item.LineList" :key="ix+7000">{{i.Name}} <span v-if="ix!=item.LineList.length-1">,</span> </span>
</td>
<td>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
<span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
......@@ -198,6 +217,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路">
<el-select
v-model="addMsg.LineListArr"
filterable
multiple
collapse-tags
@change="$forceUpdate()"
:placeholder="$t('pub.pleaseImport')">
<el-option
v-for="(item,index) in LineList"
:key="index+700"
:label="item.LineName"
:value="item.LineID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
......@@ -245,6 +282,7 @@ export default {
listArr:[],
BranchId:'',
Direct:'',
LineList:[]
},
type:-1,
addShow:false,
......@@ -299,6 +337,7 @@ export default {
Status:'0',
},
SingleList:[],
LineList:[],
}
},created(){
let userInfo = this.getLocalStorage();
......@@ -313,6 +352,7 @@ export default {
this.tableSize = this.msg.pageSize = parseInt(cH/45);
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getSingleList();
this.getLineList();
},methods:{
getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
......@@ -321,6 +361,15 @@ export default {
}else{}
},err=>{})
},
getLineList(){
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
switchMethod(t){
this.msg.pageIndex = 1;
if(t===1){
......@@ -392,9 +441,22 @@ export default {
}
})
})
let LineListArr=this.addMsg.LineListArr;
let lineArr =[];
LineListArr.forEach(item=>{
this.LineList.forEach(val=>{
let obj={};
if(item==val.LineID){
obj.Id=val.LineID;
obj.Name=val.LineName;
lineArr.push(obj);
}
})
})
this.addMsg.emList = list4;
this.addMsg.TemplateList = newArr;
this.addMsg.LineList = lineArr;
this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
if(r.data.resultCode==1){
this.$message.success(r.data.message);
......@@ -478,6 +540,7 @@ export default {
this.addMsg = data;
this.addMsg.listArr = [];
this.addMsg.TemplateListArr = [];
this.addMsg.LineListArr=[];
if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{
this.remoteMethod(x.emName);
......@@ -489,6 +552,11 @@ export default {
this.addMsg.TemplateListArr.push(x.Id)
})
}
if(data.LineList&&data.LineList.length>0){
data.LineList.forEach(x=>{
this.addMsg.LineListArr.push(x.Id)
})
}
this.addMsg.accountant_list = [];
this.addShow = true;
} else {
......@@ -510,7 +578,9 @@ export default {
TemplateListArr:[],
TemplateList:[],
BranchId:'',
Direct:''
Direct:'',
LineList:[],
LineListArr:[]
}
this.CostIdS = [];
this.searchList = [];
......
src/components/administrative/empBankAccount.vue
View file @ 17972c04
......@@ -78,6 +78,10 @@
<th>{{$t("ground.zhanghuleibie")}}</th>
<th>{{$t("ground.suoshujigou")}}</th>
<th>{{$t("fnc.acc")}}</th>
<th>{{ $t("fnc.khleixing") }}</th>
<th>创建人</th>
<th>{{$t("admin.admin_status")}}</th>
<th v-if="addMsg.Type==8">{{ $t("admin.admin_operate") }}</th>
</tr>
<tr v-for="(item,index) in accountList">
<td>{{item.OpenBankName}}</td>
......@@ -91,6 +95,36 @@
<td>{{item.BankName}}</td>
<td>{{item.CardNum}}
<br/>{{item.AccountHolder}}</td>
<td>{{ item.TypeName }}</td>
<td>
{{item.CreateByName?item.CreateByName:'-'}}
<p>{{item.CreateDate?item.CreateDate:'-'}}</p>
</td>
<td>
<span v-if='item.Status!=0' style="color: #E95252;">{{$t('pub.fressSel')}}</span>
<span v-if='item.Status==0' style="color: #09D49D;">{{$t('pub.normalSel')}}</span>
</td>
<td class="empBankAccountIcon" v-if="addMsg.Type==8">
<el-button-group>
<el-tooltip
class="item"
effect="dark"
content="绑定"
placement="top-start"
>
<el-button v-if="item.Type == 10"
@click="bindData(item.ID)"
type="primary"
style="background: #09d49d; border-color: #09d49d"
icon="iconfont icon-bianji-smal"
></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
</div>
......@@ -407,6 +441,33 @@
that.$message.info('操作失败')
});
},
bindData(id){
let that = this
this.$confirm("是否绑定当前付款对象", '提示', {
confirmButtonText: that.$t('pub.sureBtn'),
cancelButtonText: that.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('admin_post_BindEmpBankAccount', {
BAId:id,
ObjID:this.$route.query.id,
Type:this.$route.query.type
}, res => {
if(res.data.resultCode == 1) {
that.$message.success('操作成功')
this.outerVisible=false;
that.getList();
}else{
that.$message.info('操作失败')
}
}, err => {})
}).catch(() => {
that.$message.info('操作失败')
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......
src/components/index.vue
View file @ 17972c04
......@@ -222,9 +222,9 @@
机票未绑团查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价详情
订单改价查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
......@@ -1247,6 +1247,7 @@
},
data() {
return {
ChangeThePriceList: [],
ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒
UnboundDate: {},
......@@ -1873,14 +1874,23 @@
}
// 获取改价提醒
// 获取改价提醒 每月1到10号提示
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()+1
let Months = Month>9?Month:'0'+Month
let StartDate = Year+'-'+Months+'-01'
let DateList = []
for(let i=0;i<10;i++){
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
}
this.ChangeThePriceList = DateList.filter(x=>{
return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
})
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
this.GetChangeThePrice()
}else{
// if(localStorage.getItem("ChangeThePriceData")){
// this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData"))
// }
}
// 两小时请求一次改价提醒
setInterval(()=>{
......@@ -1890,7 +1900,7 @@
clearInterval()
}
},7200000)
}
},
created() {
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
......
src/components/myOrdersAllType/erpChangePricehOrder.vue
View file @ 17972c04
......@@ -7,12 +7,13 @@
</div>
</template>
<script>
import allList from './components/allListChangePrice.vue';
// import allList from './components/allListChangePrice.vue';
import allList from './components/allList.vue';
export default {
components: { allList },
data() {
return {
pagesTitle: '销售',
pagesTitle: '申请',
dataObj:{
OrderId: '',
}
......
src/components/myOrdersAllType/erpExaminePricehOrder.vue
View file @ 17972c04
......@@ -7,12 +7,13 @@
</div>
</template>
<script>
import allList from './components/allListExaminePrice.vue';
// import allList from './components/allListExaminePrice.vue';
import allList from './components/allList.vue';
export default {
components: { allList },
data() {
return {
pagesTitle: '销售',
pagesTitle: '审核',
dataObj:{
OrderId: '',
}
......
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