Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-admin-consultation
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-admin-consultation
提交
a5ae201e
提交
a5ae201e
编写于
10月 29, 2021
作者:
qian.jie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改bug
上级
162582d3
变更
5
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
429 行增加
和
97 行删除
+429
-97
imgMd5List.json
imgMd5List.json
+1
-1
serviceSchedule.js
src/api/serviceSchedule.js
+7
-0
nothingData.png
src/assets/image/nothingData.png
+0
-0
newScheduling.vue
src/views/IM/diagnosis-admin/modal/newScheduling.vue
+20
-30
overviewScheduling.vue
src/views/IM/diagnosis-admin/overviewScheduling.vue
+401
-66
未找到文件。
imgMd5List.json
浏览文件 @
a5ae201e
此差异已折叠。
点击以展开。
src/api/serviceSchedule.js
浏览文件 @
a5ae201e
...
@@ -58,3 +58,10 @@ export const getDoctorInfo = async (data) => {
...
@@ -58,3 +58,10 @@ export const getDoctorInfo = async (data) => {
method
:
'post'
,
method
:
'post'
,
});
});
};
};
export
const
previewWork
=
async
(
data
)
=>
{
return
request
({
url
:
'/diagnose/doctor/work/previewWork'
,
method
:
'post'
,
data
:
data
,
});
};
src/assets/image/nothingData.png
查看替换文件 @
162582d3
浏览文件 @
a5ae201e
77.8 KB
|
W:
|
H:
17.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/views/IM/diagnosis-admin/modal/newScheduling.vue
浏览文件 @
a5ae201e
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
<div
<div
ref=
"agment"
ref=
"agment"
class=
"agment-box"
class=
"agment-box"
:class=
"
{
'w2':week==2,'w3':week==3
}"
:class=
"
{
w2: week == 2, w3: week == 3
}"
>
>
<FullCalendar
:options=
"calendarOptions"
/>
<FullCalendar
:options=
"calendarOptions"
/>
</div>
</div>
<div
<div
class=
"agment-box-left"
class=
"agment-box-left"
:style=
"
{ height: scrollerHeight }"
:style=
"
{ height: scrollerHeight }"
>
>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<div
<div
v-if=
"week == 2"
v-if=
"week == 2"
class=
"ag-left1"
class=
"ag-left1"
/>
/>
<!-- v-if="week == 2" -->
<!-- v-if="week == 2" -->
<div
<div
v-if=
"week == 3"
v-if=
"week == 3"
...
@@ -48,13 +48,11 @@
...
@@ -48,13 +48,11 @@
{{
this
.
schedulingTypeValue
.
departmentName
}}
{{
this
.
schedulingTypeValue
.
departmentName
}}
</div>
</div>
</div>
</div>
<div
<div
style=
"margin-top: 24px"
>
style=
"margin-top: 24px"
>
<p
class=
"agment-head-title"
>
<p
class=
"agment-head-title"
>
选择匹配优先级
选择匹配优先级
</p>
</p>
<div
:class=
"this.schedulingType == 3 ? 'agment-head-none' : ''
"
>
<div
:class=
"this.schedulingType == 3 ? 'agment-head-none' : ''"
>
<div
class=
"agment-head-priority"
>
<div
class=
"agment-head-priority"
>
<p
<p
v-for=
"(item, index) in createList"
v-for=
"(item, index) in createList"
...
@@ -112,9 +110,9 @@
...
@@ -112,9 +110,9 @@
},
},
data
()
{
data
()
{
return
{
return
{
id
:
''
,
id
:
''
,
doctorId
:
''
,
doctorId
:
''
,
schedulingTypeValue
:{},
schedulingTypeValue
:
{},
schedulingType
:
1
,
// 1 新增 2 编辑 3 查看
schedulingType
:
1
,
// 1 新增 2 编辑 3 查看
createList
:
[],
createList
:
[],
listDate
:
[],
listDate
:
[],
...
@@ -191,17 +189,16 @@
...
@@ -191,17 +189,16 @@
workingTicketVisible
:
false
,
// 工作表票详情页面
workingTicketVisible
:
false
,
// 工作表票详情页面
scrollerHeight
:
0
,
scrollerHeight
:
0
,
loading
:
false
,
loading
:
false
,
isDoIt
:
false
isDoIt
:
false
,
};
};
},
},
watch
:
{
watch
:
{
week
(
newV
,
oldV
)
{
week
(
newV
,
oldV
)
{
console
.
log
(
newV
,
oldV
,
'newV, oldV'
);
// if (this.haveWeek.indexOf(newV) == -1) {
if
(
this
.
haveWeek
.
indexOf
(
newV
)
==
-
1
)
{
// this.haveWeek.push(newV);
this
.
haveWeek
.
push
(
newV
);
// this.handleInitSearch();
this
.
handleInitSearch
();
// }
}
if
(
newV
!==
oldV
)
{
if
(
newV
!==
oldV
)
{
this
.
handleInitSearch
();
this
.
handleInitSearch
();
this
.
saveDoctoreScheduling
(
2
);
this
.
saveDoctoreScheduling
(
2
);
}
}
...
@@ -210,12 +207,12 @@
...
@@ -210,12 +207,12 @@
created
()
{
created
()
{
this
.
schedulingType
=
this
.
$route
.
query
.
type
||
1
;
this
.
schedulingType
=
this
.
$route
.
query
.
type
||
1
;
this
.
id
=
this
.
$route
.
query
.
id
;
this
.
id
=
this
.
$route
.
query
.
id
;
this
.
doctorId
=
this
.
$route
.
query
.
doctorId
,
(
this
.
doctorId
=
this
.
$route
.
query
.
doctorId
)
,
getDoctorInfo
({
id
:
this
.
id
}).
then
((
res
)
=>
{
getDoctorInfo
({
id
:
this
.
id
}).
then
((
res
)
=>
{
if
(
res
.
code
==
'000000'
)
{
if
(
res
.
code
==
'000000'
)
{
this
.
schedulingTypeValue
=
res
.
data
;
this
.
schedulingTypeValue
=
res
.
data
;
this
.
currentIndex
=
res
.
data
.
level
;
this
.
currentIndex
=
res
.
data
.
level
;
}
else
{
}
else
{
this
.
$toast
(
res
.
message
);
this
.
$toast
(
res
.
message
);
}
}
});
});
...
@@ -226,7 +223,6 @@
...
@@ -226,7 +223,6 @@
});
});
},
},
mounted
()
{
mounted
()
{
console
.
log
(
this
.
calendarOptions
.
events
,
'this.calendarOptions.events'
);
this
.
scrollerHeight
=
this
.
$refs
.
agment
.
clientHeight
+
'px'
;
this
.
scrollerHeight
=
this
.
$refs
.
agment
.
clientHeight
+
'px'
;
// console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
// console.log(this.$refs.agment.clientHeight, 'this.$refs.agment.offsetHeight;');
this
.
init
();
this
.
init
();
...
@@ -272,14 +268,12 @@
...
@@ -272,14 +268,12 @@
var
newDate
=
null
;
var
newDate
=
null
;
if
(
this
.
schedulingType
!=
3
)
{
if
(
this
.
schedulingType
!=
3
)
{
newDate
=
[].
concat
(
data
.
noAcceptList
);
newDate
=
[].
concat
(
data
.
noAcceptList
);
console
.
log
(
newDate
,
'newDate'
);
}
else
{
}
else
{
var
acceptList
=
[];
var
acceptList
=
[];
data
.
acceptList
.
forEach
((
item
)
=>
{
data
.
acceptList
.
forEach
((
item
)
=>
{
item
.
type
=
88
;
item
.
type
=
88
;
acceptList
.
push
(
item
);
acceptList
.
push
(
item
);
});
});
console
.
log
(
data
.
acceptList
,
'data.acceptList'
);
newDate
=
[].
concat
(
acceptList
,
data
.
noAcceptList
);
newDate
=
[].
concat
(
acceptList
,
data
.
noAcceptList
);
}
}
// const keyAll = ['end', 'endStr', 'id', 'start', 'startStr'];
// const keyAll = ['end', 'endStr', 'id', 'start', 'startStr'];
...
@@ -290,7 +284,6 @@
...
@@ -290,7 +284,6 @@
dataObj
[
'id'
]
=
id
;
dataObj
[
'id'
]
=
id
;
dataObj
[
'end'
]
=
item
.
endTime
;
dataObj
[
'end'
]
=
item
.
endTime
;
dataObj
[
'start'
]
=
item
.
startTime
;
dataObj
[
'start'
]
=
item
.
startTime
;
console
.
log
(
item
.
type
);
dataObj
[
'type'
]
=
item
.
type
;
dataObj
[
'type'
]
=
item
.
type
;
if
(
item
.
type
==
88
)
{
if
(
item
.
type
==
88
)
{
dataObj
[
'color'
]
=
'#FFEDE9'
;
dataObj
[
'color'
]
=
'#FFEDE9'
;
...
@@ -424,9 +417,7 @@
...
@@ -424,9 +417,7 @@
this
.
handleInitSearch
(
true
);
this
.
handleInitSearch
(
true
);
},
},
saveDoctoreScheduling
(
type
)
{
saveDoctoreScheduling
(
type
)
{
console
.
log
(
this
.
isDoIt
,
'this.isDoIt'
);
if
(
this
.
isDoIt
)
{
if
(
this
.
isDoIt
)
{
console
.
log
(
this
.
week
,
'this.week'
);
this
.
loading
=
true
;
this
.
loading
=
true
;
const
objParms
=
{};
const
objParms
=
{};
objParms
.
week
=
this
.
week
;
objParms
.
week
=
this
.
week
;
...
@@ -434,14 +425,13 @@
...
@@ -434,14 +425,13 @@
objParms
.
level
=
this
.
currentIndex
;
objParms
.
level
=
this
.
currentIndex
;
objParms
.
list
=
[];
objParms
.
list
=
[];
const
data
=
this
.
calendarOptions
.
events
;
const
data
=
this
.
calendarOptions
.
events
;
console
.
log
(
data
,
'data'
);
data
.
forEach
((
item
)
=>
{
data
.
forEach
((
item
)
=>
{
// if (item.week == this.week) {
// if (item.week == this.week) {
const
obj
=
{};
const
obj
=
{};
obj
.
startTime
=
this
.
dateFormat
(
'YYYY-mm-dd HH:MM:SS'
,
item
.
start
);
obj
.
startTime
=
this
.
dateFormat
(
'YYYY-mm-dd HH:MM:SS'
,
item
.
start
);
obj
.
endTime
=
this
.
dateFormat
(
'YYYY-mm-dd HH:MM:SS'
,
item
.
end
);
obj
.
endTime
=
this
.
dateFormat
(
'YYYY-mm-dd HH:MM:SS'
,
item
.
end
);
objParms
.
list
.
push
(
obj
);
objParms
.
list
.
push
(
obj
);
// }
// }
});
});
saveDutyRoster
(
objParms
).
then
((
res
)
=>
{
saveDutyRoster
(
objParms
).
then
((
res
)
=>
{
if
(
res
.
code
===
'000000'
)
{
if
(
res
.
code
===
'000000'
)
{
...
@@ -449,10 +439,10 @@
...
@@ -449,10 +439,10 @@
// this.handleInitSearch(true);
// this.handleInitSearch(true);
// this.$router.go(0);
// this.$router.go(0);
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
type
==
1
)
{
if
(
type
==
1
)
{
this
.
$message
({
this
.
$message
({
message
:
'排班保存成功'
,
message
:
'排班保存成功'
,
type
:
'success'
type
:
'success'
,
});
});
}
}
this
.
isDoIt
=
false
;
this
.
isDoIt
=
false
;
...
...
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @
a5ae201e
此差异已折叠。
点击以展开。
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录