Commit 14178958 authored by huangyuanyuan's avatar huangyuanyuan

update

parent 7559f646
......@@ -1109,7 +1109,6 @@ export default {
var diff = endDate- startDate; //时间差的毫秒数
//计算出相差天数
var days = Math.floor(diff / (24 * 3600 * 1000));
//计算出小时数
var leave1 = diff % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
var hours = Math.floor(leave1 / (3600 * 1000));
......@@ -1120,16 +1119,19 @@ export default {
//计算相差秒数
var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
var seconds = Math.round(leave3 / 1000);
// var returnStr = seconds + "秒";
if (days > 0) {
returnStr += "<span class='bg'>"+days+"</span>" + "天";
}
if (hours > 0) {
returnStr += "<span class='bg'>"+hours+"</span>" + "时";
}
if (minutes > 0) {
returnStr += "<span class='bg'>"+minutes+"</span>" + "分";
}
// if (days > 0) {
// returnStr += "<span class='bg'>"+days+"</span>" + "天";
// }else{
// returnStr += "<span class='bg'>"+0+"</span>" + "天";
// }
// if (hours > 0) {
// returnStr += "<span class='bg'>"+hours+"</span>" + "时";
// }else{
// returnStr += "<span class='bg'>"+0+"</span>" + "时";
// }
returnStr += "<span class='bg'>"+days+"</span>" + "天";
returnStr += "<span class='bg'>"+hours+"</span>" + "时";
returnStr += "<span class='bg'>"+minutes+"</span>" + "分";
return returnStr
......
......@@ -520,7 +520,7 @@ export default {
text-align: center;
line-height: 35px;
border-radius: 50%;
padding: 4px;
padding: 0 4px;
}
.tjorder p{
margin: 0;
......
......@@ -107,7 +107,7 @@
</div>
<div style="position:absolute;right:5px;top:2px">
<div style="position:absolute;right:5px;top:3px">
<el-button @click="disabled=false" style="margin-right:10px" v-if="personNum.status==3" class="status_3" size="mini" >修改信息</el-button>
<span>服务专员:</span>
<el-select style="width:100px" :disabled="disabled" size="mini" v-model="personNum.enterID" filterable placeholder="请选择专员">
......
......@@ -49,7 +49,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
queryDays:10,
status: 0,
},
......
......@@ -49,7 +49,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
orderType: 3,
queryDays: 10,
orderState: -1,
......
......@@ -49,7 +49,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
queryDays:10,
visaOrderStatus: 0,
},
......
......@@ -47,7 +47,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
orderType: 1,
queryDays: 0,
orderState: -1,
......
......@@ -49,7 +49,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
orderType: 7,
queryDays: 10,
orderState: -1,
......
......@@ -49,7 +49,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
queryDays:10,
status: 0,
},
......
......@@ -47,7 +47,7 @@ export default {
WaitDealOrderPageList: "",
getOrderMsg: {
pageIndex: 1,
pageSize: 10,
pageSize: 5,
orderType: 2,
queryDays: 0,
orderState: -1,
......
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