Commit 82c94d7c authored by liudong1993's avatar liudong1993

营收报表修改,费用类型bug修复,团报bug修复

parent bc2e7d57
......@@ -48,7 +48,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="出团公司:">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select>
......@@ -67,7 +67,7 @@
<button class="normalBtn " @click="exportExcel">导出EXCEL</button>
<!-- <button class="normalBtn " @click="togbu">一键同步</button> -->
</div>
<button class="normalBtn page_EasyReport_search" @click="getData">确定</button>
<button class="normalBtn page_EasyReport_search" @click="getData(1)">确定</button>
<p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
</div>
......@@ -832,7 +832,7 @@ export default {
this.userId = userInfo.EmployeeId;
},
mounted(){
this.getData()
this.getData(2);
this.getCompanyList()
},
methods:{
......@@ -1096,9 +1096,10 @@ export default {
"简易报表.xls"
);
},
getData: function () {
getData: function (type) {
this.msg.sharelist = []
this.loading = true;
if(type==1){
this.monthList.forEach(x=>{
let obj = {
ID: 0,
......@@ -1108,6 +1109,7 @@ export default {
}
this.msg.sharelist.push(obj)
})
}
this.msg.Year = parseInt(this.year)
this.apipost('financestatistics_post_GetEasyReportList', this.msg, res=>{
// console.log(res);
......
......@@ -679,9 +679,9 @@
</div>
</td>
<td style="font-size:14px;">
<span v-if="item.AirTotalMoney>0">应付:{{item.AirTotalMoney}}(分摊:{{item.Money}})</span>
<span v-if="item.AirTotalMoney">应付:{{item.AirTotalMoney}}(分摊:{{item.Money}})</span>
<span v-else>应付:{{item.Money}}</span><br/>
<span v-if="item.AirTotalMoney>0">实付:{{item.AirTotalPayMoney}}(分摊:{{item.PayMoney}})</span>
<span v-if="item.AirTotalMoney">实付:{{item.AirTotalPayMoney}}(分摊:{{item.PayMoney}})</span>
<span v-else>实付:{{item.PayMoney}}</span>
</td>
<td>{{item.TradeDate}}</td>
......
......@@ -331,9 +331,9 @@
<el-col :span="4">
<el-form-item :label="$t('fnc.cjleixing')" prop="Tier">
<el-select filterable v-model='addMsg.Tier' @change="getCostTypeList(2)">
<el-option :label='$t('fnc.yiji')' :value='1'></el-option>
<el-option :label='$t('fnc.erji')' :value='2'></el-option>
<el-option :label='$t('fnc.sanji')' :value='3'></el-option>
<el-option :label="$t('fnc.yiji')" :value='1'></el-option>
<el-option :label="$t('fnc.erji')" :value='2'></el-option>
<el-option :label="$t('fnc.sanji')" :value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -353,7 +353,7 @@
<el-form-item :label="$t('fnc.sygongsi') + ':'">
<el-select filterable v-model='addMsg.BranchId' >
<!--<el-select filterable v-model='addMsg.BranchId' @change="getDepartmentList()">-->
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
......@@ -366,7 +366,7 @@
<el-form-item :label="$t('fnc.sybumen') + ':'">
<!--<el-select filterable v-model='addMsg.DepartmentID' @change="getPostList()">-->
<el-select filterable v-model='addMsg.DepartmentID' >
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -379,7 +379,7 @@
<el-form-item :label="$t('fnc.sygangwei') + ':'">
<el-select filterable v-model='addMsg.PostID' >
<!--<el-select filterable v-model='addMsg.PostID' @change="getEmployeeList()">-->
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
<el-option v-for='item in PostList'
:label='item.PostName'
:value='item.PostId'
......@@ -391,7 +391,7 @@
<el-col :span="4">
<el-form-item :label="$t('fnc.syrenyuan') + ':'">
<el-select filterable multiple v-model='EmployeeIDList' @change="EmployeeIDRule">
<el-option :label='$t('active.cl_tongyong')' :value='-1'></el-option>
<el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
<el-option v-for='item in EmployeeList'
:disabled = 'item.disabled'
:label='item.EmName'
......
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