diff --git a/src/api/system/area.js b/src/api/system/area.js index fa736d6..23661cc 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -76,4 +76,12 @@ export function updateRemoteSigns(id, remoteSigns) { url: `/system/area/updateRemoteSigns?id=${id}&remoteSigns=${remoteSigns}`, method: 'POST' }) +} + +//同步百度地图 +export function getAreaList(keyword, areaLevel, parentCode, parentId) { + return request({ + url: `/system/area/getAreaList?keyword=${keyword}&areaLevel=${areaLevel}&parentCode=${parentCode}&parentId=${parentId}`, + method: 'get' + }) } \ No newline at end of file diff --git a/src/api/system/order.js b/src/api/system/order.js index c208195..8e480cc 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -19,7 +19,7 @@ export function Detailed(id) { export function appointmentOrderDetails(id) { return request({ - url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`, + url: `/system/appointmentOrderDetails/detailed` + `?orderNo=${id}`, method: 'get', }) @@ -77,3 +77,21 @@ export function getPersonInfo(nurseStationPersonId) { method: 'get' }) } + +//xiugai + +export function edit(data) { + return request({ + url: `/system/appointmentOrderDetails/updateAppointmentOrderInfo`, + method: "post", + data + }) +} + +//确认完成 +export function updateCompanionStatus(orderStatus, orderNo) { + return request({ + url: `/system/appointmentOrder/updateCompanionStatus?orderStatus=${orderStatus}&orderNo=${orderNo}`, + method: "post" + }) +} \ No newline at end of file diff --git a/src/api/system/station.js b/src/api/system/station.js index ad0f5f5..cad6bad 100644 --- a/src/api/system/station.js +++ b/src/api/system/station.js @@ -111,3 +111,11 @@ export function updatePicture(data) { data: data }) } + +//生成二维码 +export function nurseStationFriends(nurseStationId) { + return request({ + url: `/system/station/nurseStationCode?nurseStationId=${nurseStationId}`, + method: 'post' + }) +} \ No newline at end of file diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 42752b9..665eae0 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -49,16 +49,14 @@ /> - 搜索 - 重置 + 搜索 + 重置 + + + + 点击同步百度地图区域信息 + ({{getbaidulist.areaName=='区域列表'?'全国':getbaidulist.areaName}}) + - + --> + @@ -129,17 +123,11 @@ active-color="#13ce66" inactive-color="#ff4949" @change="updateRemoteSigns(scope.row)" - > - - + > - + @@ -177,33 +163,14 @@ /> - - - + + - - + + @@ -213,12 +180,12 @@ + --> 否 是 - + { + selectAreaListquery(val).then(res => { this.deptOptions = res.data; }); } @@ -331,16 +300,34 @@ export default { this.selectAreaListin(); } } - }, + } }, methods: { + //同步百度地图 + getbaiduArea() { + if (this.getbaidulist.areaName == "区域列表") { + getAreaList("", 1, "", "").then(res => { + this.handleNodeClick(this.getbaidulist); + this.selectAreaListin(); + }); + } else { + getAreaList( + this.getbaidulist.areaName, + "", + this.getbaidulist.areaCode, + this.getbaidulist.id + ).then(res => { + this.handleNodeClick(this.getbaidulist); + }); + } + }, //修改是否为边远地区 updateRemoteSigns(row) { if (row.remoteSigns) { this.$confirm('确定修改"' + row.areaName + '"为偏远地区吗?', { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) .then(() => { var remoteSigns = null; @@ -349,11 +336,11 @@ export default { } else { remoteSigns = 0; } - updateRemoteSigns(row.id, remoteSigns).then((res) => { + updateRemoteSigns(row.id, remoteSigns).then(res => { if (res.code == 200) { this.$message({ type: "success", - message: "修改为偏远地区!", + message: "修改为偏远地区!" }); } }); @@ -362,14 +349,14 @@ export default { row.remoteSigns = false; this.$message({ type: "info", - message: "取消修改", + message: "取消修改" }); }); } else { this.$confirm('确定修改"' + row.areaName + '"为非偏远地区吗吗?', { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) .then(() => { var remoteSigns = null; @@ -378,11 +365,11 @@ export default { } else { remoteSigns = 0; } - updateRemoteSigns(row.id, remoteSigns).then((res) => { + updateRemoteSigns(row.id, remoteSigns).then(res => { if (res.code == 200) { this.$message({ type: "success", - message: "修改为非偏远地区!", + message: "修改为非偏远地区!" }); } }); @@ -391,25 +378,26 @@ export default { row.remoteSigns = true; this.$message({ type: "info", - message: "取消修改", + message: "取消修改" }); }); } }, // 节点单击事件 handleNodeClick(data) { + this.getbaidulist = data; this.queryParams.areaLevel = null; this.loading = true; this.queryParams.parentCode = data.areaCode; if (data.areaCode != 1) { this.handleQuery(); - selectAreaList("", data.areaCode).then((res) => { + selectAreaList("", data.areaCode).then(res => { if (res.data.length > 0) { - res.data.forEach((e) => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); } else { @@ -422,13 +410,13 @@ export default { this.queryParams.parentCode = null; this.queryParams.areaLevel = 1; this.handleQuery(); - selectAreaListinfo(1).then((res) => { + selectAreaListinfo(1).then(res => { if (res.data.length > 0) { - res.data.forEach((e) => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); } else { @@ -441,20 +429,20 @@ export default { }, selectAreaListin() { this.loading = true; - selectAreaListinfo(1).then((res) => { - res.data.forEach((e) => { + selectAreaListinfo(1).then(res => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); var obj = [ { areaName: "区域列表", children: res.data, - areaCode: 1, - }, + areaCode: 1 + } ]; this.deptOptions = obj; this.loading = false; @@ -462,11 +450,11 @@ export default { }, info() { this.loading = true; - selectAreaList(this.areaName).then((res) => { + selectAreaList(this.areaName).then(res => { this.loading = false; var obj = { areaName: "区域列表", - children: res.data, + children: res.data }; this.deptOptions = obj; }); @@ -474,8 +462,8 @@ export default { /** 查询区域列表 */ getList() { this.loading = true; - listArea(this.queryParams).then((response) => { - response.rows.forEach((e) => { + listArea(this.queryParams).then(response => { + response.rows.forEach(e => { if (e.remoteSigns == 1) { e.remoteSigns = true; } else { @@ -508,7 +496,7 @@ export default { updateTime: null, areaType: null, parentCode: null, - remoteSigns: "0", + remoteSigns: "0" }; this.resetForm("form"); }, @@ -529,11 +517,16 @@ export default { this.resetForm("queryForm"); this.queryParams.parentCode = null; this.queryParams.areaLevel = 1; + this.getbaidulist = { + areaName: "区域列表", + areaLevel: 1, + areaCode: 1 + }; 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; }, @@ -551,7 +544,7 @@ export default { handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getArea(id).then((response) => { + getArea(id).then(response => { response.data.remoteSigns = String(response.data.remoteSigns); this.form = response.data; this.open = true; @@ -560,24 +553,24 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { - updateArea(this.form).then((response) => { + updateArea(this.form).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); } }); } else { - addArea(this.form).then((response) => { + addArea(this.form).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.queryParams.parentCode = this.form.parentCode; - this.queryParams.areaLevel = null; - this.getList(); + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.queryParams.parentCode = this.form.parentCode; + this.queryParams.areaLevel = null; + this.getList(); } }); } @@ -589,7 +582,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm('是否确认删除区域名称为"' + row.areaName + '"的数据项吗？') - .then(function () { + .then(function() { return delArea(ids); }) .then(() => { @@ -603,11 +596,11 @@ export default { this.download( "system/area/export", { - ...this.queryParams, + ...this.queryParams }, `area_${new Date().getTime()}.xlsx` ); - }, - }, + } + } }; diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index 8253780..caafc62 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -51,18 +51,25 @@ - + - + - - + + + + + + \ No newline at end of file diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index 66c9d2a..5dfc2f4 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -8,6 +8,7 @@ import { getFirstLevelInfo, getSecondaryLevelInfo, updatePicture, + nurseStationFriends } from "@/api/system/station"; import stationAcatar from "../stationAvatar/index.vue"; import { getListByUser } from "@/api/system/userlist.js"; @@ -84,21 +85,25 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ], + },], // 护理站信息表格数据 stationList: [{ sysAreaVOList: [{ provinceName: null, cityName: null, streetName: null, - }, ], - }, ], + },], + },], nurseStationlist: [], // 弹出层标题 title: "", // 是否显示弹出层 open: false, Classifyshow: false, + nurseStationFriendslist: { + img: undefined + }, + nurseStationFriendsshow: false, afternoonOpenStartTimeStr: "", afternoonOpenEndTimeStr: "", //权限查询 @@ -150,13 +155,13 @@ export default { // validator: checkMobile, trigger: "blur", message: "请输入手机号", - }, ], + },], dutyPhone: [{ // validator: checkMobile2, trigger: "blur", message: "请输入联系电话", - }, ], + },], sort: [{ required: true, message: "排序不能为空", trigger: "blur" }], address: [{ required: true, message: "地址不能为空", trigger: "blur" }], longitude: [ @@ -176,7 +181,8 @@ export default { ], }, - checkedDataList: [] // 选择的护理机构分类 + checkedDataList: [],// 选择的护理机构分类 + loadingtext: "加载中" }; }, created() { @@ -185,6 +191,17 @@ export default { this.classifylistInfo(); }, methods: { + GenerateQRcode(row) { + this.loadingtext = "生成中"; + this.loading = true; + this.nurseStationFriendslist = row; + nurseStationFriends(row.id).then(res => { + this.nurseStationFriendslist.img = + process.env.VUE_APP_BASE_API + res.msg; + this.nurseStationFriendsshow = true; + this.loading = false; + }); + }, imgs(item) { this.imgsurl.pictureUrlList.push(item); }, @@ -201,7 +218,7 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ]; + },]; } else { this.looknurseStationLabel.splice(index, 1); } @@ -270,10 +287,10 @@ export default { obj.pictureUrlList.push(this.form.stationPictureUrl); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => {}); + updatePicture(this.imgsurl).then((res) => { }); } this.imgsurl = { pictureUrlList: [] }; this.open = false; @@ -284,6 +301,7 @@ export default { }, // 表单重置 reset() { + this.loadingtext = "加载中"; this.nurseStationType2 = []; this.form = { id: null, @@ -425,7 +443,7 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ]; + },]; this.title = "添加护理站信息"; }, /** 修改按钮操作 */ @@ -488,17 +506,17 @@ export default { } this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - } + } }); } else { addStation(this.form).then((response) => { - if (response.code==200) { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -515,7 +533,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm("是否确认删除此护理站信息？") - .then(function() { + .then(function () { return delStation(ids); }) .then(() => { @@ -523,19 +541,19 @@ export default { obj.pictureUrlList.push(row.stationIntroducePcitureUrl); obj.pictureUrlList.push(row.stationPictureUrl); if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { this.download( "system/station/export", { - ...this.getListByUserquery, - }, + ...this.getListByUserquery, + }, `station_${new Date().getTime()}.xlsx` ); },