Skip to content

S
SuperMan
Commit 1a261742 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 8c720ecf adb35b28
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 54 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 1a261742
...@@ -868,8 +868,15 @@ export default { ...@@ -868,8 +868,15 @@ export default {
this.loading = true; this.loading = true;
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){
// this.MsgBus.$emit('msg'); this.$confirm('是否继续制单?', '提示', {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
}).then(() => {
this.$router.push({ name:'addFinancialDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}})
}).catch(() => {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;
});
}else{ }else{
this.resultCode = res.data.resultCode; this.resultCode = res.data.resultCode;
this.$message.error(res.data.message); this.$message.error(res.data.message);
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 1a261742
...@@ -1044,7 +1044,16 @@ export default { ...@@ -1044,7 +1044,16 @@ export default {
console.log(this.msg); console.log(this.msg);
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){
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) this.$confirm('是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
type: 'warning'
}).then(() => {
this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});
}).catch(() => {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type}}) ;
});
}else{ }else{
this.resultCode = res.data.resultCode; this.resultCode = res.data.resultCode;
this.$message.error(res.data.message); this.$message.error(res.data.message);
......
src/components/busManagement/BusApportionManagement.vue
View file @ 1a261742
<style> <style>
.edHeight { .BusedHeight {
display: block !important; display: block !important;
height: 300px; height: 450px;
} }
.FinaceItem span{ .FinaceItem span{
display: inline-block; display: inline-block;
...@@ -75,13 +75,14 @@ ...@@ -75,13 +75,14 @@
:total="total" :total="total"
:pageSize="msg.pageSize" :pageSize="msg.pageSize"
:pageIndex="msg.pageIndex" :pageIndex="msg.pageIndex"
:handleCurrentChange="handleCurrentChanges"
:multiple-sort="multipleSort" :multiple-sort="multipleSort"
:is-loading="loading" :is-loading="loading"
sort-always sort-always
@sort-change="sortChange" @sort-change="sortChange"
@on-custom-comp='customCompFunc' @on-custom-comp='customCompFunc'
></v-table> ></v-table>
<div class="_bus_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''"> <div class="_bus_edit _scrollbar" v-if="addShow" :class="addShow==true?'BusedHeight':''">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<p class="_tit">添加分摊</p> <p class="_tit">添加分摊</p>
...@@ -159,7 +160,7 @@ ...@@ -159,7 +160,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="车配号" prop="CarNum"> <el-form-item label="车配号">
<el-date-picker class="w200" <el-date-picker class="w200"
v-model="Year" v-model="Year"
type="year" type="year"
...@@ -168,7 +169,7 @@ ...@@ -168,7 +169,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item> <el-form-item prop="CarNum">
<el-input v-model="addMsg.CarNum" maxlength="20"></el-input> <el-input v-model="addMsg.CarNum" maxlength="20"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -245,7 +246,7 @@ ...@@ -245,7 +246,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="到期结算日"> <el-form-item label="到期结算日" prop="PayDate">
<el-date-picker type="date" class="w200" v-model="addMsg.PayDate" value-format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" class="w200" v-model="addMsg.PayDate" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -253,7 +254,7 @@ ...@@ -253,7 +254,7 @@
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="团队编号"> <el-form-item label="团队编号">
<el-input placeholder="请输入" v-model="TCIDList.TCID"></el-input> <el-input placeholder="请输入" v-model="TCIDS"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
...@@ -319,7 +320,7 @@ export default { ...@@ -319,7 +320,7 @@ export default {
loading: true, loading: true,
outerVisible:false, outerVisible:false,
msg: { msg: {
pageSize:20, pageSize:15,
pageIndex:1, pageIndex:1,
CarDistribution:'', CarDistribution:'',
StartTime:'', StartTime:'',
...@@ -353,6 +354,8 @@ export default { ...@@ -353,6 +354,8 @@ export default {
rules:{ rules:{
f_UnitPrice: [{ required: true, message: "请输入金额", trigger: "blur" }], f_UnitPrice: [{ required: true, message: "请输入金额", trigger: "blur" }],
CarNumber: [{ required: true, message: "请输入数量", trigger: "blur" }], CarNumber: [{ required: true, message: "请输入数量", trigger: "blur" }],
PayDate: [{ required: true, message: "请选择到期结算日", trigger: "blur" }],
CarNum: [{ required: true, message: "请填写车配号", trigger: "blur" }],
}, },
isCked:'1', isCked:'1',
//供应商下拉 //供应商下拉
...@@ -373,6 +376,8 @@ export default { ...@@ -373,6 +376,8 @@ export default {
TotalMoney:'', TotalMoney:'',
//全部团队编号 //全部团队编号
allTeamList:[], allTeamList:[],
//TCID
TCIDS:'',
//团队编号 //团队编号
TCIDList:{ TCIDList:{
TCID:'', TCID:'',
...@@ -404,16 +409,16 @@ export default { ...@@ -404,16 +409,16 @@ export default {
this.isReady = false; this.isReady = false;
let that = this; let that = this;
let License = { let License = {
title: "车牌号", title: "车配号",
field: "CarDistribution", field: "CarDistribution",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
// result: "", result: "",
// filterMultiple: false, filterMultiple: false,
// filters: [{}], filters: [{}],
// type: "text" type: "text"
}; };
let ShareDate = { let ShareDate = {
field: "CreateTime", field: "CreateTime",
...@@ -422,10 +427,10 @@ export default { ...@@ -422,10 +427,10 @@ export default {
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
// filterMultiple: false, result:{},
// filters: [{}], filterMultiple:false,
// result: "", filters: [{}],
// type: "select" type:'datetime'
}; };
let Details = { let Details = {
field: "Description", field: "Description",
...@@ -465,50 +470,86 @@ export default { ...@@ -465,50 +470,86 @@ export default {
// filters: [{}], // filters: [{}],
// type: "text" // type: "text"
}; };
let opera = { let operaler = {
title: "操作", title: "操作人员",
field: "CreateByName", field: "CreateByName",
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
width: 80, width: 80,
isResize: true, isResize: true,
}; };
let Operate = {
title: "操作",
titleAlign: "left",
columnAlign: "left",
width: 80,
isResize: false,
componentName:'table-operation'
}
this.columns = []; this.columns = [];
this.columns.push(License); this.columns.push(License);
this.columns.push(ShareDate); this.columns.push(ShareDate);
this.columns.push(Details); this.columns.push(Details);
this.columns.push(ShareTeam); this.columns.push(ShareTeam);
this.columns.push(ProductDoc); this.columns.push(ProductDoc);
this.columns.push(opera); this.columns.push(operaler);
this.columns.push(Operate);
this.isReady = true; this.isReady = true;
}, },
customCompFunc(params){ customCompFunc(params){
// if (params.type === 'delete'){ this.financeinfoRemove(params.id,params.text)
// this.financeinfoRemove(params.id,params.alias) },
// }else if (params.type === 'edit'){ financeinfoRemove(id, text) {
// this.editCurency(params.id) this.$confirm(
// this.text='修改' "是否对" + "“" + text + "”" + "进行删除操作？删除后不可恢复！",
// this.addShow=true "提示",
// this.addCuren=true {
// } confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
)
.then(() => {
this.apipost(
"bus_post_DelCarfareApportion",
{ CarId: id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
this.getList();
},
err => {}
);
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除"
});
});
}, },
sortChange(param) { sortChange(param) {
// if (param.Royalty != "") {
// this.msg.OrderBy = `Royalty ${param.Royalty}`;
// } else if (param.Initialbalance != "") {
// this.msg.OrderBy = `Initialbalance ${param.Initialbalance}`;
// }
//this.getList();
}, },
filterMethod(filters) {
filterMethod() { this.msg.CarDistribution = filters.CarDistribution;
// this.msg.License = filters.License; this.msg.StartTime = filters.CreateTime.beginDate;
//this.msg.Details = filters.Details; this.msg.EndTime = filters.CreateTime.endDate;
if(this.msg.StartTime==null){
this.msg.StartTime='';
}
if(this.msg.EndTime==null){
this.msg.EndTime='';
}
this.msg.pageIndex = 1;
this.getList();
}, },
handleCurrentChanges(val) { handleCurrentChanges(val) {
//this.msg.pageIndex = val; this.msg.pageIndex = val;
// this.getList(); this.getList();
}, },
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -518,18 +559,15 @@ export default { ...@@ -518,18 +559,15 @@ export default {
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'resssss');
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
console.log(this.dataList,'dataList');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
},
cancelEdit(){
}, },
initAddMsg() { initAddMsg() {
//初始化添加、修改数据 //初始化添加、修改数据
...@@ -547,8 +585,11 @@ export default { ...@@ -547,8 +585,11 @@ export default {
f_currency:1, f_currency:1,
f_rate:'', f_rate:'',
ClientID:0, ClientID:0,
PayDate:'' PayDate:'',
}; };
this.Year = '';
this.TCIDS ='';
this.allTeamList = [];
this.addMsg = newMsg; this.addMsg = newMsg;
}, },
...@@ -641,6 +682,7 @@ export default { ...@@ -641,6 +682,7 @@ export default {
this.addShow = true; this.addShow = true;
var rate = this.addMsg.f_currency; var rate = this.addMsg.f_currency;
this.getRate(rate); this.getRate(rate);
this.initAddMsg();
}, },
//输入金额得到总价 //输入金额得到总价
getTotalMoney(){ getTotalMoney(){
...@@ -682,6 +724,7 @@ export default { ...@@ -682,6 +724,7 @@ export default {
this.apipost('bus_get_ScreeningTravelForCarNum',msg, res => { this.apipost('bus_get_ScreeningTravelForCarNum',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.allTeamList = res.data.data; this.allTeamList = res.data.data;
console.log(this.allTeamList,'allTeamList');
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -694,14 +737,20 @@ export default { ...@@ -694,14 +737,20 @@ export default {
//根据团号 验证该团号是否可以 //根据团号 验证该团号是否可以
checkIsUse(){ checkIsUse(){
let msg = { let msg = {
TCID:this.TCIDList.TCID TCID:this.TCIDS
} }
this.apipost('bus_get_ValidataTravelState',msg, res => { this.apipost('bus_get_ValidataTravelState',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.allTeamList.push(this.TCIDList); var obj = {
TCID:'',
TCNUM:""
}
obj.TCID = this.TCIDS
this.allTeamList.push(obj);
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
this.TCIDS = '';
}, err => {}) }, err => {})
}, },
//保存 //保存
...@@ -742,6 +791,7 @@ export default { ...@@ -742,6 +791,7 @@ export default {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.addShow = false; this.addShow = false;
this.Success(res.data.message); this.Success(res.data.message);
this.getList();
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -783,7 +833,7 @@ export default { ...@@ -783,7 +833,7 @@ export default {
created(){ created(){
Vue.component('table-docment',{ //产生单据样式 Vue.component('table-docment',{ //产生单据样式
template:`<div class='FinaceItem'> template:`<div class='FinaceItem'>
<span v-for='item in rowData.FinanceIdList'>{{item}}</span> <span style='cursor:pointer;' @click='goDocment("FinancialDocumentsDetail",item)' v-for='item in rowData.FinanceIdList'>{{item}}</span>
</div>`, </div>`,
props:{ props:{
rowData:{ rowData:{
...@@ -797,12 +847,15 @@ export default { ...@@ -797,12 +847,15 @@ export default {
} }
}, },
methods:{ methods:{
//跳转财务单据
goDocment(path, id) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: '单据详情'} });
}
} }
}) })
Vue.component('table-teamList',{ //分摊的团样式 Vue.component('table-teamList',{ //分摊的团样式
template:`<div class='FinaceItem'> template:`<div class='FinaceItem'>
<span v-for='item in rowData.TCIDList'>{{item}}</span> <span style='cursor:pointer;' @click='goUrlX("productQuery",item)' v-for='item in rowData.TCIDList'>{{item}}</span>
</div>`, </div>`,
props:{ props:{
rowData:{ rowData:{
...@@ -816,7 +869,36 @@ export default { ...@@ -816,7 +869,36 @@ export default {
} }
}, },
methods:{ methods:{
goUrlX (path, id) {
this.$router.push({
name: path,
query: {id: id, blank: 'y', tab: '产品查询'}
})
},
}
})
//操作按钮
Vue.component('table-operation',{
template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;
left:-5px;padding-top: 6px;padding-top:6px;'></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button>
</div>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
deleteRow(){
let params = {type:'delete',id:this.rowData.ID,text:this.rowData.CarDistribution};
this.$emit('on-custom-comp',params);
}
} }
}) })
} }
......
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