diff --git a/src/api/baseurl.js b/src/api/baseurl.js index 8998a23..c4f3e01 100644 --- a/src/api/baseurl.js +++ b/src/api/baseurl.js @@ -1,3 +1,3 @@ -var baseurl = "http://192.168.16.30:8080"; +var baseurl = "http://192.168.16.76:8080"; export default baseurl \ No newline at end of file diff --git a/src/api/system/OperateGoodsInfo.js b/src/api/system/OperateGoodsInfo.js new file mode 100644 index 0000000..7772816 --- /dev/null +++ b/src/api/system/OperateGoodsInfo.js @@ -0,0 +1,61 @@ +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 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' + }) +} \ No newline at end of file diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue new file mode 100644 index 0000000..2f3a6ac --- /dev/null +++ b/src/views/system/OperateGoodsInfo/index.vue @@ -0,0 +1,995 @@ + + + + + diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue index f6a6e85..98e8081 100644 --- a/src/views/system/StationDepartment/index.vue +++ b/src/views/system/StationDepartment/index.vue @@ -626,7 +626,6 @@ export default { }, index: "", stationid: "", - nursename: "", innerVisible: false, }; }, @@ -639,11 +638,8 @@ export default { // add点击护理站名称 nurseclick(row) { console.log(row); - this.nursename = row.nurseStationName; this.stationid = row.id; - this.form.nurseStationId = row.id; this.innerVisible = false; - this.form.nursename = row.nurseStationName; this.form.nurseStationDepartmentList[this.index].nurseStationName = row.nurseStationName; this.form.nurseStationDepartmentList[this.index].nurseStationId = row.id; diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue index e86bde9..9e25292 100644 --- a/src/views/system/goodsInfo/index.vue +++ b/src/views/system/goodsInfo/index.vue @@ -236,12 +236,11 @@ v-model="form.goodsName" placeholder="请输入商品名称" max="40" - style="width: 210px" + style="width: 210px; margin-left: 10px" /> - + diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 20156ed..ce6481d 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="100px" > - + - - @@ -119,8 +122,6 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - -
- - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - + { res.data.forEach((e) => { if (e.serviceDate) { e.time = - e.serviceDate + - "-" + - e.serviceStartTime + - "-" + - e.serviceEndTime + e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime; } - } ); + }); this.OrderDetailsLists = res.data; this.query = res.data; + this.innerVisible4 = true; console.log(this.query); }); }, // 派单 dispatch(row) { - console.log(row) - this.querynursePersonname.detailsId = row.detailsId + console.log(row); + this.querynursePersonname.detailsId = row.detailsId; console.log(this.querynursePersonname.detailsId); // console.log(row) this.nurseName = "请选择护理员"; @@ -564,23 +556,21 @@ export default { }, // 姓名弹框确定按钮 submitForm() { - console.log(this.dispatchlist) - var obj = {} - obj.id = this.nursePersonid - obj.nurseStationPersonId = this.querynursePersonname.detailsId + console.log(this.dispatchlist); + var obj = {}; + obj.id = this.nursePersonid; + obj.nurseStationPersonId = this.querynursePersonname.detailsId; dispatchsubmit(obj).then((res) => { this.nurseName = "请选择护理员"; this.innerdispatch = false; - - }) + }); }, // 选择姓名按钮 nursePersonclick(row) { - this.nursePersonid = row.id - this.nurseName = row.nursePersonName + this.nursePersonid = row.id; + this.nurseName = row.nursePersonName; this.nursePersonNameinfo = false; - console.log(row) - + console.log(row); }, // 确认取消预约 // cencel(appointmentOrderId) { @@ -593,27 +583,22 @@ export default { // }, cencel(row) { - console.log('row :>> ', this.querynursecencel.appointmentOrderId); - this.querynursecencel.appointmentOrderId = row.appointmentOrderId + console.log("row :>> ", this.querynursecencel.appointmentOrderId); + this.querynursecencel.appointmentOrderId = row.appointmentOrderId; // obj.appointmentOrderId=row.appointmentOrderId - this.$confirm( - '是否确认取消订单', - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) + this.$confirm("是否确认取消订单", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { - confirmCancel(this.querynursecencel).then((res) => { this.$message.success("取消成功"); this.getList(); // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList); }); }) - .catch(() => { }); + .catch(() => {}); }, /** 查询护理类型信息列表 */ getList() { @@ -665,15 +650,11 @@ export default { /** 删除按钮操作 */ handleDelete(row) { // console.log('row :>> ', row); - this.$confirm( - '是否确认删除订单信息的数据项？', - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) + this.$confirm("是否确认删除订单信息的数据项？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) .then(() => { deldetailed(row.appointmentOrderId).then((res) => { this.$message.success("删除成功");