Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
company_app
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
毛细亚
company_app
Commits
380fd02f
提交
380fd02f
authored
6月 04, 2025
作者:
毛细亚
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更新代码
上级
51a18495
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
138 行增加
和
127 行删除
+138
-127
selectDate.vue
src/components/selectDate.vue
+36
-67
main.js
src/main.js
+1
-1
index.scss
src/styles/index.scss
+36
-4
applyRecord.vue
src/views/applyRecord.vue
+1
-1
AreaTransferApply.vue
src/views/components/ApplyRecords/AreaTransferApply.vue
+21
-20
AreaTransferDialog.vue
src/views/components/ApplyRecords/AreaTransferDialog.vue
+4
-3
TerminaTranfer.vue
src/views/components/ApplyRecords/TerminaTranfer.vue
+19
-19
TerminalTransferDialog.vue
src/views/components/ApplyRecords/TerminalTransferDialog.vue
+6
-3
errorHandle.vue
src/views/components/ApplyRecords/errorHandle.vue
+4
-1
orderList.vue
src/views/orderList.vue
+10
-8
没有找到文件。
src/components/selectDate.vue
浏览文件 @
380fd02f
<
template
>
<
template
>
<div
class=
"search-item"
>
<div
class=
"search-item"
>
<div
class=
"date-picker-container"
>
<div
class=
"date-picker-container"
>
<!-- 开始时间选择器 -->
<div
class=
"date-picker-item rowFlex columnCenter"
>
<div
class=
"picker-label"
>
开始时间:
</div>
<el-date-picker
<el-date-picker
v-model=
"startDate
"
v-model=
"value1
"
:disabled=
"disabled"
:disabled=
"disabled"
:style=
"
{'width':width ||''}"
:style=
"
{'width': width || '100%'}"
:type="type ? 'datetime' : 'date'"
type="datetimerange"
:format="type ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
format="yyyy-MM-dd HH:mm:ss"
:value-format="type ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="'00:00:00'"
start-placeholder="开始日期"
placeholder="请选择开始时间"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
:clearable="noClearable ? !noClearable : true"
:clearable="noClearable ? !noClearable : true"
@change="handleStartDateChange"
range-separator="~"
/>
@change="handleDateChange"
</div>
<!-- 结束时间选择器 -->
<div
class=
"date-picker-item rowFlex columnCenter"
>
<div
class=
"picker-label"
>
结束时间:
</div>
<el-date-picker
v-model=
"endDate"
:style=
"
{'width':width ||''}"
:disabled="disabled"
:type="type ? 'datetime' : 'date'"
:format="type ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
:value-format="type ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
:default-time="'23:59:59'"
placeholder="请选择结束时间"
:clearable="noClearable ? !noClearable : true"
@change="handleEndDateChange"
/>
/>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -44,8 +26,7 @@
...
@@ -44,8 +26,7 @@
props
:
[
'width'
,
'defaultValue'
,
'type'
,
'noClearable'
,
'disabled'
],
props
:
[
'width'
,
'defaultValue'
,
'type'
,
'noClearable'
,
'disabled'
],
data
()
{
data
()
{
return
{
return
{
startDate
:
''
,
value1
:
[]
endDate
:
''
}
}
},
},
computed
:
{
computed
:
{
...
@@ -54,7 +35,9 @@
...
@@ -54,7 +35,9 @@
defaultValue
:
{
defaultValue
:
{
handler
(
newVal
)
{
handler
(
newVal
)
{
console
.
log
(
'defaultValue 变化:'
,
newVal
)
console
.
log
(
'defaultValue 变化:'
,
newVal
)
if
(
newVal
&&
newVal
.
start_date
!==
undefined
&&
newVal
.
end_date
!==
undefined
)
{
if
(
newVal
&&
Array
.
isArray
(
newVal
)
&&
newVal
.
length
===
2
)
{
this
.
setDateValues
(
newVal
[
0
],
newVal
[
1
])
}
else
if
(
newVal
&&
newVal
.
start_date
!==
undefined
&&
newVal
.
end_date
!==
undefined
)
{
this
.
setDateValues
(
newVal
.
start_date
,
newVal
.
end_date
)
this
.
setDateValues
(
newVal
.
start_date
,
newVal
.
end_date
)
}
else
{
}
else
{
this
.
setDateValues
(
''
,
''
)
this
.
setDateValues
(
''
,
''
)
...
@@ -67,7 +50,9 @@
...
@@ -67,7 +50,9 @@
mounted
()
{
mounted
()
{
console
.
log
(
'组件挂载,defaultValue:'
,
this
.
defaultValue
)
console
.
log
(
'组件挂载,defaultValue:'
,
this
.
defaultValue
)
// 组件挂载时处理默认值
// 组件挂载时处理默认值
if
(
this
.
defaultValue
&&
this
.
defaultValue
.
start_date
!==
undefined
&&
this
.
defaultValue
.
end_date
!==
undefined
)
{
if
(
this
.
defaultValue
&&
Array
.
isArray
(
this
.
defaultValue
)
&&
this
.
defaultValue
.
length
===
2
)
{
this
.
setDateValues
(
this
.
defaultValue
[
0
],
this
.
defaultValue
[
1
])
}
else
if
(
this
.
defaultValue
&&
this
.
defaultValue
.
start_date
!==
undefined
&&
this
.
defaultValue
.
end_date
!==
undefined
)
{
this
.
setDateValues
(
this
.
defaultValue
.
start_date
,
this
.
defaultValue
.
end_date
)
this
.
setDateValues
(
this
.
defaultValue
.
start_date
,
this
.
defaultValue
.
end_date
)
}
}
},
},
...
@@ -75,38 +60,38 @@
...
@@ -75,38 +60,38 @@
// 安全设置日期值的方法
// 安全设置日期值的方法
setDateValues
(
startDate
,
endDate
)
{
setDateValues
(
startDate
,
endDate
)
{
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
this
.
startDate
=
startDate
||
''
if
(
startDate
&&
endDate
)
{
this
.
endDate
=
endDate
||
''
this
.
value1
=
[
startDate
,
endDate
]
}
else
{
this
.
value1
=
[]
}
// 强制更新组件
// 强制更新组件
this
.
$forceUpdate
()
this
.
$forceUpdate
()
})
})
},
},
// 处理开始时间变化
// 处理日期范围变化
handleStartDateChange
(
value
)
{
handleDateChange
(
value
)
{
console
.
log
(
'开始时间变化:'
,
value
)
console
.
log
(
'日期范围变化:'
,
value
)
this
.
startDate
=
value
this
.
value1
=
value
||
[]
this
.
emitResult
()
},
// 处理结束时间变化
handleEndDateChange
(
value
)
{
console
.
log
(
'结束时间变化:'
,
value
)
this
.
endDate
=
value
this
.
emitResult
()
this
.
emitResult
()
},
},
// 发出结果事件
// 发出结果事件
emitResult
()
{
emitResult
()
{
if
(
this
.
startDate
===
''
||
this
.
endDate
===
''
){
if
(
!
this
.
value1
||
this
.
value1
.
length
!==
2
)
{
this
.
$emit
(
'result'
,
[])
return
}
const
[
startDate
,
endDate
]
=
this
.
value1
if
(
!
startDate
||
!
endDate
)
{
this
.
$message
.
warning
(
'请选择开始时间和结束时间'
)
this
.
$message
.
warning
(
'请选择开始时间和结束时间'
)
return
false
return
false
}
}
console
.
log
(
'发出结果:'
,
{
start_date
:
this
.
startDate
,
end_date
:
this
.
endDate
})
this
.
$emit
(
'result'
,
{
console
.
log
(
'发出结果:'
,
[
startDate
,
endDate
])
start_date
:
this
.
startDate
||
''
,
this
.
$emit
(
'result'
,
[
startDate
,
endDate
])
end_date
:
this
.
endDate
||
''
,
})
},
},
// 保持原有的 selectChange 方法,用于兼容
// 保持原有的 selectChange 方法,用于兼容
...
@@ -119,21 +104,6 @@
...
@@ -119,21 +104,6 @@
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.date-picker-container
{
.date-picker-container
{
display
:
flex
;
flex-direction
:
column
;
gap
:
12px
;
width
:
100%
;
width
:
100%
;
}
}
.date-picker-item
{
width
:
100%
;
}
.picker-label
{
font-size
:
12px
;
color
:
#666
;
margin-bottom
:
6px
;
font-weight
:
500
;
min-width
:
60px
;
}
</
style
>
</
style
>
\ No newline at end of file
src/main.js
浏览文件 @
380fd02f
...
@@ -21,7 +21,7 @@ import clickagain from './directive/clickagain'
...
@@ -21,7 +21,7 @@ import clickagain from './directive/clickagain'
import
permission
from
'@/directive/permission/index.js'
// 权限判断指令
import
permission
from
'@/directive/permission/index.js'
// 权限判断指令
Vue
.
use
(
globalComponent
).
use
(
permission
).
use
(
clickagain
).
use
(
loadmore
)
Vue
.
use
(
globalComponent
).
use
(
permission
).
use
(
clickagain
).
use
(
loadmore
)
if
(
isTest
()){
if
(
isTest
()){
new
VConsole
();
//
new VConsole();
}
}
function
isTest
(){
function
isTest
(){
return
process
.
env
.
NODE_ENV
!==
'production'
return
process
.
env
.
NODE_ENV
!==
'production'
...
...
src/styles/index.scss
浏览文件 @
380fd02f
...
@@ -598,10 +598,42 @@ li {
...
@@ -598,10 +598,42 @@ li {
max-width
:
300px
;
max-width
:
300px
;
z-index
:
10000
!
important
;
z-index
:
10000
!
important
;
}
}
/* ----------------- 修改日期选择框大小 --------------------*/
/* ----------------- 修复 Element UI 图标显示问题 --------------------*/
.el-date-range-picker
,
.el-picker-panel__body
,
.el-date-range-picker__content
{
// 确保 Element UI 图标字体正确加载
width
:
360px
!
important
;
}
.el-picker-panel__body
{
min-width
:
320px
!
important
;
}
.el-picker-panel__body
{
display
:
flex
;
flex-direction
:
column
;
}
/* ----------------- 确定取消按钮 --------------------*/
.el-dialog
{
.dialog-footer
{
position
:
relative
;
}
}
// 弹窗的按钮位置
.dialog-footer
{
width
:
calc
(
100%
);
position
:
absolute
;
bottom
:
0px
;
right
:
0
;
padding-top
:
20px
;
padding-bottom
:
20px
;
padding-right
:
20px
;
border-top
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.06
);
justify-content
:
flex-end
;
overflow
:
hidden
;
background
:
#fff
;
z-index
:
10
;
.btn
{
width
:
84px
;
height
:
32px
;
}
}
src/views/applyRecord.vue
浏览文件 @
380fd02f
...
@@ -40,7 +40,7 @@ export default {
...
@@ -40,7 +40,7 @@ export default {
padding-top
:
10px
;
padding-top
:
10px
;
background
:
#fff
;
background
:
#fff
;
::v-deep
.el-tabs{
::v-deep
.el-tabs{
height
:
calc
(
100%
-
6
0px
);
height
:
calc
(
100%
-
4
0px
);
}
}
::v-deep
.el-tabs__content
{
::v-deep
.el-tabs__content
{
height
:
100%
;
height
:
100%
;
...
...
src/views/components/ApplyRecords/AreaTransferApply.vue
浏览文件 @
380fd02f
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
<span></span>
<span></span>
<el-button
<el-button
type=
"primary"
type=
"primary"
size=
"small"
icon=
"el-icon-plus"
icon=
"el-icon-plus"
@
click=
"showaddAreaTransfer = true,areaTransferItem =
{}"
@
click=
"showaddAreaTransfer = true,areaTransferItem =
{}"
>新增转区申请
</el-button>
>新增转区申请
</el-button>
...
@@ -32,19 +33,12 @@
...
@@ -32,19 +33,12 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"创建时间"
>
<el-form-item
label=
"创建时间"
>
<BiDatePicker
<selectDate
v-model=
"create_time"
:default-value=
"dateValue"
:type=
"true"
:no-clearable=
"true"
style=
"width: 95%"
style=
"width: 95%"
type=
"datetimerange"
@
result=
"createResult"
format=
"yyyy-MM-dd HH:mm:ss"
:picker-option=
"pickerOptions"
value-format=
"yyyy-MM-dd HH:mm:ss"
:default-time=
"['00:00:00', '23:59:59']"
:clearable=
"false"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"createResult"
/>
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -63,7 +57,7 @@
...
@@ -63,7 +57,7 @@
@
click=
"terminaProcess(item, index)"
@
click=
"terminaProcess(item, index)"
>
>
<div
class=
"terminaItem rowFlex spaceBetween columnCenter"
>
<div
class=
"terminaItem rowFlex spaceBetween columnCenter"
>
<
i
:class=
" item.showStep?'el-icon-down':'el-icon-right'"
></i
>
<
!--
<i
:class=
" item.showStep?'el-icon-bottom':'el-icon-right'"
></i>
--
>
<div
class=
"terminaItemLeft"
>
<div
class=
"terminaItemLeft"
>
<p><span
class=
"label"
>
新区角色:
</span><span
class=
"value"
>
{{
item
.
role_name
}}
(
{{
item
.
server_name
}}
)
</span></p>
<p><span
class=
"label"
>
新区角色:
</span><span
class=
"value"
>
{{
item
.
role_name
}}
(
{{
item
.
server_name
}}
)
</span></p>
<p><span
class=
"label"
>
老区角色:
</span><span
class=
"value"
>
{{
item
.
old_role_name
}}
(
{{
item
.
old_server_name
}}
)
</span></p>
<p><span
class=
"label"
>
老区角色:
</span><span
class=
"value"
>
{{
item
.
old_role_name
}}
(
{{
item
.
old_server_name
}}
)
</span></p>
...
@@ -243,6 +237,7 @@ import { searchcondition, transfer_server_request_list, transfer_server_request_
...
@@ -243,6 +237,7 @@ import { searchcondition, transfer_server_request_list, transfer_server_request_
import
{
mapState
}
from
'vuex'
import
{
mapState
}
from
'vuex'
import
{
removeDp
,
formatNumber
,
debounce
}
from
'@/utils/index'
import
{
removeDp
,
formatNumber
,
debounce
}
from
'@/utils/index'
import
AreaTransferDialog
from
'./AreaTransferDialog.vue'
import
AreaTransferDialog
from
'./AreaTransferDialog.vue'
import
selectDate
from
'@/components/selectDate.vue'
// 导入审批状态图标
// 导入审批状态图标
import
shenpi1
from
'@/assets/icon/shenpi1.svg'
import
shenpi1
from
'@/assets/icon/shenpi1.svg'
import
shenpi2
from
'@/assets/icon/shenpi2.svg'
import
shenpi2
from
'@/assets/icon/shenpi2.svg'
...
@@ -255,7 +250,8 @@ export default {
...
@@ -255,7 +250,8 @@ export default {
...
mapState
(
'user'
,
[
'userInfo'
])
...
mapState
(
'user'
,
[
'userInfo'
])
}
,
}
,
components
:
{
components
:
{
AreaTransferDialog
AreaTransferDialog
,
selectDate
}
,
}
,
data
()
{
data
()
{
return
{
return
{
...
@@ -273,7 +269,7 @@ export default {
...
@@ -273,7 +269,7 @@ export default {
create_time_end
:
''
,
create_time_end
:
''
,
approval_status
:
''
approval_status
:
''
}
,
}
,
create_tim
e
:
[],
dateValu
e
:
[],
pageInfo
:
{
pageInfo
:
{
page
:
1
,
page
:
1
,
page_size
:
20
page_size
:
20
...
@@ -308,9 +304,12 @@ export default {
...
@@ -308,9 +304,12 @@ export default {
}
}
}
,
}
,
mounted
()
{
mounted
()
{
this
.
create_time
=
[
this
.
$moment
().
subtract
(
6
,
'days'
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
this
.
$moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
)]
this
.
dateValue
=
[
this
.
terminaForm
.
create_time_start
=
this
.
create_time
[
0
]
this
.
$moment
().
subtract
(
6
,
'days'
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
this
.
terminaForm
.
create_time_end
=
this
.
create_time
[
1
]
this
.
$moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
)
]
this
.
terminaForm
.
create_time_start
=
this
.
dateValue
[
0
]
this
.
terminaForm
.
create_time_end
=
this
.
dateValue
[
1
]
this
.
requstApprovalList
()
this
.
requstApprovalList
()
this
.
filterChange
()
this
.
filterChange
()
}
,
}
,
...
@@ -319,12 +318,14 @@ export default {
...
@@ -319,12 +318,14 @@ export default {
this
.
filterChange
()
this
.
filterChange
()
}
,
}
,
createResult
:
debounce
(
function
(
data
)
{
createResult
:
debounce
(
function
(
data
)
{
if
(
data
)
{
if
(
data
&&
Array
.
isArray
(
data
)
&&
data
.
length
===
2
)
{
this
.
terminaForm
.
create_time_start
=
data
[
0
]
this
.
terminaForm
.
create_time_start
=
data
[
0
]
this
.
terminaForm
.
create_time_end
=
data
[
1
]
this
.
terminaForm
.
create_time_end
=
data
[
1
]
this
.
dateValue
=
data
}
else
{
}
else
{
this
.
terminaForm
.
create_time_start
=
''
this
.
terminaForm
.
create_time_start
=
''
this
.
terminaForm
.
create_time_end
=
''
this
.
terminaForm
.
create_time_end
=
''
this
.
dateValue
=
[]
}
}
this
.
filterChange
()
this
.
filterChange
()
}
,
300
),
}
,
300
),
...
@@ -514,7 +515,7 @@ export default {
...
@@ -514,7 +515,7 @@ export default {
.
mailListScroll
{
.
mailListScroll
{
width
:
100
%
;
width
:
100
%
;
height
:
calc
(
100
vh
-
22
0
px
);
height
:
calc
(
100
%
-
19
0
px
);
overflow
-
y
:
auto
;
overflow
-
y
:
auto
;
overflow
-
x
:
hidden
;
overflow
-
x
:
hidden
;
...
...
src/views/components/ApplyRecords/AreaTransferDialog.vue
浏览文件 @
380fd02f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<el-drawer
<el-drawer
title=
"转区申请"
title=
"转区申请"
:visible
.
sync=
"dialogVisible"
:visible
.
sync=
"dialogVisible"
size=
"
5
20px"
size=
"
3
20px"
:append-to-body=
"true"
:append-to-body=
"true"
@
close=
"handleClose"
@
close=
"handleClose"
>
>
...
@@ -205,10 +205,11 @@
...
@@ -205,10 +205,11 @@
</el-form>
</el-form>
<div
class=
"dialog-footer rowFlex"
>
<div
class=
"dialog-footer rowFlex"
>
<el-button
@
click=
"handleClose"
>
取 消
</el-button>
<el-button
@
click=
"handleClose"
size=
"small"
>
取 消
</el-button>
<el-button
<el-button
type=
"primary"
type=
"primary"
:loading=
"loading"
:loading=
"loading"
size=
"small"
@
click=
"handleSubmit"
@
click=
"handleSubmit"
>
>
提 交
提 交
...
@@ -348,7 +349,7 @@ export default {
...
@@ -348,7 +349,7 @@ export default {
role_id
:
this
.
areaTransferItem
.
role_id
,
role_id
:
this
.
areaTransferItem
.
role_id
,
old_role_id
:
this
.
areaTransferItem
.
old_role_id
,
old_role_id
:
this
.
areaTransferItem
.
old_role_id
,
related_request_id
:
this
.
areaTransferItem
.
id
,
related_request_id
:
this
.
areaTransferItem
.
id
,
transfer_type
:
this
.
areaTransferItem
.
transfer_type
||
1
,
transfer_type
:
Number
(
this
.
areaTransferItem
.
transfer_type
||
1
)
,
remark
:
this
.
areaTransferItem
.
remark
||
''
,
remark
:
this
.
areaTransferItem
.
remark
||
''
,
main_game_id
:
Number
(
this
.
areaTransferItem
.
main_game_id
),
main_game_id
:
Number
(
this
.
areaTransferItem
.
main_game_id
),
weixin_blongs_id
:
Number
(
this
.
areaTransferItem
.
weixin_blongs_id
)
weixin_blongs_id
:
Number
(
this
.
areaTransferItem
.
weixin_blongs_id
)
...
...
src/views/components/ApplyRecords/TerminaTranfer.vue
浏览文件 @
380fd02f
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<el-button
<el-button
type=
"primary"
type=
"primary"
icon=
"el-icon-plus"
icon=
"el-icon-plus"
size=
"small"
@
click=
"(showaddAreaTransfer = true,areaTransferItem =
{})"
@
click=
"(showaddAreaTransfer = true,areaTransferItem =
{})"
>新增转端申请
</el-button>
>新增转端申请
</el-button>
</div>
</div>
...
@@ -32,19 +33,11 @@
...
@@ -32,19 +33,11 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"创建时间"
>
<el-form-item
label=
"创建时间"
>
<BiDatePicker
<selectDate
v-model=
"create_time"
:default-value=
"dateValue"
:type=
"true"
style=
"width: 95%"
style=
"width: 95%"
type=
"datetimerange"
@
result=
"createResult"
format=
"yyyy-MM-dd HH:mm:ss"
:picker-option=
"pickerOptions"
value-format=
"yyyy-MM-dd HH:mm:ss"
:default-time=
"['00:00:00', '23:59:59']"
:clearable=
"false"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"createResult"
/>
/>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -251,6 +244,7 @@ import { searchcondition, member_trans_request_list, member_trans_request_proces
...
@@ -251,6 +244,7 @@ import { searchcondition, member_trans_request_list, member_trans_request_proces
import
{
mapState
}
from
'vuex'
import
{
mapState
}
from
'vuex'
import
{
removeDp
,
formatNumber
,
debounce
}
from
'@/utils/index'
import
{
removeDp
,
formatNumber
,
debounce
}
from
'@/utils/index'
import
TerminalTransferDialog
from
'./TerminalTransferDialog.vue'
import
TerminalTransferDialog
from
'./TerminalTransferDialog.vue'
import
selectDate
from
'@/components/selectDate.vue'
// 导入审批状态图标
// 导入审批状态图标
import
shenpi1
from
'@/assets/icon/shenpi1.svg'
import
shenpi1
from
'@/assets/icon/shenpi1.svg'
import
shenpi2
from
'@/assets/icon/shenpi2.svg'
import
shenpi2
from
'@/assets/icon/shenpi2.svg'
...
@@ -265,7 +259,8 @@ export default {
...
@@ -265,7 +259,8 @@ export default {
}
,
}
,
components
:
{
components
:
{
TerminalTransferDialog
,
TerminalTransferDialog
,
noContent
noContent
,
selectDate
}
,
}
,
data
()
{
data
()
{
return
{
return
{
...
@@ -283,7 +278,7 @@ export default {
...
@@ -283,7 +278,7 @@ export default {
create_time_end
:
''
,
create_time_end
:
''
,
approval_status
:
''
approval_status
:
''
}
,
}
,
create_tim
e
:
[],
dateValu
e
:
[],
pageInfo
:
{
pageInfo
:
{
page
:
1
,
page
:
1
,
page_size
:
20
page_size
:
20
...
@@ -318,9 +313,12 @@ export default {
...
@@ -318,9 +313,12 @@ export default {
}
}
}
,
}
,
mounted
()
{
mounted
()
{
this
.
create_time
=
[
this
.
$moment
().
subtract
(
6
,
'days'
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
this
.
$moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
)]
this
.
dateValue
=
[
this
.
terminaForm
.
create_time_start
=
this
.
create_time
[
0
]
this
.
$moment
().
subtract
(
6
,
'days'
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
this
.
terminaForm
.
create_time_end
=
this
.
create_time
[
1
]
this
.
$moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
)
]
this
.
terminaForm
.
create_time_start
=
this
.
dateValue
[
0
]
this
.
terminaForm
.
create_time_end
=
this
.
dateValue
[
1
]
this
.
requstApprovalList
()
this
.
requstApprovalList
()
this
.
filterChange
()
this
.
filterChange
()
}
,
}
,
...
@@ -333,12 +331,14 @@ export default {
...
@@ -333,12 +331,14 @@ export default {
this
.
areaTransferItem
=
item
this
.
areaTransferItem
=
item
}
,
}
,
createResult
:
debounce
(
function
(
data
)
{
createResult
:
debounce
(
function
(
data
)
{
if
(
data
)
{
if
(
data
&&
Array
.
isArray
(
data
)
&&
data
.
length
===
2
)
{
this
.
terminaForm
.
create_time_start
=
data
[
0
]
this
.
terminaForm
.
create_time_start
=
data
[
0
]
this
.
terminaForm
.
create_time_end
=
data
[
1
]
this
.
terminaForm
.
create_time_end
=
data
[
1
]
this
.
dateValue
=
data
}
else
{
}
else
{
this
.
terminaForm
.
create_time_start
=
''
this
.
terminaForm
.
create_time_start
=
''
this
.
terminaForm
.
create_time_end
=
''
this
.
terminaForm
.
create_time_end
=
''
this
.
dateValue
=
[]
}
}
this
.
filterChange
()
this
.
filterChange
()
}
,
300
),
}
,
300
),
...
@@ -528,7 +528,7 @@ export default {
...
@@ -528,7 +528,7 @@ export default {
.
mailListScroll
{
.
mailListScroll
{
width
:
100
%
;
width
:
100
%
;
height
:
calc
(
100
vh
-
24
0
px
);
height
:
calc
(
100
%
-
19
0
px
);
overflow
-
y
:
auto
;
overflow
-
y
:
auto
;
overflow
-
x
:
hidden
;
overflow
-
x
:
hidden
;
...
...
src/views/components/ApplyRecords/TerminalTransferDialog.vue
浏览文件 @
380fd02f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<el-drawer
<el-drawer
title=
"转端申请"
title=
"转端申请"
:visible
.
sync=
"dialogVisible"
:visible
.
sync=
"dialogVisible"
size=
"
5
20px"
size=
"
3
20px"
:append-to-body=
"true"
:append-to-body=
"true"
@
close=
"handleClose"
@
close=
"handleClose"
>
>
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<!-- 机审规则 -->
<!-- 机审规则 -->
<el-form-item
label=
"机审规则"
>
<el-form-item
label=
"机审规则"
prop=
"rule_id"
>
<el-select
<el-select
v-model=
"form.rule_id"
v-model=
"form.rule_id"
placeholder=
"请选择机审规则"
placeholder=
"请选择机审规则"
...
@@ -121,10 +121,11 @@
...
@@ -121,10 +121,11 @@
</el-form>
</el-form>
<div
class=
"dialog-footer rowFlex"
>
<div
class=
"dialog-footer rowFlex"
>
<el-button
@
click=
"handleClose"
>
取 消
</el-button>
<el-button
@
click=
"handleClose"
size=
"small"
>
取 消
</el-button>
<el-button
<el-button
type=
"primary"
type=
"primary"
:loading=
"loading"
:loading=
"loading"
size=
"small"
@
click=
"handleSubmit"
@
click=
"handleSubmit"
>
>
提 交
提 交
...
@@ -232,6 +233,8 @@ export default {
...
@@ -232,6 +233,8 @@ export default {
related_request_id
:
this
.
areaTransferItem
.
id
,
related_request_id
:
this
.
areaTransferItem
.
id
,
rule_id
:
this
.
areaTransferItem
.
rule_id
||
''
rule_id
:
this
.
areaTransferItem
.
rule_id
||
''
}
}
console
.
log
(
this
.
form
,
'this.form'
)
this
.
handleFlowChange
()
}
else
{
}
else
{
// 新建模式
// 新建模式
this
.
form
=
{
this
.
form
=
{
...
...
src/views/components/ApplyRecords/errorHandle.vue
浏览文件 @
380fd02f
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<!-- 过滤条件 -->
<!-- 过滤条件 -->
<!-- 订单列表 -->
<!-- 订单列表 -->
<div
v-infinite-scroll=
"requestOrderList"
:infinite-scroll-disabled=
"!isloadMore"
class=
"orderDetailsScroll"
>
<div
v-infinite-scroll=
"requestOrderList"
:infinite-scroll-disabled=
"!isloadMore"
class=
"orderDetailsScroll"
>
<div
v-if=
"orderList.length>0"
>
<div
v-if=
"orderList.length>0"
class=
"orderDetailsScrollContent"
>
<div
v-for=
"(item,index) in orderList"
:key=
"index"
class=
"orderDetails"
>
<div
v-for=
"(item,index) in orderList"
:key=
"index"
class=
"orderDetails"
>
<div
class=
"orderDetailsList"
>
<div
class=
"orderDetailsList"
>
<el-collapse
v-model=
"collapseValue"
@
change=
"handleChange"
>
<el-collapse
v-model=
"collapseValue"
@
change=
"handleChange"
>
...
@@ -453,6 +453,9 @@ export default {
...
@@ -453,6 +453,9 @@ export default {
height
:
calc
(
100%
-
20px
);
height
:
calc
(
100%
-
20px
);
overflow
:
auto
;
overflow
:
auto
;
overflow-x
:
hidden
;
overflow-x
:
hidden
;
.orderDetailsScrollContent{
margin-bottom
:
50px
;
}
}
}
.orderDetails
{
.orderDetails
{
width
:
100%
;
width
:
100%
;
...
...
src/views/orderList.vue
浏览文件 @
380fd02f
...
@@ -202,7 +202,7 @@
...
@@ -202,7 +202,7 @@
order_time_start
:
''
,
order_time_start
:
''
,
order_time_end
:
''
order_time_end
:
''
},
},
searchDate
:
{}
,
searchDate
:
[]
,
gameUserInfo
:
{
gameUserInfo
:
{
recharge_total
:
0
,
recharge_total
:
0
,
today_amount
:
0
today_amount
:
0
...
@@ -236,10 +236,10 @@
...
@@ -236,10 +236,10 @@
},
},
mounted
()
{
mounted
()
{
this
.
payTypeList
()
this
.
payTypeList
()
this
.
searchDate
=
{
this
.
searchDate
=
[
start_date
:
this
.
$moment
().
subtract
(
3
,
'month'
).
format
(
'YYYY-MM-DD'
),
this
.
$moment
().
subtract
(
3
,
'month'
).
format
(
'YYYY-MM-DD'
),
end_date
:
this
.
$moment
().
format
(
'YYYY-MM-DD'
)
this
.
$moment
().
format
(
'YYYY-MM-DD'
)
}
]
this
.
timerData
.
order_time_start
=
this
.
$moment
().
subtract
(
3
,
'month'
).
format
(
'YYYY-MM-DD'
)
this
.
timerData
.
order_time_start
=
this
.
$moment
().
subtract
(
3
,
'month'
).
format
(
'YYYY-MM-DD'
)
this
.
timerData
.
order_time_end
=
this
.
$moment
().
format
(
'YYYY-MM-DD'
)
this
.
timerData
.
order_time_end
=
this
.
$moment
().
format
(
'YYYY-MM-DD'
)
},
},
...
@@ -300,12 +300,14 @@
...
@@ -300,12 +300,14 @@
// this.gameMemberView()
// this.gameMemberView()
},
},
dateResult
(
data
)
{
dateResult
(
data
)
{
if
(
data
)
{
if
(
data
&&
Array
.
isArray
(
data
)
&&
data
.
length
===
2
)
{
this
.
timerData
.
order_time_start
=
data
.
start_date
this
.
timerData
.
order_time_start
=
data
[
0
]
this
.
timerData
.
order_time_end
=
data
.
end_date
this
.
timerData
.
order_time_end
=
data
[
1
]
this
.
searchDate
=
data
}
else
{
}
else
{
this
.
timerData
.
order_time_start
=
''
this
.
timerData
.
order_time_start
=
''
this
.
timerData
.
order_time_end
=
''
this
.
timerData
.
order_time_end
=
''
this
.
searchDate
=
[]
}
}
this
.
pageInfo
=
{
this
.
pageInfo
=
{
page
:
0
,
page
:
0
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论