Skip to content

C
CRM
Commit f778b634 authored by youjie's avatar youjie
Browse files
Options

no message

parent 6b566e30
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 12 deletions
src/components/customerManage/customerOrder.vue
View file @ f778b634
......@@ -212,6 +212,38 @@
>
</el-date-picker>
</el-col>
<el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出发开始</span
>
<el-date-picker
v-model="msg.DepartSTime"
@change="getList"
size="mini"
style="width: 100%"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发开始"
>
</el-date-picker>
</el-col>
<el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出发结束</span
>
<el-date-picker
v-model="msg.DepartETime"
@change="getList"
size="mini"
style="width: 100%"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发结束"
>
</el-date-picker>
</el-col>
</el-row>
</div>
<div class="statistics">
......@@ -337,6 +369,8 @@ export default {
OrderType: "", //订单类型
FinishSTime: "",//完结开始时间
FinishETime: "",//完结结束时间
DepartSTime: "",//出发开始
DepartETime: "",//出发结束
},
ticketingStatusList: [], // 出票状态
OrderStatusList: [],
......
src/components/customerManage/myCustomerOrder.vue
View file @ f778b634
......@@ -178,6 +178,38 @@
>
</el-date-picker>
</el-col>
<el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出发开始</span
>
<el-date-picker
v-model="msg.DepartSTime"
@change="getList"
size="mini"
style="width: 100%"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发开始"
>
</el-date-picker>
</el-col>
<el-col :xs="8" :sm="7" :md="6" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出发结束</span
>
<el-date-picker
v-model="msg.DepartETime"
@change="getList"
size="mini"
style="width: 100%"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发结束"
>
</el-date-picker>
</el-col>
</el-row>
</div>
<div class="statistics">
......@@ -296,11 +328,13 @@ export default {
VisaStatus: "0", //出签状态
OrderStatus: "0", //订单状态
Q_IsCollect: "0", //收款状态
StartTime: "2022-04-28",
StartTime: "",
EndTime: "",
IsMyOrder: "1", //我的订单
FinishSTime: "",//完结开始时间
FinishETime: "",//完结结束时间
DepartSTime: "",//出发开始
DepartETime: "",//出发结束
},
ticketingStatusList: [], // 出票状态
OrderStatusList: [],
......
src/components/dev/payroll.vue
View file @ f778b634
......@@ -59,7 +59,8 @@
</el-table-column>
<el-table-column label="提成金额">
<template slot-scope="scope">
{{scope.row.Commission}}
<span :class="scope.row.Commission<0?'red':(scope.row.Commission==0?'black':'green')"
@click="commissionDetails(scope.row)">{{scope.row.Commission}}</span>
</template>
</el-table-column>
<el-table-column label="本次年终比例">
......@@ -78,7 +79,7 @@
</template>
</el-table-column>
<el-table-column label="备注" show-overflow-tooltip>
<el-table-column label="备注" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{scope.row.Remark}}
</template>
......@@ -87,7 +88,7 @@
</div>
<div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[10, 20, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -98,17 +99,23 @@
<el-button @click="outerVisible = false">取消</el-button>
<el-button type="primary" @click="outerVisible = false">确定</el-button>
</div>
</el-dialog>
<commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
</div>
</template>
<script>
import inAccordanceWith from "../dialogModel/inAccordanceWithDialog"
import commissionPopUp from "../dialogModel/commissionPopUp"
export default {
components:{inAccordanceWith},
components:{
inAccordanceWith,
commissionPopUp
},
data() {
return {
commissionPopUpVisible:false,
parameters:{},
outerVisible:false,
objNew:{},
commissionratioList:[],
......@@ -126,7 +133,7 @@
total:0,
msg: {
pageIndex: 1,
pageSize: 10,
pageSize: 20,
PeriodsId: -1
},
colors: [
......@@ -170,10 +177,19 @@
}
},
mounted() {
let $this = this
this.getList()
this.GetCommissionPeroidsList()
this.MsgBus.$on("closeaddContacts", function() {
$this.commissionPopUpVisible = false;
});
},
methods: {
// 提成详情
commissionDetails(item){
this.parameters = item
this.commissionPopUpVisible = true
},
// 自定义进度条文字
setItemTextW(row) {
return () => {
......@@ -313,4 +329,19 @@
.cursor-p:hover{
color: #409EFF;
}
.red{
color: red;
}
.black{
color: black;
cursor: pointer;
padding: 5px 10px 5px 0;
}
.green{
color: green;
cursor: pointer;
}
.black:hover,.green:hover{
color: #409EFF;
}
</style>
\ No newline at end of file
src/components/dialogModel/commissionPopUp.vue
View file @ f778b634
......@@ -162,7 +162,7 @@
</el-table>
<!-- 分页 -->
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[10, 20, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -201,10 +201,10 @@
dataList:[],
msg: {
pageIndex: 1,
pageSize: 20,
// EmpId: -1,
// PeriodsId: -1,
// EmpType: '-1',
pageSize: 10,
EmpId: -1,
PeriodsId: -1,
EmpType: '-1',
OrderId:''
},
loading:false,
......@@ -217,6 +217,9 @@
},
mounted() {
this.msg.OrderId = this.parameters.OrderId
this.msg.PeriodsId = this.parameters.PeriodsId
this.msg.EmpId = this.parameters.EmpId
this.msg.EmpType = this.parameters.EmpType
this.dialogTableVisible = true
this.getList()
},
......
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