This commit is contained in:
parent
411f0d4b3a
commit
2d4d9247fc
|
@ -139,7 +139,7 @@ export default {
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
});
|
});
|
||||||
}, 3000);
|
}, 30000);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleClickOutside() {
|
handleClickOutside() {
|
||||||
|
|
|
@ -89,11 +89,11 @@
|
||||||
<el-select
|
<el-select
|
||||||
v-model="listQuery.appointment_status"
|
v-model="listQuery.appointment_status"
|
||||||
filterable
|
filterable
|
||||||
|
clearable
|
||||||
placeholder="预约状态"
|
placeholder="预约状态"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
style="width: 120px"
|
style="width: 120px"
|
||||||
>
|
>
|
||||||
<el-option key="" label="请选择" value="" />
|
|
||||||
<el-option key="0" label="未预约" value="0" />
|
<el-option key="0" label="未预约" value="0" />
|
||||||
<el-option key="1" label="已预约(未处理)" value="1" />
|
<el-option key="1" label="已预约(未处理)" value="1" />
|
||||||
<el-option key="2" label="已预约(已处理)" value="2" />
|
<el-option key="2" label="已预约(已处理)" value="2" />
|
||||||
|
@ -671,6 +671,7 @@ export default {
|
||||||
admin: null,
|
admin: null,
|
||||||
zhubo: null,
|
zhubo: null,
|
||||||
os_status: [],
|
os_status: [],
|
||||||
|
appointment_status:'',
|
||||||
},
|
},
|
||||||
item: { next_follow: "", personnel: { adult: "" } },
|
item: { next_follow: "", personnel: { adult: "" } },
|
||||||
follow: [],
|
follow: [],
|
||||||
|
|
|
@ -38,8 +38,8 @@ module.exports = {
|
||||||
},
|
},
|
||||||
proxy: {
|
proxy: {
|
||||||
'/dev-api': { // 接口地址 以 api开头的都走下面的配置
|
'/dev-api': { // 接口地址 以 api开头的都走下面的配置
|
||||||
// target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
||||||
target: 'http://192.168.0.6:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
// target: 'http://192.168.0.6:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
||||||
ws: true, // 是否支持 websocket 请求 支持
|
ws: true, // 是否支持 websocket 请求 支持
|
||||||
changeOrigin: true, // 是否启用跨域
|
changeOrigin: true, // 是否启用跨域
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
|
|
|
@ -71,7 +71,7 @@ class IndexController extends base
|
||||||
// 跟进提醒
|
// 跟进提醒
|
||||||
$followMessage = 0;
|
$followMessage = 0;
|
||||||
$followOrderId = '';
|
$followOrderId = '';
|
||||||
$appointmentNum = 1;
|
$appointmentNum = 0;
|
||||||
if ($request->admin->id > 1) {
|
if ($request->admin->id > 1) {
|
||||||
$start = strtotime(date('Y-m-d')) * 1000;
|
$start = strtotime(date('Y-m-d')) * 1000;
|
||||||
$end = strtotime(date('Y-m-d', strtotime('+1 days'))) * 1000 - 1;
|
$end = strtotime(date('Y-m-d', strtotime('+1 days'))) * 1000 - 1;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-34c5198e]{position:relative;padding-bottom:60px}.el-table[data-v-34c5198e],.filter-container[data-v-34c5198e]{padding-bottom:5px}
|
.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-40a40a21]{position:relative;padding-bottom:60px}.el-table[data-v-40a40a21],.filter-container[data-v-40a40a21]{padding-bottom:5px}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue