diff --git a/src/api/system/area.js b/src/api/system/area.js new file mode 100644 index 0000000..fa736d6 --- /dev/null +++ b/src/api/system/area.js @@ -0,0 +1,79 @@ +import request from '@/utils/request' + + +// 查询区域列表(不分页) 点击push +export function selectAreaList(areaName, parentCode) { + return request({ + url: `/system/area/selectAreaList?areaName=${areaName}&parentCode=${parentCode}`, + method: 'get', + }) +} + +//搜索 +// 查询区域列表(不分页) +export function selectAreaListquery(areaName) { + return request({ + url: `/system/area/selectAreaList?areaName=${areaName}`, + method: 'get', + }) +} + +//开局 +// 查询区域列表(不分页) +export function selectAreaListinfo(areaName) { + return request({ + url: `/system/area/selectAreaList?areaLevel=${areaName}`, + method: 'get', + }) +} + +// 查询区域列表 +export function listArea(query) { + return request({ + url: '/system/area/list', + method: 'get', + params: query + }) +} + +// 查询区域详细 +export function getArea(id) { + return request({ + url: '/system/area/' + id, + method: 'get' + }) +} + +// 新增区域 +export function addArea(data) { + return request({ + url: '/system/area/add', + method: 'post', + data: data + }) +} + +// 修改区域 +export function updateArea(data) { + return request({ + url: '/system/area/edit', + method: 'POST', + data: data + }) +} + +// 删除区域 +export function delArea(id) { + return request({ + url: '/system/area/' + id, + method: 'POST' + }) +} + +//边远地区 +export function updateRemoteSigns(id, remoteSigns) { + return request({ + url: `/system/area/updateRemoteSigns?id=${id}&remoteSigns=${remoteSigns}`, + method: 'POST' + }) +} \ No newline at end of file diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue index 999364b..c8b3c8a 100644 --- a/src/views/system/OperateGoodsInfo/index.vue +++ b/src/views/system/OperateGoodsInfo/index.vue @@ -122,7 +122,6 @@ align="center" prop="goodsCategoryName" /> - - {{ StationName }} + + + - + @@ -356,7 +362,7 @@ style="margin-top: 20px" > 0) { updatePicture(this.imgsurl).then((res) => {}); - } - this.imgsurl={pictureUrlList:[]}; + } + this.imgsurl = { pictureUrlList: [] }; this.open = false; this.reset(); this.StationName = "请选择所属护理站"; @@ -242,7 +244,7 @@ export default { attributePitureUrl: "", goodsPrice: "", goodsStock: "", - sort: "", + attributeDetailsSort: null, }, ], }, ]; }, @@ -308,7 +310,7 @@ export default { attributePitureUrl: "", goodsPrice: "", goodsStock: "", - sort: "", + attributeDetailsSort: null, ids: 9999999, }, ]; this.resetForm("form"); @@ -350,7 +352,7 @@ export default { attributePitureUrl: "", goodsPrice: "", goodsStock: "", - sort: "", + sort: null, ids: 9999999, }, ]; this.open = true; @@ -387,13 +389,17 @@ export default { this.form.id = this.form.goodsInfoId; this.form.goodDetailsLists.forEach(e => { e.goodsPrice = Number(e.goodsPrice) + if (e.attributeDetailsSort == '') { + e.attributeDetailsSort = null + } + // e.sort = e.attributeDetailsSort }) updateGoodsInfo(this.form).then((response) => { var obj = { pictureUrlList: [] }; if (this.imgone != this.form.goodsPictureUrl) { obj.pictureUrlList.push(this.imgone); } - this.imgsurl={pictureUrlList:[]}; + this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { updatePicture(obj).then((res) => { console.log(res); @@ -406,9 +412,9 @@ export default { }); } else { this.form.goodDetailsLists.forEach(e => { - e.goodsPrice = Number(e.goodsPrice) - }) - // this.nurseStationId=this.form.nurseStationId + e.goodsPrice = Number(e.goodsPrice) + }) + // this.nurseStationId=this.form.nurseStationId addGoodsInfo(this.form).then((response) => { console.log(this.form); this.$modal.msgSuccess("新增成功"); @@ -482,4 +488,4 @@ export default { }); }, }, -}; +}; \ No newline at end of file diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue new file mode 100644 index 0000000..a088609 --- /dev/null +++ b/src/views/system/area/index.vue @@ -0,0 +1,605 @@ + + + diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index 10d6c0b..d1f9a3a 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -36,6 +36,14 @@ + + + + - +