Skip to content

S
SuperMan
Commit bb9e144c authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 0554f9fb
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 46 deletions
src/components/TravelManager/customizedcar/costManagement.vue
View file @ bb9e144c
......@@ -38,8 +38,8 @@
<el-input @clear="msg.pageIndex=1,getList()" @keyup.enter.native="msg.pageIndex=1,getList()" clearable
style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
<el-select style="width:100px" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option_t" :key="item.Id" :label="item.name" :value="item.Id">
</el-option>
</el-select>
</el-input>
......@@ -66,6 +66,15 @@
<el-table-column prop="Income" label="金额" width="80">
</el-table-column>
<el-table-column prop="CouponMoney" label="成本" width="80">
<template slot-scope="scope">
<div style="display: flex;align-items: center;">
<span v-if="scope.row.OrderType==1">{{scope.row.HotelList[0].CostMoney}}</span>
<span v-if="scope.row.OrderType==2">{{scope.row.DiningList[0].CostMoney}}</span>
<span v-if="scope.row.OrderType==3">{{scope.row.TicketList[0].CostMoney}}</span>
<span v-if="scope.row.OrderType==4">{{scope.row.CarList[0].CostMoney}}</span>
<span v-if="scope.row.OrderType==5">{{scope.row.SDGoodsList[0].CostMoney}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="CostFinanceId" label="成本单据" width="100">
<template slot-scope="scope">
......@@ -101,11 +110,15 @@
</div>
<div style="margin-top:10px">
<span style="margin-right:10px">客户名称</span>
<el-select class="w200" v-model="finMsg.ClientID" size="small" placeholder="请选择" >
<el-select class="w200" v-model="finMsg.ClientID" size="small" placeholder="请选择" @change="getName(finMsg.ClientID)">
<el-option v-for="item in ClientAccountList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
<div style="margin-top:10px">
<span style="margin-right:10px">{{objName}}</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="choiceFin=false">取消</el-button>
<el-button type="primary" size="small" @click="setFince()">确定</el-button>
......@@ -167,7 +180,7 @@
platList: [],
orderTypeList:[],
msgId: 1,
option: [{Id: 1,name: '订单号' },
option_t: [{Id: 1,name: '订单号' },
{ Id: 2, name: '用户名' },
{Id: 3,name: '用户ID' },
{Id: 4,name: '联系人' },
......@@ -176,6 +189,7 @@
msgVal: '',
ClientTypeList:[],
ClientAccountList:[],
objName:'',
}
},
......@@ -248,13 +262,20 @@
this.Info('请选择客户名称');
return
}
const loading = this.$loading({
lock: true,
text: '生成财务单据中...',
spinner: 'el-icon-loading',
});
this.lxymallapipost("/api/DmcOrder/SetDmcOrderCostFinance", this.finMsg, res => {
if (res.data.resultCode == 1) {
this.Success('设置成功');
this.choiceFin = false;
loading.close();
}else {
this.Error(res.data.message)
this.choiceFin = false;
loading.close();
}
})
},
......@@ -320,6 +341,7 @@
this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
if(res.data.resultCode == 1) {
this.finMsg.ClientID = '';
this.objName = '';
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x=>{
......@@ -335,7 +357,17 @@
this.ClientAccountList = ClientAccountList;
}
}, err => {})
},
getName(id){
this.objName='';
this.ClientAccountList.map(x=>{
if(x.ID == id){
this.objName=x.Nom+' '+x.OpenBankName;
return
}
})
}
}
};
......
src/components/TravelManager/customizedcar/travelOrders.vue
View file @ bb9e144c
......@@ -171,33 +171,16 @@
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计：￥{{item.Income}}
<img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../../assets/img/userman/edit1.png" alt="">
<!-- <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
src="../../../assets/img/userman/edit1.png" alt=""> -->
</span>
<span style="cursor:pointer">成本：￥{{ list.CostMoney}}
<img v-if="item.OrderStatus!==4" @click="costBtn(list,1)"
<img v-if="item.OrderStatus!==4" @click="costBtn_t(list,item)"
src="../../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer" v-if='item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'>成人：{{ list.PeopleNumber}}人</span>
<span style="cursor:pointer" v-if='item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'>儿童：{{ list.ChildNumber}}人 </span>
<div v-if='item.OrderType ==1 '>
<el-table
:data="item.HotelList[0].PriceList"
border
style="width: 100%;font-size:12px;">
<el-table-column
prop="Date"
label="日期"
width="120">
</el-table-column>
<el-table-column
prop="B2BPrice"
label="b2b价格"
width="120">
</el-table-column>
</el-table>
</div>
</div>
</div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
......@@ -710,18 +693,18 @@
</span>
</el-dialog>
<!-- 商品、运费成本的修改 -->
<el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
<el-form :model="costMsg" ref="costMsg" label-width="80px">
<el-form-item :label="cosType==1?'商品成本':'运费成本'">
<el-input size="small" v-model="costMsg.Money" step="1" min="0"
<!-- 成本修改 新增 6.2日 -->
<el-dialog title="商品成本修改" :visible.sync="costDig_t" width="600px">
<el-form :model="costMsg" ref="cost_tMSg" label-width="80px">
<el-form-item label="商品成本">
<el-input size="small" v-model="cost_tMSg.CostMoney" step="1" min="0"
onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="costDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm('costMsg')">确 定</el-button>
<el-button size="small" @click="costDig_t = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm_t('costMsg')">确 定</el-button>
</span>
</el-dialog>
<!-- 保险成本的修改 -->
......@@ -738,21 +721,20 @@
<el-button size="small" type="primary" @click="costForm2('CostMoney')">确 定</el-button>
</span>
</el-dialog>
<!-- 商品 供应商修改 -->
<el-dialog title="修改供应商" :visible.sync="upSupliDilog" width="400px">
<el-form label-width="90px">
<el-form-item label="供应商">
<el-select filterable v-model="SupplierId" size="small" placeholder="请选择">
<el-option v-for="item in SuplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
<el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
<el-form :model="costMsg" ref="costMsg" label-width="80px">
<el-form-item :label="cosType==1?'商品成本':'运费成本'">
<el-input size="small" v-model="costMsg.Money" step="1" min="0"
onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="upSupliDilog = false">取 消</el-button>
<el-button size="small" type="primary" @click="SaveSuplier">确 定</el-button>
<el-button size="small" @click="costDig = false">取 消</el-button>
<el-button size="small" type="primary" @click="costForm('costMsg')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -773,6 +755,7 @@
priceDig: false,
costDig: false, //商品、运费成本的修改
costDig2: false, //商品、运费成本的修改
costDig_t:false,
cosType: 1,
costMsg: {
Id: 0,
......@@ -942,6 +925,8 @@
SupplierId: 0, //公用供应商id 给弹窗用
CommonId: 0, //公用id 给弹窗用
TenantId: 0,
cost_tMSg:{},//成本管理
}
},
created() {
......@@ -1586,6 +1571,31 @@
}
})
},
costBtn_t(list,item){
this.cost_tMSg.OrderDetailId=list.Id;
this.cost_tMSg.OrderType=item.OrderType;
this.cost_tMSg.CostMoney=list.CostMoney;
console.log(list.CostMoney)
this.costDig_t = true
},
costForm_t(){//成本修改 新的
if(this.cost_tMSg.CostMoney==''){
this.Info('请输入修改成本金额')
return
}
this.lxymallapipost('/api/DmcOrder/SetDmcOrderCost', this.cost_tMSg,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.costDig_t = false;
} else {
this.Error(res.data.message);
}
},
null
);
},
costBtn(list, type) {
this.cosType = type;
if (type == 1) {
......@@ -1605,6 +1615,7 @@
this.costDig2 = true;
},
costForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -2040,8 +2051,6 @@
border-radius: 2px;
margin-right: 4px;
}
.orderList .el-table td, .el-table th{
padding: 0;
}
</style>
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