Skip to content

S
SuperMan
Commit f57e096d authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

11

parent 17379833
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 24 deletions
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ f57e096d
...@@ -170,6 +170,29 @@ ...@@ -170,6 +170,29 @@
</table> </table>
</div> </div>
</div> </div>
<!-- 电商商品 关联团团号信息 -->
<div v-if="OtherType==11 && LeaderState">
<div class="_tit">
<span class="_text">关联团团号信息</span>
<div>
<span class="_btn" v-if="tableShow4" @click="tableShow4=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow4=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow4" class="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th width='40%'>团ID</th>
<th>团编号</th>
</tr>
<tr class="_color_b">
<td class="hover_text" @click="goTravelControlList(details.TCID)" ><span>{{details.TCID}}</span></td>
<td @click="goTravelControlList(details.TCID)">{{details.TCNUM}}</td>
</tr>
</table>
</div>
</div>
</div> </div>
</template> </template>
...@@ -182,8 +205,9 @@ export default { ...@@ -182,8 +205,9 @@ export default {
tableShow1: true, tableShow1: true,
tableShow2: true, tableShow2: true,
tableShow3: true, tableShow3: true,
tableShow4: true,
tit: '', tit: '',
details: [], details:{},
loading: true, loading: true,
czList:[], czList:[],
czTableList:[], czTableList:[],
...@@ -221,6 +245,7 @@ export default { ...@@ -221,6 +245,7 @@ export default {
this.ReFinanceId=data.ReFinanceId; this.ReFinanceId=data.ReFinanceId;
this.IsAdvanceFinance=data.IsAdvanceFinance; this.IsAdvanceFinance=data.IsAdvanceFinance;
this.ECommerceGoodsModel=data.ECommerceGoodsModel; this.ECommerceGoodsModel=data.ECommerceGoodsModel;
this.details=data;
if(this.OtherType==7){ if(this.OtherType==7){
this.getDetails() this.getDetails()
}else{ }else{
...@@ -230,6 +255,9 @@ export default { ...@@ -230,6 +255,9 @@ export default {
}, err => {}) }, err => {})
}, },
goTravelControlList(id){
this.$router.push({ name: 'TravelControlList',query:{"TCID":id,blank:'y',tab:'团控列表'} })
},
goDetailDoc(id){ goDetailDoc(id){
this.$router.push({ name: 'DocumentStatistics',query:{"id":id,blank:'y',tab:'单据详情'} }) this.$router.push({ name: 'DocumentStatistics',query:{"id":id,blank:'y',tab:'单据详情'} })
}, },
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ f57e096d
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option> <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62 || msg.TemplateId===120'></el-option> <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62 || msg.TemplateId===120'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74||msg.TemplateId===119'></el-option> <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67||msg.TemplateId===74||msg.TemplateId===119'></el-option>
<el-option label="电商结算" :value='10' :key='10' v-if='msg.TemplateId===121'></el-option>
</el-select> </el-select>
<el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1"> <el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
<el-option v-for='item in ClientTypeList' <el-option v-for='item in ClientTypeList'
...@@ -967,11 +968,16 @@ export default { ...@@ -967,11 +968,16 @@ export default {
this.msg.ReFinanceId2=this.czmsg.ReFinanceId2; this.msg.ReFinanceId2=this.czmsg.ReFinanceId2;
} }
// 预付款冲抵 电商商品 // 预付款冲抵 电商商品
if(this.czmsg){ if(this.czmsg && this.msg.ReFinanceId){
this.msg.ReFinanceId=this.czmsg.ReFinanceId; this.msg.ReFinanceId=this.czmsg.ReFinanceId;
this.msg.OtherType=this.czmsg.OtherType; this.msg.OtherType=this.czmsg.OtherType;
} }
// 电商商品内部结算
if(this.czmsg && this.czmsg.ReTCID){
this.msg.OtherType=this.czmsg.OtherType;
this.msg.ReTCID=this.czmsg.ReTCID;
}
this.apipost('Financial_post_Set',this.msg,res=>{ this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
//清除旅客名单数据 //清除旅客名单数据
......
src/components/SalesModule/ElectricityGoods.vue
View file @ f57e096d
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<el-option label="收款" :value="1"></el-option> <el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option> <el-option label="退款" :value="2"></el-option>
<el-option label="成本" :value="3"></el-option> <el-option label="成本" :value="3"></el-option>
<el-option label="内部结算" :value="4"></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -75,29 +76,46 @@ ...@@ -75,29 +76,46 @@
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
<el-dialog <el-dialog
title="商品" title="商品"
:visible.sync="ruleVisible" :visible.sync="ruleVisible"
width="450px"> width="450px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="名称" prop="Name"> <el-form-item label="名称" prop="Name">
<el-input class='w220' v-model='form.Name'></el-input> <el-input class='w220' v-model='form.Name'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="Description"> <el-form-item label="描述" prop="Description">
<el-input class='w220' <el-input class='w220'
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="请输入内容" placeholder="请输入内容"
v-model="form.Description"> v-model="form.Description">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button> <el-button size="small" @click="ruleVisible = false">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk('form')">确 定</el-button> <el-button size="small" type="danger" @click="RulesOk('form')">确 定</el-button>
</span> </span>
</el-dialog>
<el-dialog
title="内部结算"
:visible.sync="neibuState"
width="450px">
<el-form ref="form2" :model="form2" :rules="rules2" label-width="100px">
<el-form-item label="名称" prop="TCNUM">
<el-input class='w220' v-model='form2.TCNUM'></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="neibuState = false">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk2('form2')">确 定</el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -119,6 +137,9 @@ export default { ...@@ -119,6 +137,9 @@ export default {
Name:'', Name:'',
Description:'', Description:'',
}, },
form2:{
TCNUM:'',
},
LineTeamList:[], LineTeamList:[],
EmployeeList:[], EmployeeList:[],
...@@ -128,6 +149,11 @@ export default { ...@@ -128,6 +149,11 @@ export default {
], ],
Description: [{ required: true, message: '请输入描述', trigger: 'blur' }], Description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
}, },
rules2:{
TCNUM: [
{ required: true, message: '请输入团号', trigger: 'blur' }
],
},
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:15, pageSize:15,
...@@ -135,6 +161,7 @@ export default { ...@@ -135,6 +161,7 @@ export default {
}, },
userInfo:{}, userInfo:{},
unEdit:true, unEdit:true,
neibuState:false,
} }
}, },
created(){ created(){
...@@ -176,8 +203,43 @@ export default { ...@@ -176,8 +203,43 @@ export default {
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
} }
else if(val==4){
this.neibuState=true;
}
this.typeValue=""; this.typeValue="";
}, },
RulesOk2(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
let Handmsg={};
Handmsg.OtherType=11;
this.apipost(
'Financial_post_ValidataTCTravelInfo', this.form2,
res => {
if (res.data.resultCode == 1) {
Handmsg.ReTCID=res.data.data;
var msg=JSON.stringify(Handmsg);
let routeData = this.$router.resolve({
name: 'ChoiceAddFinancialDocuments',
query: {czmsg:msg,Type: 2,searchTitle:'电商内部结算'}
})
window.open(routeData.href, '_blank')
}else{
this.Error(res.data.message)
}
},
err => {
}
)
} else {
}
});
},
Gourl(com){ Gourl(com){
this.$router.push({ this.$router.push({
name: 'ElectricityGoodsDetails', name: 'ElectricityGoodsDetails',
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ f57e096d
...@@ -2417,6 +2417,9 @@ ...@@ -2417,6 +2417,9 @@
this.queryMsg.IsShowUnion = -1; this.queryMsg.IsShowUnion = -1;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo; this.CurrentUserInfo = userInfo;
if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID;
}
if (this.$route.query.tcmun) { if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun; this.queryMsg.TCNUM = this.$route.query.tcmun;
} }
......
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