Skip to content

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

修改申请书下载验证

parent 97a78851
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 22 deletions
src/components/FinancialModule/Application.vue
View file @ 43655f71
...@@ -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 :disabled="disabled" v-model="formdata.GetAddress" placeholder="请选择"> <el-select clearable :disabled="disabled1" 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"
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
<span>{{data.JapNowTime}}</span> <span>{{data.JapNowTime}}</span>
</div> </div>
<div style="margin:50px 0"> <div style="margin:50px 0">
{{data.CityName}}{{data.TCNUM}}编号：{{data.FrId}} <p>{{data.CityName}}<span style="padding-left:6px;"> </span>{{data.TCNUM}}编号：{{data.FrId}}</p>
</div> </div>
</div> </div>
...@@ -64,6 +65,7 @@ export default { ...@@ -64,6 +65,7 @@ export default {
StoreList:[], StoreList:[],
id:"", id:"",
disabled:false, disabled:false,
disabled1:false,
} }
}, },
created(){ created(){
...@@ -79,9 +81,9 @@ export default { ...@@ -79,9 +81,9 @@ export default {
this.Error("请选择旅行社") this.Error("请选择旅行社")
return; return;
} }
if(this.formdata.GetAddress==""){ console.log(this.formdata.GetAddress)
this.Error("请选择受取店铺") if(!this.formdata.GetAddress){
return; this.formdata.GetAddress="";
} }
this.apipost('Financial_get_FinanceCashWithDrawalsDownLoad',this.formdata,res=>{ this.apipost('Financial_get_FinanceCashWithDrawalsDownLoad',this.formdata,res=>{
// console.log(res); // console.log(res);
...@@ -121,6 +123,9 @@ export default { ...@@ -121,6 +123,9 @@ export default {
} }
}) })
} }
if(this.data.GetAddress!=""){
this.disabled1=true;
}
this.StoreList= res.data.data.StoreList; this.StoreList= res.data.data.StoreList;
} }
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 43655f71
...@@ -629,7 +629,7 @@ ...@@ -629,7 +629,7 @@
<td> <td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input> <el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td> </td>
<td>{{i.allMoney}}</td> <td>{{i.allMoney.toFixed(2)}}</td>
</tr> </tr>
</template> </template>
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'"> <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
...@@ -864,7 +864,7 @@ ...@@ -864,7 +864,7 @@
<td> <td>
<el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input> <el-input v-model="i.Rate" @change="Calculation(1,index)" @blur="addList(2,index)" type="number" class=" _border_b_1"></el-input>
</td> </td>
<td>{{i.allMoney}}</td> <td>{{i.allMoney.toFixed(2)}}</td>
</tr> </tr>
</template> </template>
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'"> <tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
...@@ -1268,6 +1268,7 @@ export default { ...@@ -1268,6 +1268,7 @@ export default {
} }
}, },
addList: function (type, index) { addList: function (type, index) {
console.log(this.payMsgList[index])
if (type) { if (type) {
if (this.payMsgList[index].AccountId==='') return if (this.payMsgList[index].AccountId==='') return
if (this.payMsgList[index].Type==='') return if (this.payMsgList[index].Type==='') return
......
src/components/TravelManager/TravelList/SalesTravelCoupomList.vue
View file @ 43655f71
...@@ -17,6 +17,32 @@ ...@@ -17,6 +17,32 @@
.TravelInfoList .info_details p{ .TravelInfoList .info_details p{
padding:4px 0; padding:4px 0;
} }
.TravelInfoList .ht_span{
display: inline-block;
width: 26px;
height: 26px;
border-radius: 50%;
background: #E95252;
line-height: 26px;
text-align: center;
color:#ffffff;
cursor: pointer;
}
.TravelInfoList .el-upload{
display: inline-block;
width: 45px;
height: 45px;
border-radius: 50%;
background: cornflowerblue;
color: #fff;
}
.TravelInfoList .el-icon-plus{
position: relative;
top: 5px;
font-size: 20px;
}
</style> </style>
<template> <template>
<div class="TravelInfoList flexOne"> <div class="TravelInfoList flexOne">
...@@ -106,8 +132,24 @@ ...@@ -106,8 +132,24 @@
<td>{{item.startDate | YearMD}}</td> <td>{{item.startDate | YearMD}}</td>
<td>{{item.backDate | YearMD}}</td> <td>{{item.backDate | YearMD}}</td>
<td> <td>
<el-popover
placement="bottom"
width="400"
trigger="click">
<el-table :data="item.contractFile">
<el-table-column property="name" label="名字"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<a :href="scope.row.url">下载</a>
</template>
</el-table-column>
</el-table>
<span v-if="item.contractFile&&item.contractFile.length>0" class="ht_span" slot="reference">{{item.contractFile.length}}</span>
</el-popover>
<el-tooltip class="item" effect="dark" content="上传合同" placement="top"> <el-tooltip class="item" effect="dark" content="上传合同" placement="top">
<el-button v-if="item.chooseSalesId&&item.chooseSalesId==EmployeeId" type="primary" icon="el-icon-upload2" circle></el-button>
<el-button @click="StHt(item)" v-if="item.chooseSalesId&&item.chooseSalesId==EmployeeId" type="primary" icon="el-icon-upload2" circle></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
<td>{{item.planCount}}</td> <td>{{item.planCount}}</td>
...@@ -147,8 +189,30 @@ ...@@ -147,8 +189,30 @@
<button class="hollowFixedBtn" @click="Visible=false">取消</button> <button class="hollowFixedBtn" @click="Visible=false">取消</button>
<button class="normalBtn" @click="submitForm1">确定</button> <button class="normalBtn" @click="submitForm1">确定</button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 上传合同 -->
<el-dialog title="上传合同" :visible.sync="DownHt" width="400px">
<el-form ref="htmsg" :model="htmsg" label-width="80px">
<!-- <el-form-item label="名称">
<el-input v-model="obj.name"></el-input>
</el-form-item> -->
<el-form-item label="上传">
<el-upload calss="htupload"
:file-list="fileList2" :on-remove="Remove"
:http-request="uploadTest"
:multiple="true" :show-file-list="true" action="">
<i class="el-icon-plus"></i>
</el-upload>
</el-form-item>
<el-form-item>
<el-button @click="UploadContract" type="danger" size="small">确定</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -156,6 +220,7 @@ import moment from "moment" ...@@ -156,6 +220,7 @@ import moment from "moment"
export default { export default {
data() { data() {
return { return {
fileList2:[],
provideItem:[], provideItem:[],
form:{ form:{
orderStatus:-1, orderStatus:-1,
...@@ -194,13 +259,20 @@ import moment from "moment" ...@@ -194,13 +259,20 @@ import moment from "moment"
} }
}, },
EmployeeId:-1, EmployeeId:-1,
DownHt:false,
htmsg:{
contractFile:[],
},
obj:{
name:"",
url:"",
},
} }
}, },
mounted() { mounted() {
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.EmployeeId=userInfo.EmployeeId; this.EmployeeId=userInfo.EmployeeId;
console.log(this.EmployeeId)
this.getList(); this.getList();
}, },
filters:{ filters:{
...@@ -214,6 +286,46 @@ import moment from "moment" ...@@ -214,6 +286,46 @@ import moment from "moment"
}, },
methods: { methods: {
Remove(file, fileList){
this.htmsg.contractFile.forEach(item=>{
if(item.name==file.name){
this.htmsg.contractFile.splice(item,1);
}
})
},
UploadContract(){
this.apiJavaPost("/api/dmc/travelCoupom/salesUploadContract",this.htmsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message)
this.DownHt=false;
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
uploadTest(file){
let obj={};
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/Icon/";
this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.url=url;
obj.name=x.data.SourceFileName;
this.htmsg.contractFile.push(obj);
});
},
StHt(item){
this.DownHt=true;
this.htmsg.customId=item.customId;
this.htmsg.customId=item.customId;
this.htmsg.contractFile=item.contractFile;
this.fileList2=item.contractFile;
this.obj={};
},
ProvideChange(val){ ProvideChange(val){
this.form.provideItem=val.join(','); this.form.provideItem=val.join(',');
}, },
...@@ -251,7 +363,6 @@ import moment from "moment" ...@@ -251,7 +363,6 @@ import moment from "moment"
getList() { //获取数据 getList() { //获取数据
this.loading=true, this.loading=true,
this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomList",this.form, res => { this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomList",this.form, res => {
console.log("res",res);
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData;
......
src/components/TravelManager/TravelList/SalesTravelCoupomPlanList.vue
View file @ 43655f71
...@@ -31,29 +31,29 @@ ...@@ -31,29 +31,29 @@
<!-- <div style="margin: 10px 0;" class="fz14 color333">{{$t('adm.adm_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> --> <!-- <div style="margin: 10px 0;" class="fz14 color333">{{$t('adm.adm_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> -->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>团期ID</th> <th width="130">团期ID</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.tcnum}}({{item.tcid}})</td> <td>{{item.tcid}}({{item.tcnum}})</td>
<td>{{item.planIntroduce}}</td> <td>{{item.planIntroduce}}</td>
<td>{{item.travelTitle}}</td> <td>{{item.travelTitle}}</td>
<td>{{item.departmentName}}</td>
<td>{{item.salseName}}</td>
<td>{{item.companyName}}</td>
<td> <td>
<span v-if="item.planUseStatus==1">未采用</span> <span v-if="item.planUseStatus==1">未采用</span>
<span v-if="item.planUseStatus==2">采用</span> <span v-if="item.planUseStatus==2">采用</span>
<span v-if="item.planUseStatus==3">不合适</span> <span v-if="item.planUseStatus==3">不合适</span>
</td> </td>
<td>{{item.planPrice}}</td> <td>{{item.planPrice}}</td>
<td>
<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-tooltip>
</td>
</tr> </tr>
</table> </table>
...@@ -96,6 +96,25 @@ import moment from "moment" ...@@ -96,6 +96,25 @@ import moment from "moment"
}, },
methods: { methods: {
Delete(item){
this.$confirm('是否删除该条行程定制信息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/dmc/travelCoupom/salesDeleteTravelCoupomPlan",{planId:item.planId}, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message)
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
}).catch(() => {
});
},
Gourl(){ Gourl(){
this.$router.push({ this.$router.push({
name: "TravelManager5", name: "TravelManager5",
......
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