Commit 0cf6e48a authored by liudong1993's avatar liudong1993

1

parent 59338c1f
...@@ -133,8 +133,8 @@ ...@@ -133,8 +133,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="5" :gutter="35">
<el-form-item label="制单日期"> <el-form-item label="发团日期">
<el-date-picker class="h34" <el-date-picker class="h34"
@change="timeAddByTC" @change="timeAddByTC"
v-model="productionDateByTC" v-model="productionDateByTC"
...@@ -144,7 +144,18 @@ ...@@ -144,7 +144,18 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="5" :gutter="35">
<el-form-item label="制单日期">
<el-date-picker class="h34"
@change="timeAddByCreate"
v-model="productionDateByCreate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3" :gutter="35">
<el-form-item :label="$t('fnc.feiyongleixing')"> <el-form-item :label="$t('fnc.feiyongleixing')">
<el-select filterable v-model='msg.CostTypeID' > <el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
...@@ -152,7 +163,7 @@ ...@@ -152,7 +163,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="3" :gutter="35">
<el-form-item :label="$t('system.query_company')"> <el-form-item :label="$t('system.query_company')">
<el-select filterable v-model='msg.RB_Branch_Id' > <el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
...@@ -164,7 +175,7 @@ ...@@ -164,7 +175,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="3" :gutter="35">
<el-form-item label="结款查询"> <el-form-item label="结款查询">
<el-select filterable v-model='msg.IsDiJieSelect' > <el-select filterable v-model='msg.IsDiJieSelect' >
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
...@@ -173,7 +184,7 @@ ...@@ -173,7 +184,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="3" :gutter="35">
<el-form-item label="抵扣合并"> <el-form-item label="抵扣合并">
<el-checkbox v-model="msg.IsPlatformMergeBank" :true-label="1" :false-label="0" ></el-checkbox> <el-checkbox v-model="msg.IsPlatformMergeBank" :true-label="1" :false-label="0" ></el-checkbox>
</el-form-item> </el-form-item>
...@@ -506,6 +517,8 @@ export default { ...@@ -506,6 +517,8 @@ export default {
eTradeDate:'', eTradeDate:'',
QStartDate:'', QStartDate:'',
QEndDate:'', QEndDate:'',
sDate:'',
eDate:'',
BankList:[], BankList:[],
Is_Cashier:-1, Is_Cashier:-1,
Status:-1, Status:-1,
...@@ -522,6 +535,7 @@ export default { ...@@ -522,6 +535,7 @@ export default {
accountList:[], accountList:[],
productionDate:[], productionDate:[],
productionDateByTC:[], productionDateByTC:[],
productionDateByCreate:[],
ClientAccountList:[], ClientAccountList:[],
GetCostTypeList:[], GetCostTypeList:[],
CompanyList:[], CompanyList:[],
...@@ -585,6 +599,7 @@ export default { ...@@ -585,6 +599,7 @@ export default {
this.msg.eTradeDate = this.$route.query.eTradeDate; this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.productionDateByCreate = [this.msg.sDate, this.msg.eDate];
this.msg.Status = parseInt(this.$route.query.Status) this.msg.Status = parseInt(this.$route.query.Status)
this.getList(); this.getList();
...@@ -683,6 +698,15 @@ export default { ...@@ -683,6 +698,15 @@ export default {
this.msg.QStartDate = this.productionDateByTC[0]; this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
timeAddByCreate(){ // 日期格式
if(!this.productionDateByCreate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDateByCreate[0];
this.msg.eDate = this.productionDateByCreate[1];
},
bankaccount_post_GetList(){ // 获取平台账户 bankaccount_post_GetList(){ // 获取平台账户
// this.AccountId = ''; // this.AccountId = '';
let msg = { let msg = {
......
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