-
-
-
-
-
-
- {{ item.departmentName }}
- {{ item.departmentName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 将文件拖到此处，或点击上传
+
+ 将文件拖到此处，或
+ 点击上传
+
仅允许导入xls、xlsx格式文件。
下载模板
+ >下载模板
diff --git a/src/views/system/person/personjs.js b/src/views/system/person/personjs.js
index 73be277..842ceca 100644
--- a/src/views/system/person/personjs.js
+++ b/src/views/system/person/personjs.js
@@ -9,8 +9,10 @@ import {
} from "@/api/system/person";
import { getToken } from "@/utils/auth";
import { getListByUser } from "@/api/system/userlist.js";
+import stationAcatar from "../stationAvatar/index.vue";
export default {
+ components: { stationAcatar },
name: "Person",
data() {
// 验证手机号的规则
@@ -154,6 +156,8 @@ export default {
// 表单参数
form: {},
index: "",
+ idd: 1,
+
// 表单校验
rules: {
nurseStationId: [
@@ -216,6 +220,47 @@ export default {
this.info();
},
methods: {
+ //删除Certificate
+ delCertificate(index) {
+ if (this.form.nurseStationPersonCertificateList.length == 1) {
+ this.$message.error("不可全部删除");
+ } else {
+ this.form.nurseStationPersonCertificateList.splice(index, 1);
+ }
+ },
+ //添加Certificate
+ addCertificate() {
+ this.idd++;
+ var obj = {
+ certificateName: null,
+ certificateUrl: null,
+ idd: this.idd
+ };
+ if (this.form.nurseStationPersonCertificateList.length == 5) {
+ this.$message.error("最多只能5条");
+ } else {
+ this.form.nurseStationPersonCertificateList.push(obj);
+ }
+ },
+ imgUrl(imgUrl) {},
+ //接收图片所属的item
+ imgclassifyItem(item) {
+ let items = JSON.parse(item);
+ console.log(items)
+ if (items.idd && !items.id) {
+ this.form.nurseStationPersonCertificateList.forEach((e) => {
+ if (e.idd == items.idd) {
+ e.certificateUrl = items.certificateUrl;
+ }
+ });
+ } else if (!items.idd && items.id) {
+ this.form.nurseStationPersonCertificateList.forEach((e) => {
+ if (e.id == items.id) {
+ e.certificateUrl = items.certificateUrl;
+ }
+ });
+ }
+ },
// // 新增所属科室按钮
departclick(item, index) {
if (this.form.nurseStationId != null) {
@@ -265,7 +310,6 @@ export default {
this.innerVisiblexg = false;
this.form.nursename = row.nurseStationName;
},
-
// 护理站名称
nurseclick(row) {
this.nursename = row.nurseStationName;
@@ -278,7 +322,6 @@ export default {
row.nurseStationName;
this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
},
-
// 所属科室
StationDepartmentclick(row) {
console.log(row);
@@ -314,7 +357,6 @@ export default {
this.loading = false;
});
},
-
getList3() {
this.loading = true;
StationDepartmentList(this.queryParams3).then((res) => {
@@ -336,8 +378,7 @@ export default {
reset() {
this.form = {
id: null,
- pageNum: 1,
- pageSize: 10,
+ nurseStationId: null,
departmentCode: null,
userId: null,
nursePersonCode: null,
@@ -351,19 +392,11 @@ export default {
updateTime: null,
nurseStationName: "请选择所属护理站",
departmentName: "请选择所属科室",
- nurseStationPersonList: [{
- id: "",
- nurseStationId: "",
- departmentCode: "",
- nursePersonCode: "",
- nursePersonName: "",
- nursePersonType: "",
- nurseStationName: "请选择所属护理站",
- phone: "",
- address: "",
- sex: "",
- departmentName: "请选择所属科室",
- }, ],
+ nurseStationPersonCertificateList: [{
+ certificateName: null,
+ certificateUrl: null,
+ idd: this.idd
+ }]
};
this.resetForm("form");
},
@@ -438,9 +471,9 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
- this.queryParams3.nurseStationId = null;
+ this.queryParams3.nurseStationId = null
this.reset();
- this.open2 = true;
+ this.open = true;
this.title = "添加护理站人员信息";
this.title2 = "请选择所属护理站";
this.title3 = "请选择科室";
@@ -453,6 +486,14 @@ export default {
this.departmentName = response.data.departmentName;
this.nurseStationName = response.data.nurseStationName;
this.form = response.data;
+ var obj = {
+ certificateName: null,
+ certificateUrl: null,
+ idd: this.idd
+ };
+ if (this.form.nurseStationPersonCertificateList.length == 0) {
+ this.form.nurseStationPersonCertificateList.push(obj);
+ }
this.queryParams3.nurseStationId = response.data.nurseStationId;
this.open = true;
this.title = "修改护理站人员信息";
@@ -465,16 +506,6 @@ export default {
},
/** 提交按钮 */
submitForm() {
- if (this.form.id == null) {
- this.form.nursePersonName = this.form.nurseStationPersonList[0].nursePersonName
- this.form.nursePersonType = this.form.nurseStationPersonList[0].nursePersonType
- this.form.sex = this.form.nurseStationPersonList[0].sex
- this.form.address = this.form.nurseStationPersonList[0].address
- this.form.departmentCode = this.form.nurseStationPersonList[0].departmentCode
- this.form.departmentName = this.form.nurseStationPersonList[0].departmentName
- this.form.phone = this.form.nurseStationPersonList[0].phone
- }
- console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 7098564..b26b062 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -1,19 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
From 57e0fb0940527548bf04d15d44e5b777b163b009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 6 Apr 2023 17:22:54 +0800
Subject: [PATCH 12/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/order/index.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 53bc177..e07a8f9 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -135,6 +135,12 @@
+
+
+
From 488671a124017bd099000b7132a2ad41e4525745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 7 Apr 2023 10:25:45 +0800
Subject: [PATCH 13/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/revenue/index.vue | 92 +++++++++++++++++++++++++++++-
1 file changed, 90 insertions(+), 2 deletions(-)
diff --git a/src/views/system/revenue/index.vue b/src/views/system/revenue/index.vue
index 447ff14..17bbd37 100644
--- a/src/views/system/revenue/index.vue
+++ b/src/views/system/revenue/index.vue
@@ -36,6 +36,27 @@
@keyup.enter.native="handleQuery"
/>-->
+
+
+
+
搜索
重置
@@ -47,6 +68,8 @@
Date: Fri, 7 Apr 2023 10:34:59 +0800
Subject: [PATCH 14/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/revenue/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/revenue/index.vue b/src/views/system/revenue/index.vue
index 17bbd37..8002335 100644
--- a/src/views/system/revenue/index.vue
+++ b/src/views/system/revenue/index.vue
@@ -40,7 +40,7 @@
From a4b9bead18e9d989257c01aa5bd39a0908d9d342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 7 Apr 2023 10:36:15 +0800
Subject: [PATCH 15/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/revenue/index.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/system/revenue/index.vue b/src/views/system/revenue/index.vue
index 8002335..8048aae 100644
--- a/src/views/system/revenue/index.vue
+++ b/src/views/system/revenue/index.vue
@@ -234,7 +234,10 @@ export default {
nurseStationPersonId: null,
appointmentOrderId: null,
revenueAmount: null,
- finishOrderTime: null
+ finishOrderTime: null,
+ monthTime: null,
+ monthStartTime: null, //开始时间
+ monthEndTime: null //结束时间
},
//护理站请求参数
nurseStationqueryParams: {
From 360afb46c786722c86bf29162dd31f0003f3d66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 7 Apr 2023 10:53:02 +0800
Subject: [PATCH 16/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/stationItem/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index fb3c208..48ab752 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -1164,10 +1164,10 @@ export default {
if (this.form.nurseStationItemPrices.length > 0) {
this.form.nurseStationItemPrices.forEach(e => {
if (!e.commissionAmount || e.commissionAmount == "") {
- e.commissionRate = Number(e.commissionRate);
+ e.commissionRate = null;
}
if (!e.commissionRate || e.commissionRate == "") {
- e.commissionAmount = Number(e.commissionAmount);
+ e.commissionAmount = null;
}
});
}
From a4d545bc98ce343d92fc339ea998bb123debd21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 7 Apr 2023 16:34:32 +0800
Subject: [PATCH 17/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/person/personjs.js | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/views/system/person/personjs.js b/src/views/system/person/personjs.js
index 31f2152..1d75ebf 100644
--- a/src/views/system/person/personjs.js
+++ b/src/views/system/person/personjs.js
@@ -252,6 +252,7 @@ export default {
var obj = {
certificateName: null,
certificateUrl: null,
+ sort: null,
idd: this.idd
};
if (this.form.nurseStationPersonCertificateList.length == 5) {
@@ -412,6 +413,7 @@ export default {
nurseStationPersonCertificateList: [{
certificateName: null,
certificateUrl: null,
+ sort: null,
idd: this.idd
}]
};
@@ -508,6 +510,7 @@ export default {
var obj = {
certificateName: null,
certificateUrl: null,
+ sort: null,
idd: this.idd
};
if (this.form.nurseStationPersonCertificateList.length == 0) {
@@ -527,6 +530,13 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ if (this.form.nurseStationPersonCertificateList.length > 0) {
+ this.form.nurseStationPersonCertificateList.forEach(e => {
+ if (!e.certificateName && !e.certificateUrl && !e.sort) {
+ this.form.nurseStationPersonCertificateList = this.form.nurseStationPersonCertificateList.filter(el => el != e)
+ }
+ })
+ }
if (this.form.id != null) {
updatePerson(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
From dae975fc0ec723af640e7e655d740dd2268d7e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 10 Apr 2023 09:13:37 +0800
Subject: [PATCH 18/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/stationItem/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 48ab752..40bb765 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -1161,13 +1161,14 @@ export default {
e.consumableCount = Number(e.consumableCount);
});
}
+ console.log(this.form)
if (this.form.nurseStationItemPrices.length > 0) {
this.form.nurseStationItemPrices.forEach(e => {
if (!e.commissionAmount || e.commissionAmount == "") {
- e.commissionRate = null;
+ e.commissionAmount = null;
}
if (!e.commissionRate || e.commissionRate == "") {
- e.commissionAmount = null;
+ e.commissionRate = null;
}
});
}
From 8abaeab59a1544c5a65dd8af0b2528fa18c98375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 10 Apr 2023 09:27:49 +0800
Subject: [PATCH 19/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/person/index.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 8faecf4..deaa023 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -139,7 +139,6 @@
-
+
-
+ >
-
+ >
-
+ >
-
+ >
-
+
- 搜索
- 重置
+ 搜索
+ 重置
@@ -122,8 +102,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:communityInfo:add']"
- >新增
+ >新增
修改
+ >修改
删除
+ >删除
导出
+ >导出
-
+
修改
+ >修改
删除
+ >删除
@@ -221,19 +180,8 @@
@pagination="liststationinfo"
/>
-
-
+
+
-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
@@ -477,3 +557,15 @@
import personjs from "./personjs";
export default personjs;
+
diff --git a/src/views/system/person/personjs.js b/src/views/system/person/personjs.js
index 85362ca..31f2152 100644
--- a/src/views/system/person/personjs.js
+++ b/src/views/system/person/personjs.js
@@ -6,11 +6,13 @@ import {
updatePerson,
stationList,
StationDepartmentList,
+ getNurseStationPersonCheck,
+ updateNurseStationPersonChecks
} from "@/api/system/person";
import { getToken } from "@/utils/auth";
import { getListByUser } from "@/api/system/userlist.js";
import stationAcatar from "../stationAvatar/index.vue";
-
+import baseurl from '@/api/baseurl'
export default {
components: { stationAcatar },
name: "Person",
@@ -36,6 +38,7 @@ export default {
cb(new Error("请输入正确的联系电话"));
};
return {
+ baseurl: null,
//男女选择
positionalTitleLevellist: [{
label: "初级",
@@ -123,8 +126,8 @@ export default {
title3: "",
// 修改弹出层
open: false,
+ templeopen: false,
// 添加弹出层
- open2: false,
//权限查询
// 查询参数
queryParams: {
@@ -230,6 +233,7 @@ export default {
};
},
created() {
+ this.baseurl = baseurl
this.infos();
this.info();
},
@@ -382,7 +386,6 @@ export default {
// 取消按钮
cancel() {
this.open = false;
- this.open2 = false;
this.nurseStationName = "请选择所属护理站";
this.departmentName = "请选择所属科室";
// this.upload.open=false;
@@ -533,7 +536,7 @@ export default {
} else {
addPerson(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
- this.open2 = false;
+ this.open = false;
this.getList();
this.nurseStationName = "请选择所属护理站";
this.departmentName = "请选择所属科室";
@@ -542,6 +545,24 @@ export default {
}
});
},
+ // 审核
+ handshenhe(row) {
+ getNurseStationPersonCheck(row.id).then(res => {
+ this.form = res.data;
+ this.templeopen = true;
+ })
+ },
+ // 审核提交
+ templesubmit() {
+ updateNurseStationPersonChecks(this.form).then(res => {
+ this.$modal.msgSuccess("审核成功");
+ this.getList();
+ this.templeopen = false
+ })
+ },
+ templeopenfalse() {
+ this.templeopen = false
+ },
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
From b7ef43970466e7cbfe7f54e782912ac8ef3dcc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 6 Apr 2023 17:05:18 +0800
Subject: [PATCH 11/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/order/index.vue | 37 +++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 23200df..53bc177 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -121,40 +121,43 @@
+
@@ -119,11 +108,9 @@ size="small" @click="rotateRight()" > - --> + -->
- 提 交
+ 提 交
@@ -136,7 +123,7 @@ import baseurl from "@/api/baseurl.js";
import {
updateNurseStationHeads,
posts,
- updatePoserHeads,
+ updatePoserHeads
} from "@/api/system/stationAvatar.js";
export default {
@@ -158,17 +145,17 @@ export default {
autoCrop: true, // 是否默认生成截图框
autoCropWidth: 300, // 默认生成截图框宽度
autoCropHeight: 300, // 默认生成截图框高度
- fixedBox: true, // 固定截图框大小 不允许改变
+ fixedBox: true // 固定截图框大小 不允许改变
},
previews: {},
items: {},
//显示上传按钮
videoForm: {
- showVideoPath: null, //回显的变量
+ showVideoPath: null //回显的变量
},
video: {
- VideoPath: null, //回显的变量
- },
+ VideoPath: null //回显的变量
+ }
};
},
created() {
@@ -197,12 +184,12 @@ export default {
},
watch: {
tovideo: {
- handler(newimg, oldimg) {},
+ handler(newimg, oldimg) {}
},
item: {
handler(newimg, oldimg) {
this.items = this.item;
- },
+ }
},
img: {
handler(newimg, oldimg) {
@@ -213,13 +200,13 @@ export default {
} else {
this.options.img = baseurl + this.img;
}
- },
+ }
},
type: {
handler(newimg, oldimg) {
this.types = this.type;
- },
- },
+ }
+ }
},
methods: {
// 编辑头像
@@ -279,13 +266,13 @@ export default {
formData.append("file", this.previews.data);
formData.append("type", this.types);
if (this.types == "posterVideoUrl") {
- updatePoserHeads(formData).then((response) => {
+ updatePoserHeads(formData).then(response => {
this.video.VideoPath = baseurl + response.imgUrl;
this.$emit("imgUrl", response.imgUrl);
this.openimg = false;
});
} else {
- updateNurseStationHeads(formData).then((response) => {
+ updateNurseStationHeads(formData).then(response => {
this.options.img = baseurl + response.imgUrl;
this.$emit("imgUrl", response.imgUrl);
if (this.types == "attributePitureUrl") {
@@ -304,6 +291,15 @@ export default {
this.items.posterPictureUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items));
}
+ if (this.types == "certificateUrl") {
+ this.items.certificateUrl = response.imgUrl;
+ this.$emit("item", JSON.stringify(this.items));
+ console.log(this.item);
+ }
+ if (this.types == "personCertificateUrl") {
+ this.items.certificateUrl = response.imgUrl;
+ this.$emit("item", JSON.stringify(this.items));
+ }
this.openimg = false;
});
}
@@ -319,8 +315,8 @@ export default {
closeDialog() {
this.imgs = "";
this.visible = false;
- },
- },
+ }
+ }
};
From 1219f19e81ec4dc4752c752222dcbdff4b8bf101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 6 Apr 2023 16:54:54 +0800
Subject: [PATCH 10/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/person.js | 28 +++++++--
src/views/system/person/index.vue | 96 ++++++++++++++++++++++++++++-
src/views/system/person/personjs.js | 29 +++++++--
3 files changed, 142 insertions(+), 11 deletions(-)
diff --git a/src/api/system/person.js b/src/api/system/person.js
index c046256..7623f6e 100644
--- a/src/api/system/person.js
+++ b/src/api/system/person.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询护理站人员信息列表
export function listPerson(query) {
return request({
- url: 'system/person/getNurseStationPersonList',
+ url: '/system/person/getNurseStationPersonList',
method: 'get',
params: query
})
@@ -11,7 +11,7 @@ export function listPerson(query) {
// 查询护理站名称
export function stationList(query) {
return request({
- url: 'system/station/list',
+ url: '/system/station/list',
method: 'get',
params: query
})
@@ -20,7 +20,7 @@ export function stationList(query) {
// 查询所属科室
export function StationDepartmentList(query) {
return request({
- url: 'system/StationDepartment/list',
+ url: '/system/StationDepartment/list',
method: 'get',
params: query
})
@@ -36,7 +36,7 @@ export function getPerson(id) {
// 新增护理站人员信息
export function addPerson(data) {
return request({
- url: 'system/person/add',
+ url: '/system/person/add',
method: 'post',
data: data
})
@@ -45,7 +45,7 @@ export function addPerson(data) {
// 修改护理站人员信息
export function updatePerson(data) {
return request({
- url: 'system/person/edit',
+ url: '/system/person/edit',
method: 'post',
data: data
})
@@ -58,3 +58,21 @@ export function delPerson(id) {
method: 'delete'
})
}
+
+// 审核接口根据id查询护理站人员信息以及未审核的证书
+export function getNurseStationPersonCheck(id) {
+ return request({
+ url: '/system/person/getNurseStationPersonCheck/' + id,
+ method: 'get'
+ })
+}
+
+
+//审核确定接口
+export function updateNurseStationPersonChecks(data) {
+ return request({
+ url: '/system/person/updateNurseStationPersonChecks',
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index dc3d6fc..8faecf4 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -123,7 +123,6 @@
@selection-change="handleSelectionChange"
>
- 审核
+ 审核
取 消
+
+
+ >您的浏览器不支持视频播放
![]()
- 您的浏览器不支持视频播放
-
- ![]()
+ >您的浏览器不支持视频播放
+ ![]()
-
- 请上传图片为800x800px的正方形
-
+ 请上传图片为800x800px的正方形
@@ -119,11 +108,9 @@ size="small" @click="rotateRight()" > - --> + -->
{{ form.nurseStationName }}
+ {{ form.departmentName }}
+ {{ form.nursePersonName }}
+ {{ form.nursePersonType }}
+
+ {{ form.sex=='MALE'?'男':'' }}
+ {{ form.sex=='FEMALE'?'女':'' }}
+
+ {{ form.phone }}
+ {{ form.address }}
+
+ {{ form.positionalTitleLevelCheck=='PRIMARY_LEVEL'?'初级':'' }}
+ {{ form.positionalTitleLevelCheck=='MIDDLE_LEVEL'?'中级':'' }}
+ {{ form.positionalTitleLevelCheck=='HIGH_LEVEL'?'高级':'' }}
+
+ {{ scope.row.certificateName }}
+
+ {{ scope.row.sort }}
+
+ {{query.orderNo}}
{{switchOrderStatus(query.orderStatus)}}
{{query.totalPrice}}
{{query.orderCount}}
{{query.nurseItemName}}
{{query.time}}
{{query.itemServeDurationUnit}}
{{query.nurseStationName}}
{{query.serviceAddress}}
{{query.disablingCondition}}
{{query.disablingReason}}
{{query.diseaseName}}
{{query.nurseItemName}}
{{query.compositeScore}}
+ {{query.time}}
-
+ >
-
+
-
+ >
-
+
-
+ >
-
+
-
+ >
-
-
-
+
+
+ -->
-
+ >
-
+
-
+ >
-
+
-
+ >
-
+
-
+ @click.native="clickcode2(item)"
+ >
@@ -458,7 +353,7 @@
placeholder="请输入社区经度"
maxlength="20"
style="width: 200px"
- type="number"
+ type="number"
oninput=" if(value.length>10){value=value.slice(0,20)}"
/>
@@ -468,7 +363,7 @@
placeholder="请输入社区纬度"
maxlength="20"
style="width: 200px"
- type="number"
+ type="number"
oninput=" if(value.length>10){value=value.slice(0,20)}"
/>
@@ -490,7 +385,7 @@ import {
updateCommunityInfo,
FirstLevels,
SecondaryLevelInfo,
- SubordinateRegions,
+ SubordinateRegions
} from "@/api/system/communityInfo";
export default {
@@ -518,10 +413,10 @@ export default {
{
provinceName: null,
cityName: null,
- streetName: null,
- },
- ],
- },
+ streetName: null
+ }
+ ]
+ }
],
// 所属区域
arealist: [],
@@ -547,7 +442,7 @@ export default {
city: "",
area: "",
areaCode: "",
- province: "",
+ province: ""
// areaCode: null,
// communityCode: null,
// communityName: null,
@@ -557,7 +452,7 @@ export default {
getProvincequeryParams: {
pageNum: 1,
pageSize: 10,
- pageNum: 1,
+ pageNum: 1
// pageSize: 10,
// searchValue: null,
// createBy: null,
@@ -573,7 +468,7 @@ export default {
getProvincequeryParams2: {
pageNum: 1,
pageSize: 10,
- pageNum: 1,
+ pageNum: 1
// pageSize: 10,
// searchValue: null,
// createBy: null,
@@ -593,12 +488,12 @@ export default {
areaCode: {
required: true,
message: "所属区域不能为空",
- trigger: "blur",
+ trigger: "blur"
},
communityName: {
required: true,
message: "社区名称不能为空",
- trigger: "blur",
+ trigger: "blur"
},
// communityLongitude: {
// required: true,
@@ -614,13 +509,13 @@ export default {
areaCode: {
required: true,
message: "所属区域不能为空",
- trigger: "blur",
+ trigger: "blur"
},
communityName: {
required: true,
message: "社区名称不能为空",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
// communityLongitude: {
// required: true,
// message: "经度不能为空",
@@ -631,8 +526,8 @@ export default {
// message: "纬度不能为空",
// trigger: "blur",
// },
- },
- },
+ }
+ }
};
},
created() {
@@ -640,30 +535,22 @@ export default {
this.Provincelist();
},
methods: {
- clickcode2(item) {
+ clickcode2(item) {
this.form.areaCode = Number(item.areaCode);
- console.log(this.form);
- this.$forceUpdate()
-
+ this.$forceUpdate();
},
clickcode(item, index) {
- console.log(item);
this.form.communityInfoList[index].areaCode = Number(item.areaCode);
// this.form.communityInfoList[index].areaCode = Number(this.form.communityInfoList[index].areaCode);
-
- console.log(this.form);
},
// 查询省事件
province(item) {
// this.form.xxx[index].code=''
- console.log(item);
this.queryParams.city = "";
this.queryParams.area = "";
this.queryParams.areaCode = "";
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
// this.SecondaryLevelInfolist = res.data;
- // console.log(this.SecondaryLevelInfolist);
this.citylist = res.data;
});
},
@@ -672,35 +559,27 @@ export default {
this.form.communityInfoList[index].city = "";
this.form.communityInfoList[index].area = "";
this.form.communityInfoList[index].areaCode = "";
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
// this.SecondaryLevelInfolist = res.data;
- // console.log(this.SecondaryLevelInfolist);
this.citylist = res.data;
});
},
// 修改
province3(item) {
// this.form.xxx[index].code=''
- console.log(item);
this.form.city = "";
this.form.area = "";
this.form.code = "";
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
// this.SecondaryLevelInfolist = res.data;
- // console.log(this.SecondaryLevelInfolist);
this.citylist = res.data;
});
},
// 点击市
clickcity(item) {
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
+ SecondaryLevelInfo(item.id).then(res => {
this.queryParams.area = "";
this.queryParams.areaCode = "";
- console.log(res);
this.arealists = res.data;
});
},
@@ -712,19 +591,15 @@ export default {
// this.value3 = "";
this.form.communityInfoList[index].area = "";
this.form.communityInfoList[index].areaCode = "";
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
this.arealists = res.data;
});
},
// 修改
clickcity3(item) {
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
+ SecondaryLevelInfo(item.id).then(res => {
this.form.area = "";
- this.form.code = "";
- console.log(res);
+ this.form.code = "";
this.arealists = res.data;
});
},
@@ -733,9 +608,7 @@ export default {
this.queryParams.areaCode = "";
// this.queryParams.areaCode = "";
// this.value3 = "";
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
this.streetlist = res.data;
});
},
@@ -745,64 +618,51 @@ export default {
// this.value3 = "";
this.form.communityInfoList[index].areaCode = "";
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
this.streetlist = res.data;
});
},
clickarea3(item) {
- this.form.code = "";
+ this.form.code = "";
// this.queryParams.areaCode = "";
// this.value3 = "";
- console.log(item);
- SecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
+ SecondaryLevelInfo(item.id).then(res => {
this.streetlist = res.data;
});
},
//点击街道
clickstreet(item) {
this.form.areaCode = item.areaCode;
- console.log(this.form);
},
// clickstreet3(item) {
// this.form.areaCode = item.areaCode;
- // // console.log(this.queryParams);
// },
// 所属省下拉框
loadMore() {
- console.log("1");
var a = Math.ceil(this.total2 / 10);
- console.log(this.arealist.length);
if (this.arealist.length + 1 >= this.total2) {
} else {
if (this.getProvincequeryParams.pageNum >= a) {
} else {
this.getProvincequeryParams.pageNum++;
- FirstLevels(this.getProvincequeryParams).then((res) => {
- console.log(res);
- res.rows.forEach((e) => {
+ FirstLevels(this.getProvincequeryParams).then(res => {
+ res.rows.forEach(e => {
this.arealist.push(e);
- console.log(this.arealist);
});
});
}
}
},
Provincelist() {
- FirstLevels(this.getProvincequeryParams).then((res) => {
- console.log(res);
+ FirstLevels(this.getProvincequeryParams).then(res => {
this.arealist = res.data;
this.total2 = res.total;
- console.log(this.arealist);
});
},
//删除delcommunity
delcommunity(index) {
this.form.communityInfoList.splice(index, 1);
- console.log(this.form.communityInfoList);
},
//添加addcommunity
addcommunity() {
@@ -811,7 +671,7 @@ export default {
communityCode: "",
communityName: "",
communityLongitude: "",
- communityLatitude: "",
+ communityLatitude: ""
// diseaseName: "",
// description: "",
// sort: "",
@@ -852,16 +712,16 @@ export default {
communityCode: "",
communityName: "",
communityLongitude: "",
- communityLatitude: "",
- },
- ],
+ communityLatitude: ""
+ }
+ ]
};
this.resetForm("form");
},
/** 搜索按钮操作 */
liststationinfo() {
- listCommunityInfo(this.queryParams).then((response) => {
- response.rows.forEach((e) => {
+ listCommunityInfo(this.queryParams).then(response => {
+ response.rows.forEach(e => {
if (e.sysAreaVOList == []) {
} else if (e.sysAreaVOList == null) {
} else if (!e.sysAreaVOList) {
@@ -924,13 +784,13 @@ export default {
area: null,
areaCode: null,
areaName: null,
- areaLevel: null,
+ areaLevel: null
};
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -944,16 +804,13 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
- console.log(row);
const id = row.id || this.ids;
- getCommunityInfo(id).then((response) => {
+ getCommunityInfo(id).then(response => {
this.form = response.data;
this.title = "修改居住社区信息";
this.form.code = null;
- console.log(1);
- SubordinateRegions(response.data.areaCode).then((res) => {
- console.log(res);
+ SubordinateRegions(response.data.areaCode).then(res => {
if (res.data !== null) {
this.form.province = String(res.data.provinceCode);
// this.form.province = res.data.provinceCode;
@@ -961,7 +818,6 @@ export default {
this.form.area = res.data.regionName;
// this.form.areaCode = res.data.streetName;
this.form.code = res.data.streetName;
- console.log(this.form);
this.open = true;
}
});
@@ -969,21 +825,21 @@ export default {
},
/** 提交按钮 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
if (valid) {
// let newStr = JSON.stringify(this.form.areaCode);
// let newObj = JSON.parse(newStr);
if (this.form.id != null) {
- updateCommunityInfo(this.form).then((response) => {
+ updateCommunityInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
- this.open2 = false;
+ this.open2 = false;
this.open = false;
-
+
this.getList();
});
} else {
- addCommunityInfo(this.form).then((response) => {
+ addCommunityInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.open2 = false;
@@ -998,7 +854,7 @@ export default {
const ids = row.id || this.ids;
this.$modal
.confirm("是否确认删除居住社区信息的数据项？")
- .then(function () {
+ .then(function() {
return delCommunityInfo(ids);
})
.then(() => {
@@ -1012,11 +868,11 @@ export default {
this.download(
"system/communityInfo/export",
{
- ...this.queryParams,
+ ...this.queryParams
},
`communityInfo_${new Date().getTime()}.xlsx`
);
- },
- },
+ }
+ }
};
diff --git a/src/views/system/diseaseInfo/index.vue b/src/views/system/diseaseInfo/index.vue
index 9fd0496..5219a43 100644
--- a/src/views/system/diseaseInfo/index.vue
+++ b/src/views/system/diseaseInfo/index.vue
@@ -321,7 +321,6 @@ export default {
//删除deldisease
deldisease(index) {
this.form.diseaseInfoList.splice(index, 1);
- console.log(this.form.diseaseInfoList);
},
//添加adddisease
adddisease() {
diff --git a/src/views/system/goodsCategory/index.vue b/src/views/system/goodsCategory/index.vue
index 1172895..f14bd90 100644
--- a/src/views/system/goodsCategory/index.vue
+++ b/src/views/system/goodsCategory/index.vue
@@ -12,7 +12,7 @@
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
-
-->
+