Skip to content

S
SuperMan
Commit d0bce402 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

修改申请书下载

parent 84bfb52a
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 67 deletions
src/components/FinancialModule/Application.vue
View file @ d0bce402
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="Application_content"> <div class="Application_content">
<p style="text-align:center"> <p style="text-align:center">
<span style="font-weight:700;font-size:20px;">現金受取依頼書</span> <span style="font-weight:700;font-size:20px;">現金受取依頼書</span>
<span class="download" @click="downLoad">下载</span> <span class="download" @click="downLoad">下载并保存</span>
</p> </p>
<div> <div>
<div style="margin:30px 0"> <div style="margin:30px 0">
<el-select @change="CashListChange" v-model="id" placeholder="请选择"> <el-select @change="CashListChange" :disabled="disabled" v-model="id" placeholder="请选择">
<el-option <el-option
v-for="item in CashList" v-for="item in CashList"
:key="item.Name" :key="item.Name"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<td>{{data.GetDate}}</td> <td>{{data.GetDate}}</td>
<td>{{data.LeaderName}}</td> <td>{{data.LeaderName}}</td>
<td> <td>
<el-select v-model="formdata.GetAddress" placeholder="请选择"> <el-select :disabled="disabled" v-model="formdata.GetAddress" placeholder="请选择">
<el-option v-if="id=='' || id==item.CashId" <el-option v-if="id=='' || id==item.CashId"
v-for="item in StoreList" v-for="item in StoreList"
:key="item.Name" :key="item.Name"
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
data:{}, data:{},
StoreList:[], StoreList:[],
id:"", id:"",
disabled:false,
} }
}, },
created(){ created(){
...@@ -107,10 +108,20 @@ export default { ...@@ -107,10 +108,20 @@ export default {
}, },
GetData(){ GetData(){
this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => { this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => {
console.log("res",res);
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.data = res.data.data; this.data = res.data.data;
this.formdata=Object.assign({},res.data.data); this.formdata=Object.assign({},res.data.data);
this.CashList= res.data.data.CashList; this.CashList= res.data.data.CashList;
if(this.data.Name!=""){
this.disabled=true;
this.CashList.forEach(item=>{
if(item.Name==this.data.Name){
this.id=item.Id;
}
})
}
this.StoreList= res.data.data.StoreList; this.StoreList= res.data.data.StoreList;
} }
}, err => {}) }, err => {})
......
src/components/activity/TravelInfoList.vue
View file @ d0bce402
...@@ -24,34 +24,32 @@ ...@@ -24,34 +24,32 @@
<input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/> <input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/>
</div> </div>
<el-form class="choose_form" ref="form" :model="form" label-width="80px"> <el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="处理状态"> <el-form-item label="订单信息">
<el-select v-model="form.dealStatus" placeholder="请选择平台"> <el-select v-model="form.orderStatus" placeholder="请订单信息">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<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-option label="下单" :value="4"></el-option>
<el-option label="已成团" :value="5"></el-option>
<el-option label="已关团" :value="6"></el-option>
<el-option label="已取消" :value="7"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="销售"> <el-form-item label="创建日期">
<el-select v-model="form.salesId" filterable placeholder="请选择销售">
<el-option label="不限" :value="-1"></el-option>
<el-option
v-for="item in saleList"
:label="`${item.bName} ${item.departmentName}(${item.name})`"
:value="item.employeeId"
:key="item.employeeId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker class="w150" type="date" v-model="form.searchStartDate" <el-date-picker class="w150" type="date" v-model="form.searchStartDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item> <span> - </span>
<el-form-item label="结束时间">
<el-date-picker class="w150" type="date" v-model="form.searchEndDate" <el-date-picker class="w150" type="date" v-model="form.searchEndDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="出发日期">
<el-date-picker class="w150" type="date" v-model="form.startDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="返回日期">
<el-date-picker class="w150" type="date" v-model="form.backDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="需要提供"> <el-form-item label="需要提供">
<el-input <el-input
...@@ -73,42 +71,47 @@ ...@@ -73,42 +71,47 @@
<tr> <tr>
<th>出发地</th> <th>出发地</th>
<th>目的地</th> <th>目的地</th>
<th>出发日期</th>
<th>人数</th> <th>人数</th>
<th>人均估算</th> <th>人均估算</th>
<th>需要提供</th> <th>需要提供</th>
<th>分配销售</th> <th>订单状态</th>
<th>处理状态</th> <th>出发日期</th>
<th>处理日期</th> <th>返回日期</th>
<th>创建日期</th> <th>销售数量</th>
<th>方案数量</th>
<th>创建日期</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'> <tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
<td>{{item.departureName}}</td> <td>{{item.departureName}}</td>
<td>{{item.destinationNames}}</td> <td>{{item.destinationNames}}</td>
<td>{{item.startDate | YearMD}}</td>
<td> <td>
<span v-if="item.audltNumber>0">成人：{{item.audltNumber}}</span> <span v-if="item.audltNumber>0">成人：{{item.audltNumber}}</span>
<span v-if="item.childrenNumber>0">儿童：{{item.childrenNumber}}</span> <span v-if="item.childrenNumber>0">儿童：{{item.childrenNumber}}</span>
</td> </td>
<td>{{item.budget}}</td> <td>{{item.budget}}</td>
<td>{{item.provideItem}}</td> <td>{{item.provideItem}}</td>
<td>{{item.salesName}}</td>
<td> <td>
<span v-if="item.dealStatus==1">未分配</span> <span v-if="item.orderStatus==1">已提交</span>
<span v-if="item.dealStatus==2">处理中</span> <span v-if="item.orderStatus==2">方案设计</span>
<span v-if="item.dealStatus==3">处理完成</span> <span v-if="item.orderStatus==3">合同签订</span>
<span v-if="item.dealStatus==4">处理失败</span> <span v-if="item.orderStatus==4">下单</span>
</td> <span v-if="item.orderStatus==5">已成团</span>
<td>{{item.dealDate | YearMD}}</td> <span v-if="item.orderStatus==6">已关团</span>
<td>{{item.createDate | YearMD}}</td> <span v-if="item.orderStatus==7">已取消</span>
</td>
<td>{{item.startDate | YearMD}}</td>
<td>{{item.backDate | YearMD}}</td>
<td>{{item.salesCount}}</td>
<td>{{item.planCount}}</td>
<td>{{item.createDate | YearMD}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top"> <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<el-button type="success" icon="el-icon-star-off" circle @click="travel=true,GetDes(item)"></el-button> <el-button type="success" icon="el-icon-star-off" circle @click="travel=true,GetDes(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="分配定制师" placement="top"> <el-tooltip class="item" effect="dark" content="分配销售" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="Visible=true,Edit(item)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="Gourl(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button> <el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
...@@ -145,20 +148,31 @@ ...@@ -145,20 +148,31 @@
<div class="info_details"> <div class="info_details">
<p><label>出发地：</label> <span class="d">{{ruleForm.departureName}}</span></p> <p><label>出发地：</label> <span class="d">{{ruleForm.departureName}}</span></p>
<p><label>目的地：</label><span class="d">{{ruleForm.destinationNames}}</span></p> <p><label>目的地：</label><span class="d">{{ruleForm.destinationNames}}</span></p>
<p><label>预估出行日期：</label><span class="d">{{ruleForm.startDate | YearMD}}</span></p> <p><label>预估出行日期：</label><span class="d">{{ruleForm.startDate | YearMD}} 至 {{ruleForm.backDate | YearMD}}</span></p>
<p><label>预估出行人数：</label><span class="d">成人：{{ruleForm.audltNumber}} 儿童：{{ruleForm.childrenNumber}}</span></p> <p><label>预估出行人数：</label><span class="d">成人：{{ruleForm.audltNumber}} 儿童：{{ruleForm.childrenNumber}}</span></p>
<p><label>预估人均预算：</label> <span class="d">{{ruleForm.budget}}</span></p> <p><label>预估人均预算：</label> <span class="d">{{ruleForm.budget}}</span></p>
<p><label>需要提供什么：</label><span class="d">{{ruleForm.provideItem}}</span></p> <p><label>需要提供什么：</label><span class="d">{{ruleForm.provideItem}}</span></p>
<p><label>其他需求：</label><span class="d">{{ruleForm.otherDemand}}</span></p> <p><label>其他需求：</label><span class="d">{{ruleForm.otherDemand}}</span></p>
<p><label>销售数量：</label><span class="d">{{ruleForm.salesCount}}</span></p>
<p><label>方案数量：</label><span class="d">{{ruleForm.planCount}}</span></p>
<p><label>姓名：</label><span class="d">{{ruleForm.contact}}</span></p> <p><label>姓名：</label><span class="d">{{ruleForm.contact}}</span></p>
<p><label>手机：</label><span class="d">{{ruleForm.phoneNumber}}</span></p> <p><label>手机：</label><span class="d">{{ruleForm.phoneNumber}}</span></p>
<p><label>邮箱：</label><span class="d">{{ruleForm.email}}</span></p> <p><label>邮箱：</label><span class="d">{{ruleForm.email}}</span></p>
<p><label>微信：</label><span class="d">{{ruleForm.weChat}}</span></p> <p><label>微信：</label><span class="d">{{ruleForm.weChat}}</span></p>
<p><label>销售：</label><span class="d">{{ruleForm.salesName}}</span></p>
<p><label>处理时间：</label><span class="d">{{ruleForm.dealDate | YearMD}}</span></p> <p><label>处理时间：</label><span class="d">{{ruleForm.dealDate | YearMD}}</span></p>
<p><label>创建时间：</label><span class="d">{{ruleForm.createDate | YearMD}}</span></p> <p><label>创建时间：</label><span class="d">{{ruleForm.createDate | YearMD}}</span></p>
<p><label>分配时间：</label><span class="d">{{ruleForm.allotDate | YearMD}}</span></p> <p><label>订单状态：</label><span class="d">
<p><label>处理状态：</label><span class="d">{{ruleForm.dealStatus}}</span></p> <span v-if="ruleForm.orderStatus==1">已提交</span>
<span v-if="ruleForm.orderStatus==2">方案设计</span>
<span v-if="ruleForm.orderStatus==3">合同签订</span>
<span v-if="ruleForm.orderStatus==4">下单</span>
<span v-if="ruleForm.orderStatus==5">已成团</span>
<span v-if="ruleForm.orderStatus==6">已关团</span>
<span v-if="ruleForm.orderStatus==7">已取消</span>
</span></p>
<p><label>处理备注：</label><span class="d">{{ruleForm.dealRemark}}</span></p> <p><label>处理备注：</label><span class="d">{{ruleForm.dealRemark}}</span></p>
...@@ -179,10 +193,11 @@ import moment from "moment" ...@@ -179,10 +193,11 @@ import moment from "moment"
ruleForm:{}, ruleForm:{},
travel:false, travel:false,
form:{ form:{
dealStatus:-1, orderStatus:-1,
salesId:-1,
searchStartDate:"", searchStartDate:"",
searchEndDate:"", searchEndDate:"",
startDate:'',
backDate:'',
pageIndex:1, pageIndex:1,
pageSize:15 pageSize:15
}, },
...@@ -222,7 +237,6 @@ import moment from "moment" ...@@ -222,7 +237,6 @@ import moment from "moment"
mounted() { mounted() {
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getList(); this.getList();
this.getSaleList();
}, },
filters:{ filters:{
YearMD(val){ YearMD(val){
...@@ -235,35 +249,30 @@ import moment from "moment" ...@@ -235,35 +249,30 @@ import moment from "moment"
}, },
methods: { methods: {
Gourl(item){
this.$router.push({
name: 'TravelInfoSalesList',
query: {
customId: item.customId,
blank: "y",
tab: "行程定制分配销售"
}
});
},
GetDes(item){ GetDes(item){
this.travelLoading=true; this.travelLoading=true;
this.apiJavaPost("/api/dmc/travelCoupom/getTravelCoupomInfo",{customId:item.customId}, res => { this.apiJavaPost("/api/dmc/travelCoupom/getTravelCoupomInfo",{customId:item.customId}, res => {
// console.log(res);
this.travelLoading=false; this.travelLoading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.ruleForm=res.data.data; this.ruleForm=res.data.data;
console.log("this.ruleForm",this.ruleForm)
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, null); }, null);
}, },
getSaleList(){
this.apiJavaPost("/api/user/employee/getAllSalesList",{}, res => {
// console.log(res);
if (res.data.resultCode === 1) {
this.saleList=res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
Edit(item){
this.pwdMsg.customId=item.customId;
this.pwdMsg.salesId=item.salesId;
},
ResetPwdForm(){ ResetPwdForm(){
this.pwdMsg={ this.pwdMsg={
customId:-1, customId:-1,
...@@ -306,6 +315,7 @@ import moment from "moment" ...@@ -306,6 +315,7 @@ import moment from "moment"
}, },
getList() { //获取数据 getList() { //获取数据
this.loading=true, this.loading=true,
// this.form.startDate=this.form.startDate?this.form.startDate:"";
this.apiJavaPost("/api/dmc/travelCoupom/getTravelCoupomList",this.form, res => { this.apiJavaPost("/api/dmc/travelCoupom/getTravelCoupomList",this.form, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
src/router/config.js
View file @ d0bce402
...@@ -3095,7 +3095,14 @@ export default { ...@@ -3095,7 +3095,14 @@ export default {
title: '行程定制信息' title: '行程定制信息'
} }
}, },
{
path: '/TravelInfoSalesList',
name: 'TravelInfoSalesList',
component: resolve => require(['@/components/activity/TravelInfoSalesList'], resolve),
meta: {
title: '行程定制分配销售'
}
},
{ {
path: '/RegimentLabel', path: '/RegimentLabel',
name: 'RegimentLabel', name: 'RegimentLabel',
......
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