From b711159df6608d726b19b97e410dc8ac692fb19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 11 Nov 2022 15:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/OperateGoodsInfo.js | 69 ++ src/api/system/goodsCategory.js | 52 + src/api/system/goodsInfo.js | 9 + src/api/system/goodsOrder.js | 7 +- src/api/system/nurseItem.js | 10 +- src/api/system/order.js | 45 +- src/api/system/patientArchives.js | 8 + src/api/system/person.js | 8 - src/api/system/station.js | 10 +- src/views/system/OperateGoodsInfo/index.vue | 989 +++++++++++++++++++ src/views/system/StationDepartment/index.vue | 329 +++--- src/views/system/diseaseInfo/index.vue | 1 - src/views/system/goodsCategory/index.vue | 408 ++++++++ src/views/system/goodsInfo/index.vue | 578 +++++------ src/views/system/goodsOrder/index.vue | 771 ++++++++------- src/views/system/order/index.vue | 623 +++++++----- src/views/system/patientArchives/index.vue | 85 +- src/views/system/person/index.vue | 456 +++------ src/views/system/station/index.vue | 186 ++-- src/views/system/stationConsumable/index.vue | 152 +-- src/views/system/stationItem/index.vue | 187 ++-- src/views/system/user/index.vue | 36 +- 22 files changed, 3320 insertions(+), 1699 deletions(-) create mode 100644 src/api/system/OperateGoodsInfo.js create mode 100644 src/api/system/goodsCategory.js create mode 100644 src/views/system/OperateGoodsInfo/index.vue create mode 100644 src/views/system/goodsCategory/index.vue diff --git a/src/api/system/OperateGoodsInfo.js b/src/api/system/OperateGoodsInfo.js new file mode 100644 index 0000000..c648a1b --- /dev/null +++ b/src/api/system/OperateGoodsInfo.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +// 查询商品基本信息列表 +export function goodsInfoList(query) { + return request({ + url: '/system/operateGoodInfo/goodsInfoList', + method: 'get', + params: query + }) +} + +// 查询商品基本信息详细 +export function getGoodsInfo(id) { + return request({ + url: `/system/operateGoodInfo/goodsDetails?` + `goodsInfoId=${id}`, + method: 'get' + }) +} +//取消 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} + +// 新增商品基本信息 +export function addGoodsInfo(data) { + return request({ + url: '/system/operateGoodInfo/add', + method: 'post', + data: data + }) +} + +// 查询商品分类列表 +export function goodsCategory(query) { + return request({ + url: '/system/goodsCategory/list ', + method: 'get', + params: query + }) +} +// 修改商品基本信息 +export function updateGoodsInfo(data) { + return request({ + url: '/system/operateGoodInfo/edit', + method: 'POST', + data: data + }) +} +// 修改上架下架状态 +// system/goodsInfo/editGoodsWhetherShelf +export function editGoodsWhetherShelf(data) { + return request({ + url: '/system/operateGoodInfo/editGoodsWhetherShelf', + method: 'post', + data: data + + }) +} +// 删除商品基本信息 +export function delGoodsInfo(goodsInfoId) { + return request({ + url: '/system/operateGoodInfo/' + goodsInfoId, + method: 'delete' + }) +} diff --git a/src/api/system/goodsCategory.js b/src/api/system/goodsCategory.js new file mode 100644 index 0000000..e32248e --- /dev/null +++ b/src/api/system/goodsCategory.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询商品分类信息列表 +export function listGoodsCategory(query) { + return request({ + url: '/system/goodsCategory/list', + method: 'get', + params: query + }) +} + +// 查询商品分类信息详细 +export function getGoodsCategory(id) { + return request({ + url: '/system/goodsCategory/' + id, + method: 'get' + }) +} +//取消 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} + +// 新增商品分类信息 +export function addGoodsCategory(data) { + return request({ + url: '/system/goodsCategory/add', + method: 'post', + data: data + }) +} + +// 修改商品分类信息 +export function updateGoodsCategory(data) { + return request({ + url: '/system/goodsCategory/edit', + method: 'POST', + data: data + }) +} + +// 删除商品分类信息 +export function delGoodsCategory(id) { + return request({ + url: '/system/goodsCategory/' + id, + method: 'POST' + }) +} \ No newline at end of file diff --git a/src/api/system/goodsInfo.js b/src/api/system/goodsInfo.js index 8ebd782..f71ee9e 100644 --- a/src/api/system/goodsInfo.js +++ b/src/api/system/goodsInfo.js @@ -76,3 +76,12 @@ export function delGoodsInfo(goodsInfoId) { method: 'delete' }) } +//取消 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} + diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js index 17ab35b..cd126aa 100644 --- a/src/api/system/goodsOrder.js +++ b/src/api/system/goodsOrder.js @@ -19,14 +19,14 @@ export function getGoodsOrder(id) { // 查看商品详细信息 export function getGoodsOrderlist(id) { return request({ - url: `/system/goodsOrder/goodsOrderByOrder`+`?orderNo=${id}`, + url: `/system/goodsOrder/goodsOrderByOrder` + `?orderNo=${id}`, method: 'get' }) } // 退款 export function goodsOrderRefundinfo(id) { return request({ - url: `/system/goodsOrder/goodsOrderRefund`+`?goodsOrderId=${id}`, + url: `/system/goodsOrder/goodsOrderRefund` + `?goodsOrderId=${id}`, method: 'get', }) } @@ -41,7 +41,6 @@ export function editExpressNo(data) { } // 退款确定按钮 - export function weChatRefundOrderApply(data) { return request({ url: '/nurseApp/weChatPayment/weChatRefundOrderApply', @@ -74,4 +73,4 @@ export function delGoodsOrder(id) { url: '/system/goodsOrder/' + id, method: 'delete' }) -} +} \ No newline at end of file diff --git a/src/api/system/nurseItem.js b/src/api/system/nurseItem.js index 384f02e..49ad1da 100644 --- a/src/api/system/nurseItem.js +++ b/src/api/system/nurseItem.js @@ -59,4 +59,12 @@ export function delNurseItem(id) { url: '/system/stationItem/' + id, method: 'delete' }) -} \ No newline at end of file +} +// 删除图片 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} diff --git a/src/api/system/order.js b/src/api/system/order.js index e4bd74c..b6b3568 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -11,40 +11,61 @@ export function appointmentOrderDetailsList(query) { export function Detailed(id) { return request({ - url: `/system/appointmentOrderDetails/Detailed`+`?orderNo=${id}`, + url: `/system/appointmentOrderDetails/getCancelOrderInfo` + `?orderNo=${id}`, + method: 'get', + + }) +} + +export function appointmentOrderDetails(id) { + return request({ + url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`, method: 'get', }) } + +// 确定按钮 +export function xylWeChatRefundNotify(data) { + return request({ + + url: '/nurseApp/weChatPayment/weChatRefundOrderApply', + method: 'post', + data: data + }) +} //删除 export function deldetailed(appointmentOrderId) { return request({ - url: '/system/appointmentOrder/'+appointmentOrderId, + url: '/system/appointmentOrder/' + appointmentOrderId, method: 'post', - } ) - } + + }) +} // 派单 export function getPerson(query) { return request({ url: '/system/appointmentOrder/getPerson', method: 'get', params: query + }) } // 确认派单 -export function dispatchsubmit(params) { +export function dispatchsubmit(data) { return request({ url: '/system/appointmentOrder/dispatch', method: 'post', - params + data: data }) } -// 认取消订单 -export function confirmCancel(params) { + + +// 确认取消订单 +export function confirmCancel(appointmentOrderId) { return request({ - url: '/system/appointmentOrder/confirmCancel', - method: 'post', - params + url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`, + method: 'post' }) -} \ No newline at end of file +} diff --git a/src/api/system/patientArchives.js b/src/api/system/patientArchives.js index f984aa4..56a1dec 100644 --- a/src/api/system/patientArchives.js +++ b/src/api/system/patientArchives.js @@ -63,3 +63,11 @@ export function delPatientArchives(id) { method: 'delete' }) } +// 重置密码 +export function updatePassword(params) { + return request({ + url: '/system/patientArchives/updatePassword', + method: 'post', + params: params + }) +} diff --git a/src/api/system/person.js b/src/api/system/person.js index 81f897d..c046256 100644 --- a/src/api/system/person.js +++ b/src/api/system/person.js @@ -16,14 +16,6 @@ export function stationList(query) { params: query }) } -//查看所属护理类型 - -export function getInfoLists(Code) { - return request({ - url: `/system/station/getNurseStationType?nurseTypeCode=${Code}`, - method: 'get' - }) -} // 查询所属科室 export function StationDepartmentList(query) { diff --git a/src/api/system/station.js b/src/api/system/station.js index e881784..418a9ec 100644 --- a/src/api/system/station.js +++ b/src/api/system/station.js @@ -95,4 +95,12 @@ export function getLabelList(id) { url: `/system/nurseStationlabel/getLabelList?nurseStationId=${id}`, method: 'get' }) -} \ No newline at end of file +} +//取消 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue new file mode 100644 index 0000000..538de19 --- /dev/null +++ b/src/views/system/OperateGoodsInfo/index.vue @@ -0,0 +1,989 @@ + + + + + diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue index f45476b..d8e8ca3 100644 --- a/src/views/system/StationDepartment/index.vue +++ b/src/views/system/StationDepartment/index.vue @@ -8,8 +8,11 @@ v-show="showSearch" label-width="68px" > - + - + - - - - - + + @@ -218,7 +190,34 @@ :rules="rules.nurseStationDepartmentList.nurseStationId" :prop="`nurseStationDepartmentList.${index}.nurseStationId`" > - {{ item.nurseStationName }} + + {{ item.nurseStationName }} + - - - - - + - - - + /> + @@ -350,6 +333,107 @@ 取 消 + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue index 0962026..620ea83 100644 --- a/src/views/system/goodsInfo/index.vue +++ b/src/views/system/goodsInfo/index.vue @@ -8,6 +8,21 @@ v-show="showSearch" label-width="100px" > + + + + + + - + - - - + - + 新增 @@ -90,33 +98,11 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:goodsInfo:edit']" + v-hasPermi="['system:operateGoodInfo:edit']" >修改 - - + - - - + + 修改 - 删除 - @@ -236,33 +206,28 @@ ref="form" :model="form" :rules="rules" - label-width="100px" + label-width="120px" :inline="true" > - - - - - + + - + + - - + @@ -339,7 +300,8 @@ @@ -347,7 +309,8 @@ @@ -394,173 +357,132 @@ 取 消 - + diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index ebbb4fe..0832727 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -6,8 +6,23 @@ size="small" :inline="true" v-show="showSearch" - label-width="68px" + label-width="90px" > + + + + + + - + + - + + + + 查看商品信息 - 录入物流单号 - + 确认退款 - - + icon="el-icon-edit" + disabled + v-hasPermi="['system:goodsOrder:goodsOrderRefund']" + >确认退款 - - + --> - + + + + + + + + + - - 确认 - 取消 - +
+ 取 消 + 确 定 +
@@ -416,60 +485,30 @@ v-model="refundlist.dictLabel" placeholder="" clearable - @keyup.enter.native="handleQuery" disabled /> - - + - - - - - +
取 消 @@ -532,7 +571,19 @@ diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 60a554d..721c1d3 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -8,7 +8,22 @@ v-show="showSearch" label-width="100px" > - + + + + + + + - - - - - + - - + + @@ -96,14 +144,33 @@ icon="el-icon-s-promotion" @click="dispatch(scope.row)" v-hasPermi="['system:appointmentOrder:dispatch']" - v-if="scope.row.orderStatus=='WAIT_DISPATCH'" + v-if="scope.row.orderStatus == 'WAIT_DISPATCH'" + >派单 + 派单 取消预约 + 取消预约 @@ -125,131 +192,119 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260,12 +315,12 @@ width="500px" height="100px" > - + {{ nurseName }} @@ -274,7 +329,7 @@ @click="clicknursePersonName()" v-else style=" - width: 362px; + width: 300px; text-align: left; height: 36px; padding-left: -10px; @@ -300,6 +355,55 @@
+ + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ - + - + @@ -223,20 +231,16 @@ label-width="110px" :inline="true" > - + - + - - - - - - + - + -
+
确 定 取 消
@@ -414,6 +415,7 @@ import { FirstLevel, SecondaryLevelInfo, getSubordinateRegions, + updatePassword, } from "@/api/system/patientArchives"; export default { @@ -598,6 +600,31 @@ export default { // this.areas(); }, methods: { + // 重置密码 + handleResetPwd(row) { + console.log(row) + const id= row.id + console.log(id) + // const id=row.userId + this.$prompt('请输入新的密码', "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + closeOnClickModal: false, + inputPattern: /^.{5,20}$/, + inputErrorMessage: "用户密码长度必须介于 5 和 20 之间", + }) + .then((res) => { + console.log(res) + const params = { + id, + password: res.value + } + updatePassword(params).then((response) => { + this.$modal.msgSuccess("修改成功，新密码是：" + res.value); + }); + }) + .catch(() => { }); + }, // 查询省事件 province(item) { console.log(item); @@ -831,7 +858,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue index f7246f0..347168a 100644 --- a/src/views/system/person/index.vue +++ b/src/views/system/person/index.vue @@ -125,17 +125,6 @@ >导入 - 取 消
- - @@ -457,8 +436,8 @@ > - - + +