Skip to content

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

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

parents 2ddfd43b ba5890cb
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 328 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 6347d589
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
</td> --> </td> -->
<td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px"> <td height="26px">
<el-input v-model="da.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input> <el-input v-model="da.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-select filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
<el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-input v-model="detailList.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input> <el-input v-model="detailList.UnitPrice" type="text" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
......
src/components/busManagement/busUsePriceDetails.vue
View file @ 6347d589
...@@ -163,15 +163,8 @@ ...@@ -163,15 +163,8 @@
<thead> <thead>
<tr> <tr>
<th> <th>
图片 时间
</th> </th>
<th>
地区/车辆类型
</th>
<th>
使用人数
</th>
<th> <th>
接送价格 接送价格
</th> </th>
...@@ -201,49 +194,36 @@ ...@@ -201,49 +194,36 @@
<tbody v-for="item in dataList" :key="item.subCode"> <tbody v-for="item in dataList" :key="item.subCode">
<tr> <tr>
<td> <td>
<img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" /> {{item.MonthStr}}
<img v-else src="../../assets/img/suplier.jpg" style="width:230px;height:60px;" />
</td> </td>
<td> <td>
{{getArea(item.AreaType)}}-{{item.BusTypeStr}} {{item.S_ReceivePrice}}
</td> </td>
<td> <td>
{{item.UseNum}} {{item.S_AllDayPrice}}
</td> </td>
<td> <td>
{{item.ReceivePrice}} {{item.S_HalfDayPrice}}
</td> </td>
<td> <td>
{{item.AllDayPrice}} {{item.S_AllDayHighSpeedFee}}
</td> </td>
<td> <td>
{{item.HalfDayPrice}} {{item.S_PickUpHighSpeedFee}}
</td> </td>
<td>{{item.S_AllDayChaDaiFee}}</td>
<td>{{item.S_PickUpChaDaiFee}}</td>
<td> <td>
{{item.AllDayHighSpeedFee}}
</td>
<td>
{{item.PickUpHighSpeedFee}}
</td>
<td>{{item.AllDayChaDaiFee}}</td>
<td>{{item.PickUpChaDaiFee}}</td>
<td rowspan="2">
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价"> <input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">
<a >详情</a>
<a @click="isdelete(item.Id)">删除</a> <a @click="isdelete(item.Id)">删除</a>
</td> </td>
</tr> </tr>
<tr>
<td colspan="8">
备注: {{item.Remark}}
</td>
</tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
</el-pagination> </el-pagination>
</td> </td>
</tr> </tr>
...@@ -260,107 +240,68 @@ ...@@ -260,107 +240,68 @@
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存" /> <input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存" />
</el-col> </el-col>
</el-row> </el-row>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px"> <el-form :model="addMsg" ref="addMsg" label-width="100px">
<el-row> <el-row>
<template v-if="addMsg.Id==0">
<el-col :span="5">
<el-form-item label="开始月份">
<el-date-picker v-model="addMsg.StartDateStr" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="结束月份">
<el-date-picker v-model="addMsg.EndDateStr" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
</el-col>
</template>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="地区" prop="AreaType"> <el-form-item label="接送报价">
<el-select filterable placeholder="请选择" v-model="addMsg.AreaType"> <el-input v-model="addMsg.S_ReceivePrice" @keyup.native="checkPrice(addMsg,'S_ReceivePrice')"></el-input>
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in AreaList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆类型" prop="BusType">
<el-select filterable placeholder="请选择" v-model="addMsg.BusType">
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="座位数" prop="UseNum"> <el-form-item label="送机报价" style="display:none;">
<el-input placeholder="座位数" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')" <el-input v-model="addMsg.S_SendPrice" @keyup.native="checkPrice(addMsg,'S_SendPrice')"></el-input>
class="busUsePeople">
<template slot="append">座</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="接送报价" prop="ReceivePrice"> <el-form-item label="全天报价">
<el-input v-model="addMsg.ReceivePrice" @keyup.native="checkPrice(addMsg,'ReceivePrice')"></el-input> <el-input v-model="addMsg.S_AllDayPrice" @keyup.native="checkPrice(addMsg,'S_AllDayPrice')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="送机报价" prop="SendPrice" style="display:none;"> <el-form-item label="半天报价">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input> <el-input v-model="addMsg.S_HalfDayPrice" @keyup.native="checkPrice(addMsg,'S_HalfDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="全天报价" prop="AllDayPrice">
<el-input v-model="addMsg.AllDayPrice" @keyup.native="checkPrice(addMsg,'AllDayPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="半天报价" prop="HalfDayPrice">
<el-input v-model="addMsg.HalfDayPrice" @keyup.native="checkPrice(addMsg,'HalfDayPrice')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" style="display:none;"> <el-col :span="5" style="display:none;">
<el-form-item label="小时报价" prop="HourPrice"> <el-form-item label="小时报价">
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input> <el-input v-model="addMsg.S_HourPrice" @keyup.native="checkPrice(addMsg,'S_HourPrice')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="全天高速" prop="AllDayHighSpeedFee"> <el-form-item label="全天高速">
<el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input> <el-input v-model="addMsg.S_AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'S_AllDayHighSpeedFee')">
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="接送高速" prop="PickUpHighSpeedFee">
<el-input v-model="addMsg.PickUpHighSpeedFee" @keyup.native="checkPrice(addMsg,'PickUpHighSpeedFee')">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="全天茶代" prop="AllDayChaDaiFee"> <el-form-item label="接送高速">
<el-input v-model="addMsg.AllDayChaDaiFee" @keyup.native="checkPrice(addMsg,'AllDayChaDaiFee')"> <el-input v-model="addMsg.S_PickUpHighSpeedFee" @keyup.native="checkPrice(addMsg,'S_PickUpHighSpeedFee')">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="接送茶代" prop="PickUpChaDaiFee"> <el-form-item label="全天茶代">
<el-input v-model="addMsg.PickUpChaDaiFee" @keyup.native="checkPrice(addMsg,'PickUpChaDaiFee')"> <el-input v-model="addMsg.S_AllDayChaDaiFee" @keyup.native="checkPrice(addMsg,'S_AllDayChaDaiFee')">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="币种" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)">
<el-option label='不限' :value="selectDefauleValue"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="汇率" prop="CurrentRate">
<el-input v-model="addMsg.CurrentRate" @keyup.native="checkRate(addMsg,'CurrentRate')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="车辆图片"> <el-form-item label="接送茶代">
<el-upload class="avatar-uploader" :http-request="UploadImage" :multiple="false" <el-input v-model="addMsg.S_PickUpChaDaiFee" @keyup.native="checkPrice(addMsg,'S_PickUpChaDaiFee')">
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"
style="width:200px;height:100px">
<i class="el-icon-upload2 avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="说明" prop="Remark">
<el-input type="textarea" autosize placeholder="请输入内容" v-model="addMsg.Remark">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -372,167 +313,63 @@ ...@@ -372,167 +313,63 @@
<script> <script>
export default { export default {
data() { data() {
var DealAreaValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择地区"));
} else {
callback();
}
};
var validateCurrency = (rule, value, callback) => {
if (value === 0) {
callback(new Error("请选择币种"));
} else {
callback();
}
};
return { return {
total: 0,
currentPage: 1,
dataList: "", dataList: "",
loading: false, loading: false,
isShow: false, isShow: false,
BusTypeList: "",
selectDefauleValue: 0,
AreaList: [],
currencyTypeList: [],
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 18 pageSize: 10,
BusPriceId: 0,
total: 0,
currentPage: 1,
}, },
//表单json
addMsg: { addMsg: {
ID: 0, Id: 0, //主键编号
UseNum: "", StartDateStr: "", //开始月份
BusType: "", EndDateStr: "", //结束月份
ReceivePrice: "", MonthStr: "", //月份
SendPrice: "", BusPriceId: 0, //车辆报价主表编号
AllDayPrice: "", S_ReceivePrice: 0, //接机价格
HalfDayPrice: "", S_SendPrice: 0, //送机价格
HourPrice: "", S_AllDayPrice: 0, //全天价格
Remark: "", S_HalfDayPrice: 0, //半天价格
AreaType: 0, S_HourPrice: 0, //小时价格
CurrencyId: 0, S_AllDayHighSpeedFee: 0, //全天高速费
CurrentRate: 0, S_PickUpHighSpeedFee: 0, //接送高速费
AllDayHighSpeedFee: 0, //全天高速费 S_AllDayChaDaiFee: 0, //全天茶代费
PickUpHighSpeedFee: 0, //接送高速费 S_PickUpChaDaiFee: 0, //接送茶代费
AllDayChaDaiFee: 0, //全天茶代费
PickUpChaDaiFee: 0, //接送茶代费
BusImage: '', //车辆图片
ShowBusImage: "",
DetailsList:[],//报价详情列表
},
//表单验证
rules: {
AreaType: [{
validator: DealAreaValidate,
trigger: "change",
required: true
}],
CurrencyId: [{
validator: validateCurrency,
trigger: "change",
required: true
}],
BusType: [{
required: true,
message: "请选择车辆类型",
trigger: "change"
}],
UseNum: [{
required: true,
message: "请输入人数",
trigger: "change"
}],
ReceivePrice: [{
required: true,
message: "请输入接机价格",
trigger: "change"
}],
SendPrice: [{
required: true,
message: "请输入送机价格",
trigger: "change"
}],
AllDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HalfDayPrice: [{
required: true,
message: "请输入全天价格",
trigger: "change"
}],
HourPrice: [{
required: true,
message: "请输入小时价格",
trigger: "change"
}],
AllDayHighSpeedFee: [{
required: true,
message: "请输入全天高速价格",
trigger: "change"
}],
PickUpHighSpeedFee: [{
required: true,
message: "请输入接送高速价格",
trigger: "change"
}],
AllDayChaDaiFee: [{
required: true,
message: "请输入全天茶代价格",
trigger: "change"
}],
PickUpChaDaiFee: [{
required: true,
message: "请输入接送茶代价格",
trigger: "change"
}]
} }
}; };
}, },
methods: { methods: {
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var obj = this.$DMCUtils.DMCImageObj();
var str = x.name;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.BusImage = x.data.FilePath;
this.addMsg.ShowBusImage = imgUrl;
});
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.initData(); this.initData();
}, },
resetPageIndex() { resetPageIndex() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.msg.currentPage = 1;
}, },
initData() { initData() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"busprice_get_GetBusPricePageList", "buspricedetails_get_GetPageList",
this.msg, this.msg,
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;
this.total = res.data.data.count; this.msg.total = res.data.data.count;
} }
}, },
null null
); );
}, },
saveInfo() { saveInfo() {
console.log("addMsg",this.addMsg);
this.apipost( this.apipost(
"busprice_post_SetBusPrice", "buspricedetails_post_SetPriceDetails",
this.addMsg, this.addMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -547,47 +384,15 @@ ...@@ -547,47 +384,15 @@
null null
); );
}, },
//获取地区下拉
getAreaList() {
this.apipost(
"busprice_get_GetBusAreaType", {},
res => {
if (res.data.resultCode == 1) {
this.AreaList = res.data.data;
}
},
null
);
},
//根据ID获取地区
getArea(AreaType) {
var AreaName = '';
this.AreaList.forEach(item => {
if (item.Id == AreaType) {
AreaName = item.Name
}
})
return AreaName;
},
getCurrencyType() { // 币种类型
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
this.currencyTypeList = res.data.data;
}
}, err => {})
},
//修改管理报价 //修改管理报价
managePrice(ID) { managePrice(ID) {
this.addMsg.ID = ID; this.addMsg.Id = ID;
this.isShow = true; this.isShow = true;
let msg = { let msg = {
ID: ID ID: ID
}; };
this.apipost( this.apipost(
"busprice_get_GetBusPrice", "buspricedetails_get_GetPriceDetails",
msg, msg,
res => { res => {
this.addMsg = res.data.data; this.addMsg = res.data.data;
...@@ -595,27 +400,6 @@ ...@@ -595,27 +400,6 @@
null null
); );
}, },
/*获取车辆类型列表*/
getBusTypeList() {
this.apipost(
"bus_get_GetBusTypeList",
null,
res => {
if (res.data.resultCode == 1) {
this.BusTypeList = res.data.data;
}
},
null
);
},
//币种下拉获取汇率
getRate(ID) {
this.currencyTypeList.forEach(x => {
if (x.ID == ID) {
this.addMsg.CurrentRate = x.Rate;
}
});
},
//取消 //取消
cancelPanel() { cancelPanel() {
this.isShow = false; this.isShow = false;
...@@ -624,29 +408,23 @@ ...@@ -624,29 +408,23 @@
//添加 //添加
addPanel() { addPanel() {
this.isShow = true; this.isShow = true;
this.addMsg.ID = 0; this.addMsg.Id = 0;
this.clearInfo(); this.clearInfo();
}, },
clearInfo() { clearInfo() {
this.addMsg = { this.addMsg.Id = 0;
ID: 0, this.addMsg.StartDateStr = "";
UseNum: "", this.addMsg.EndDateStr = "";
BusType: "", this.addMsg.MonthStr = "";
ReceivePrice: "", this.addMsg.S_ReceivePrice = 0;
SendPrice: "", this.addMsg.S_SendPrice = 0;
AllDayPrice: "", this.addMsg.S_AllDayPrice = 0;
HalfDayPrice: "", this.addMsg.S_HalfDayPrice = 0;
HourPrice: "", this.addMsg.S_HourPrice = 0;
Remark: "", this.addMsg.S_AllDayHighSpeedFee = 0;
AreaType: 0, this.addMsg.S_PickUpHighSpeedFee = 0;
CurrencyId: 0, this.addMsg.S_AllDayChaDaiFee = 0;
CurrentRate: 0, this.addMsg.S_PickUpChaDaiFee = 0;
AllDayHighSpeedFee: 0,
PickUpHighSpeedFee: 0,
AllDayChaDaiFee: 0,
PickUpChaDaiFee: 0,
BusImage: ''
};
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
...@@ -670,7 +448,7 @@ ...@@ -670,7 +448,7 @@
ID: ID ID: ID
}; };
that.apipost( that.apipost(
"busprice_post_RemoveBusPrice", "buspricedetails_post_RemovePriceDetails",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -683,10 +461,9 @@ ...@@ -683,10 +461,9 @@
} }
}, },
mounted() { mounted() {
this.msg.BusPriceId = this.$route.query.id;
this.addMsg.BusPriceId = this.$route.query.id;
this.initData(); this.initData();
this.getAreaList();
this.getCurrencyType();
this.getBusTypeList();
} }
}; };
......
src/components/commonPage/commissonBill.vue
View file @ 6347d589
...@@ -11,24 +11,19 @@ ...@@ -11,24 +11,19 @@
top:4.5rem; top:4.5rem;
width:100%; width:100%;
text-align: center; text-align: center;
font-family: "fangzheng"!important;
} }
.cb_year{ .cb_year{
color:#4E4E4C; color:#4E4E4C;
font-size:2.5rem; font-size:2.5rem;
font-weight: bold; font-weight: bold;
position: relative;
top:-5px;
margin-right:1rem; margin-right:1rem;
font-family: "PingFangSC-Fine";
} }
.cb_month{ .cb_month{
font-size:2.5rem; font-size:2.5rem;
color:#257BF1; color:#257BF1;
margin:0 1rem; margin:0 1rem;
position: relative;
top:-5px;
font-weight: bold; font-weight: bold;
font-family: "PingFangSC-Fine";
} }
.cb_PeoInfo{ .cb_PeoInfo{
position: absolute; position: absolute;
...@@ -40,6 +35,7 @@ ...@@ -40,6 +35,7 @@
text-align: center; text-align: center;
color:#FBA838; color:#FBA838;
font-size:3.5rem; font-size:3.5rem;
font-family: "fangzheng"!important;
} }
.cb_PeoInfo table{ .cb_PeoInfo table{
width:100%; width:100%;
...@@ -54,7 +50,7 @@ ...@@ -54,7 +50,7 @@
color:#257BF1; color:#257BF1;
font-size:2.5rem; font-size:2.5rem;
font-weight: bold; font-weight: bold;
font-family: "PingFangSC-Fine"; font-family: "fangzheng";
} }
.cb_benyue span:first-child{ .cb_benyue span:first-child{
font-size:1.5rem; font-size:1.5rem;
...@@ -62,6 +58,9 @@ ...@@ -62,6 +58,9 @@
.cb_Tleft{ .cb_Tleft{
width:40%; width:40%;
text-align: left; text-align: left;
font-size:30px;
font-weight: bold;
font-family: "fangzheng";
} }
.cb_Tright{ .cb_Tright{
width:60%; width:60%;
...@@ -72,6 +71,7 @@ ...@@ -72,6 +71,7 @@
top:25rem; top:25rem;
padding:0 5rem; padding:0 5rem;
width:100%; width:100%;
font-family: "fangzheng";
} }
.cb_geren div{ .cb_geren div{
margin-top:1rem; margin-top:1rem;
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
line-clamp: 2; line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
font-family: "fangzheng";
} }
.cb_Arrow{ .cb_Arrow{
position: absolute; position: absolute;
...@@ -98,7 +99,11 @@ ...@@ -98,7 +99,11 @@
.cb_Arrow div:last-child{ .cb_Arrow div:last-child{
color:#C4A873; color:#C4A873;
font-size:1.5rem; font-size:1.5rem;
font-family: "PingFangSC-Fine"; font-family: "fangzheng";
}
.Cb_titleSpan{
font-size:2.5rem;
font-weight:bold;
} }
</style> </style>
...@@ -106,16 +111,20 @@ ...@@ -106,16 +111,20 @@
<div class="cbContent" v-if="isShow"> <div class="cbContent" v-if="isShow">
<div class="cb_Title"> <div class="cb_Title">
<span class="cb_year">{{dataList.SellGeneralContent.Year}}</span> <span class="cb_year">{{dataList.SellGeneralContent.Year}}</span>
<span><img src="../../assets/img/imbg/nian.png"/></span> <span class="Cb_titleSpan">
年
</span>
<span class="cb_month">{{dataList.SellGeneralContent.Month}}</span> <span class="cb_month">{{dataList.SellGeneralContent.Month}}</span>
<span><img src="../../assets/img/imbg/yue.png" alt=""/></span> <span class="Cb_titleSpan">
月提成报告
</span>
</div> </div>
<div class="cb_PeoInfo"> <div class="cb_PeoInfo">
<div class="cb_Name">{{dataList.UserName}}</div> <div class="cb_Name">{{dataList.UserName}}</div>
<table> <table>
<tr> <tr>
<td class="cb_Tleft"> <td class="cb_Tleft">
<img src="../../assets/img/imbg/bytc.png" alt=""/> 本月提成
</td> </td>
<td class="cb_Tright"> <td class="cb_Tright">
<span class="cb_benyue"><span>¥</span>{{dataList.SellGeneralContent.totalCommission}}</span> <span class="cb_benyue"><span>¥</span>{{dataList.SellGeneralContent.totalCommission}}</span>
...@@ -123,7 +132,7 @@ ...@@ -123,7 +132,7 @@
</tr> </tr>
<tr style="display:none;"> <tr style="display:none;">
<td class="cb_Tleft"> <td class="cb_Tleft">
<img src="../../assets/img/imbg/byxse.png" alt=""/>
</td> </td>
<td class="cb_Tright"> <td class="cb_Tright">
<span class="cb_benyue"><span>¥</span>12523268.00</span> <span class="cb_benyue"><span>¥</span>12523268.00</span>
...@@ -132,8 +141,8 @@ ...@@ -132,8 +141,8 @@
</table> </table>
</div> </div>
<div class="cb_geren"> <div class="cb_geren">
<span> <span style="font-size:30px;font-weight: bold;">
<img src="../../assets/img/imbg/grxy.png" alt=""/> 个人宣言
</span> </span>
<div> <div>
{{dataList.SellGeneralContent.ShareContent}} {{dataList.SellGeneralContent.ShareContent}}
......
src/components/index.vue
View file @ 6347d589
...@@ -1610,6 +1610,10 @@ export default { ...@@ -1610,6 +1610,10 @@ export default {
setInterval(function(){ setInterval(function(){
that.getNumber(); that.getNumber();
},600000) },600000)
this.MsgBus.$on('reSetMSG',function(){
that.getDynamic();
that.getMyDynamic();
})
const permissionNow = Notification.requestPermission(); const permissionNow = Notification.requestPermission();
var hiddenProperty = var hiddenProperty =
......
src/components/sale/sale.vue
View file @ 6347d589
...@@ -788,6 +788,8 @@ ...@@ -788,6 +788,8 @@
this.Success(res.data.message); this.Success(res.data.message);
this.iWorkbench(); this.iWorkbench();
this.resetCommission(); this.resetCommission();
this.MsgBus.$emit('reSetMSG');
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/plug/index.js
View file @ 6347d589
...@@ -114,8 +114,8 @@ export default { ...@@ -114,8 +114,8 @@ export default {
let domainUrl = ''; let domainUrl = '';
// domainUrl = "http://testapi.oytour.com"; // domainUrl = "http://testapi.oytour.com";
// domainUrl = "http://192.168.2.214:8082"; // domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.65:8025"; domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083"; // domainUrl = "http://192.168.2.16:8083";
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
...@@ -522,7 +522,8 @@ export default { ...@@ -522,7 +522,8 @@ export default {
//PDF预览 //PDF预览
Vue.prototype.previewPDF = function (url) { Vue.prototype.previewPDF = function (url) {
window.open(this.domainManager().PDFViewUrl + url); // window.open(this.domainManager().PDFViewUrl + url);
window.open(url);
}, },
//文件下载 //文件下载
Vue.prototype.downloadFile = function (objectKey) { Vue.prototype.downloadFile = function (objectKey) {
......
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