|
@@ -260,15 +260,15 @@
|
260
|
260
|
</div>
|
261
|
261
|
<div
|
262
|
262
|
class="headerItem_on"
|
263
|
|
- :title="data.dataList.length ? data.dataList[0][1] : '-'"
|
|
263
|
+ :title="data.dataList.length ? data.dataList[0][1] : ''"
|
264
|
264
|
>
|
265
|
265
|
{{
|
266
|
|
- (data.dataList.length ? data.dataList[0][1] : "-") | length6
|
|
266
|
+ (data.dataList.length ? data.dataList[0][1] : "") | length6
|
267
|
267
|
}}
|
268
|
268
|
<span v-if="data.online">{{ data.time }}</span>
|
269
|
269
|
</div>
|
270
|
|
- <div class="headerItem_on_two" :title="data.depts || '-'">
|
271
|
|
- {{ data.depts || "-" }}
|
|
270
|
+ <div class="headerItem_on_two" :title="data.depts || ''">
|
|
271
|
+ {{ data.depts || "" }}
|
272
|
272
|
</div>
|
273
|
273
|
</div>
|
274
|
274
|
</div>
|
|
@@ -948,6 +948,7 @@ export default {
|
948
|
948
|
if (result2.status == 200) {
|
949
|
949
|
post("/auth/sendOffline", { userid: this.coopData.id }).then(
|
950
|
950
|
(res) => {
|
|
951
|
+ this.$hideLoading();
|
951
|
952
|
if (res.status == 200) {
|
952
|
953
|
this.model = true;
|
953
|
954
|
this.icon = "success";
|
|
@@ -959,6 +960,7 @@ export default {
|
959
|
960
|
}
|
960
|
961
|
);
|
961
|
962
|
} else {
|
|
963
|
+ this.$hideLoading();
|
962
|
964
|
this.model = true;
|
963
|
965
|
this.icon = "error";
|
964
|
966
|
this.modelContent = result2.msg;
|
|
@@ -971,9 +973,10 @@ export default {
|
971
|
973
|
// 确认
|
972
|
974
|
ok() {
|
973
|
975
|
this.model = false;
|
|
976
|
+ this.$showLoading();
|
974
|
977
|
if (this.coopData.dataList.length) {
|
975
|
|
- if (this.workType == 2 && this.coopData.dataList[0][2] == 3) {
|
976
|
|
- //综合排班,并且是科室绑定人员
|
|
978
|
+ if (this.workType == 2 && (this.coopData.dataList[0][2] == 2||this.coopData.dataList[0][2] == 3||this.coopData.dataList[0][2] == 4)) {
|
|
979
|
+ //自选排班,并且是科室绑定人员,科室绑定分组,绑定分组
|
977
|
980
|
post("/auth/customOfflinePc", { userId: this.coopData.id }).then(
|
978
|
981
|
(result1) => {
|
979
|
982
|
if (result1.status == 200) {
|