diff --git a/src/api/system/goodsInfo.js b/src/api/system/goodsInfo.js index 72c1ca7..8ebd782 100644 --- a/src/api/system/goodsInfo.js +++ b/src/api/system/goodsInfo.js @@ -70,9 +70,9 @@ export function editGoodsWhetherShelf(data) { }) } // 删除商品基本信息 -export function delGoodsInfo(id) { +export function delGoodsInfo(goodsInfoId) { return request({ - url: '/system/goodsInfo/' + id, + url: '/system/goodsInfo/' + goodsInfoId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/src/api/system/order.js b/src/api/system/order.js index 34cf624..15a3e99 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -24,3 +24,31 @@ export function deldetailed(appointmentOrderId) { }) } +// 派单 +export function getPerson(query) { + return request({ + url: '/system/appointmentOrder/getPerson', + method: 'get', + params: query + + }) +} + +// 确认派单 +export function dispatchsubmit(data) { + return request({ + url: '/system/appointmentOrder/dispatch', + method: 'post', + data: data + }) +} + + +// 确认取消订单 +export function confirmCancel(data) { + return request({ + url: '/system/appointmentOrder/confirmCancel', + method: 'post', + data: data + }) +} diff --git a/src/views/index.vue b/src/views/index.vue index 0b15b69..a1ff4bf 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,6 +1,6 @@ @@ -79,65 +79,73 @@ export default { diff --git a/src/views/register.vue b/src/views/register.vue index c4b6ab6..216c179 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -1,7 +1,7 @@ @@ -446,7 +395,7 @@ - - + - +
确定
- + --> @@ -646,7 +586,7 @@ export default { title: "", // 是否显示弹出层 open: false, - open2: false, + // open2: false, goods: [ { value: "BUSINESS", @@ -905,18 +845,18 @@ export default { this.title = "修改商品基本信息"; }); }, - reference(row) { - getGoodsInfo(row.goodsInfoId).then((response) => { - response.data[0].goodsPictureUrl = - baseurl + response.data[0].goodsPictureUrl; - this.form = response.data[0]; - response.data[0].goodAttributeDetailsLists.forEach((e) => { - e.attributePitureUrl = baseurl + e.attributePitureUrl; - }); - this.goodDetailsLists = response.data[0].goodAttributeDetailsLists; - this.open2 = true; - }); - }, + // reference(row) { + // getGoodsInfo(row.goodsInfoId).then((response) => { + // response.data[0].goodsPictureUrl = + // baseurl + response.data[0].goodsPictureUrl; + // this.form = response.data[0]; + // response.data[0].goodAttributeDetailsLists.forEach((e) => { + // e.attributePitureUrl = baseurl + e.attributePitureUrl; + // }); + // this.goodDetailsLists = response.data[0].goodAttributeDetailsLists; + // this.open2 = true; + // }); + // }, /** 提交按钮 */ submitForm() { console.log(this.goodDetailsLists); @@ -944,19 +884,39 @@ export default { }); }, /** 删除按钮操作 */ - handleDelete(row) { - const ids = row.id || this.ids; - this.$modal - .confirm("是否确认删除？") - .then(function () { - return delGoodsInfo(ids); - }) + handleDelete(row) { + console.log('row :>> ', row); + this.$confirm( + '是否确认删除订单信息的数据项？', + "提示", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ) .then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); + delGoodsInfo(row.goodsInfoId).then((res) => { + this.$message.success("删除成功"); + this.getList(); + // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList); + }); }) .catch(() => {}); }, + // handleDelete(row) { + // const ids = row.id || this.ids; + // this.$modal + // .confirm("是否确认删除？") + // .then(function () { + // return delGoodsInfo(ids); + // }) + // .then(() => { + // this.getList(); + // this.$modal.msgSuccess("删除成功"); + // }) + // .catch(() => {}); + // }, // /** 导出按钮操作 */ // handleExport() { // this.download( diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index 0b69328..7dc884f 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -24,7 +24,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }} {{ scope.row.orderChannel == "WECHAT_APPLET" ? "微信小程序" : "" }} - {{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝" : "" }} + {{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝小程序" : "" }} @@ -165,9 +170,121 @@ title="查看订单信息" :visible.sync="innerorder" append-to-body - width="1048px" + width="1200px" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -332,11 +450,11 @@ :min-height="70" style="width: 90%; margin: 0 auto" v-model="refundlist.refundReasonRemark" - + > --> - - - - - + + + - + + + + + + {{ nurseName }} + {{ nurseName }} + + + +
+ 确 定 + +
+ + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue index 615b9a6..396f22d 100644 --- a/src/views/system/person/index.vue +++ b/src/views/system/person/index.vue @@ -118,7 +118,7 @@ >导入 - + - - - - - - @@ -171,12 +157,6 @@ {{ scope.row.sex == "FEMALE" ? "女" : "" }} - - - @@ -243,7 +223,7 @@ :prop="`nurseStationPersonList.${index}.nurseStationId`" > {{ item.nurseStationName }} - {{ nurseStationName }}   - + + - + - + - + @@ -729,7 +744,7 @@ export default { // 是否显示弹出层 open: false, typeopen: false, - nurseStationLabelopen: false, + // nurseStationLabelopen: false, //权限查询 getListByUserquery: { pageNum: 1, @@ -831,25 +846,52 @@ export default { console.log(imgUrl); this.form.stationIntroducePcitureUrl = imgUrl; }, - delnurseStationLabelList(item) { - console.log(item); - if (item.ids && !item.id) { - if (this.looknurseStationLabel.length == 1) { - this.$message.error("最后一条不可删除"); - } else { - this.looknurseStationLabel = this.looknurseStationLabel.filter( - (e) => e.ids != item.ids - ); - } - } else if (!item.ids && item.id) { - if (this.looknurseStationLabel.length == 1) { - this.$message.error("最后一条不可删除"); - } else { - this.looknurseStationLabel = this.looknurseStationLabel.filter( - (e) => e.id != item.id - ); - } + delnurseStationLabelList(index,item) { + console.log(index,item); + console.log() + // this.looknurseStationLabel.splice(index,1) + if(this.looknurseStationLabel.length===1){ + this.looknurseStationLabel = [ + { + labelDescription: "", + sort: "", + ids: 1, + }, + ]; + }else{ + this.looknurseStationLabel.splice(index,1) } + // if (item.ids && !item.id) { + // if (this.looknurseStationLabel.length == 1) { + // // this.$message.error("最后一条不可删除"); + // this.looknurseStationLabel = [ + // { + // labelDescription: "", + // sort: "", + // ids: 1, + // }, + // ]; + // } else { + // this.looknurseStationLabel = this.looknurseStationLabel.filter( + // (e) => e.ids != item.ids + // ); + // } + // } else if (!item.ids && item.id) { + // if (this.looknurseStationLabel.length == 1) { + // // this.$message.error("最后一条不可删除"); + // this.nurseStationLabelList = [ + // { + // labelDescription: "", + // sort: "", + // ids: 1, + // }, + // ]; + // } else { + // this.looknurseStationLabel = this.looknurseStationLabel.filter( + // (e) => e.id != item.id + // ); + // } + // } console.log(this.form.nurseStationLabelList); }, addnurseStationLabelList() { @@ -867,14 +909,14 @@ export default { console.log(this.looknurseStationLabel); }, //查看标签 - looknurseStationLabelList(item) { - console.log(item); - nurseStationlabel(item.id).then((res) => { - this.looknurseStationLabel = res.rows; - this.nurseStationLabelopen = true; - console.log(this.looknurseStationLabel); - }); - }, + // looknurseStationLabelList(item) { + // console.log(item); + // nurseStationlabel(item.id).then((res) => { + // this.looknurseStationLabel = res.rows; + // this.nurseStationLabelopen = true; + // console.log(this.looknurseStationLabel); + // }); + // }, //查看类型 looktype(item) { // console.log(item); @@ -967,6 +1009,22 @@ export default { /** 搜索按钮操作 */ liststationinfo() { listStation(this.queryParams).then((response) => { + response.rows.forEach((e) => { + if (e.sysAreaVOList == []) { + } else if (e.sysAreaVOList == null) { + } else if (!e.sysAreaVOList) { + } else if (e.sysAreaVOList.length == 0) { + } else if (e.sysAreaVOList.length > 0) { + e.area = + e.sysAreaVOList[0].provinceName + + "-" + + e.sysAreaVOList[0].cityName + + "-" + + e.sysAreaVOList[0].regionName + + "-" + + e.sysAreaVOList[0].streetName; + } + }); this.stationList = response.rows; this.total = response.total; this.loading = false; diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue index 7806833..6b97ed5 100644 --- a/src/views/system/stationConsumable/index.vue +++ b/src/views/system/stationConsumable/index.vue @@ -171,7 +171,7 @@ prop="consumableCode" /> @@ -185,7 +185,9 @@ align="center" prop="consumablePrice" /> - + + + @@ -319,7 +323,12 @@ {{ item.nurseStationName }} @@ -334,7 +343,7 @@ - + @@ -625,7 +639,12 @@ - + @@ -873,8 +892,8 @@ export default { this.$refs.upload.clearFiles(); this.$alert( "
" + - response.msg + - "
", + response.msg + + "", "导入结果", { dangerouslyUseHTMLString: true } ); @@ -1105,7 +1124,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { @@ -1119,7 +1138,7 @@ export default { }, /** 导入按钮操作 */ handleport() { - this.upload.title = "用户导入"; + this.upload.title = "护理站耗材导入"; this.upload.open = true; }, diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 5e97291..f578129 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -194,17 +194,28 @@ align="center" prop="nurseItemName" /> - + /> --> - + + + + 点击添加护理项目耗材添加护理项目耗材