From c9c1b6a7bd34e8247a5fbd887b2e56302fb0558a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 30 Dec 2022 14:01:41 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/stationAvatar/index.vue | 28 ++++++++++++++----------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 19235f7..185d0d5 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -217,19 +217,23 @@ export default {
// 上传图片
uploadImg() {
let formData = new FormData();
- formData.append("file", this.previews.data);
- formData.append("type", this.types);
- updateNurseStationHeads(formData).then((response) => {
- this.options.img = baseurl + response.imgUrl;
- this.$emit("imgUrl", response.imgUrl);
- console.log(this.items);
- console.log(this.types);
- if (this.types == "attributePitureUrl") {
- this.items.attributePitureUrl = response.imgUrl;
- this.$emit("item", JSON.stringify(this.items));
- }
+ if (this.previews.data) {
+ formData.append("file", this.previews.data);
+ formData.append("type", this.types);
+ updateNurseStationHeads(formData).then((response) => {
+ this.options.img = baseurl + response.imgUrl;
+ this.$emit("imgUrl", response.imgUrl);
+ console.log(this.items);
+ console.log(this.types);
+ if (this.types == "attributePitureUrl") {
+ this.items.attributePitureUrl = response.imgUrl;
+ this.$emit("item", JSON.stringify(this.items));
+ }
+ this.openimg = false;
+ });
+ } else {
this.openimg = false;
- });
+ }
},
// 实时预览
realTime(data) {
From dd5ff2ec040c2197fd24608c82824786f539c209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 30 Dec 2022 14:10:25 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/stationAvatar/index.vue | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 185d0d5..b92f238 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -72,7 +72,7 @@
-
+
+
提 交
@@ -223,8 +223,6 @@ export default {
updateNurseStationHeads(formData).then((response) => {
this.options.img = baseurl + response.imgUrl;
this.$emit("imgUrl", response.imgUrl);
- console.log(this.items);
- console.log(this.types);
if (this.types == "attributePitureUrl") {
this.items.attributePitureUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items));
From 7c96ddade7ecd7647ffdbf5bf9915b7a28575d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 9 Jan 2023 10:28:05 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/OperateGoodsInfo/index.vue | 19 +++++---
src/views/system/OperateGoodsInfo/indexjs.js | 50 ++++++++++----------
2 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index d6f7b1f..5ddfd01 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -214,7 +214,7 @@
@click="clickinnerVisible"
v-if="StationName == '请选择所属护理站'"
style="
- width: 200px;
+ width: 210px;
text-align: left;
height: 36px;
color: #c0c4cc;
@@ -227,10 +227,9 @@
@click="clickinnerVisible"
v-else
style="
- width: 200px;
+ width: 210px;
text-align: left;
height: 36px;
- padding-left: -10px;
overflow: hidden;
"
>{{ StationName }}
+
+
+
-
+
0) {
updatePicture(this.imgsurl).then((res) => {});
- }
- this.imgsurl={pictureUrlList:[]};
+ }
+ this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
this.StationName = "请选择所属护理站";
@@ -393,7 +395,7 @@ export default {
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 +408,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 +484,4 @@ export default {
});
},
},
-};
+};
\ No newline at end of file
From 62a9cb31088b3c53853245c6391229603e21a8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 9 Jan 2023 15:19:45 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/area.js | 79 +++
src/views/system/OperateGoodsInfo/index.vue | 7 +-
src/views/system/OperateGoodsInfo/indexjs.js | 12 +-
src/views/system/area/index.vue | 534 +++++++++++++++++++
4 files changed, 624 insertions(+), 8 deletions(-)
create mode 100644 src/api/system/area.js
create mode 100644 src/views/system/area/index.vue
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 5ddfd01..f117421 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -122,7 +122,6 @@
align="center"
prop="goodsCategoryName"
/>
-
{{ scope.row.goodsPurpose == "BUSINESS" ? "买卖" : "" }}
@@ -151,7 +150,6 @@
-
@@ -326,8 +324,9 @@
diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js
index a48b806..42dd5af 100644
--- a/src/views/system/OperateGoodsInfo/indexjs.js
+++ b/src/views/system/OperateGoodsInfo/indexjs.js
@@ -191,7 +191,7 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
- sort: "",
+ attributeDetailsSort: null,
ids: this.ids,
};
this.goodDetailsLists.push(obj);
@@ -244,7 +244,7 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
- sort: "",
+ attributeDetailsSort: null,
}, ],
}, ];
},
@@ -310,7 +310,7 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
- sort: "",
+ attributeDetailsSort: null,
ids: 9999999,
}, ];
this.resetForm("form");
@@ -352,7 +352,7 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
- sort: "",
+ sort: null,
ids: 9999999,
}, ];
this.open = true;
@@ -389,6 +389,10 @@ 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: [] };
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
new file mode 100644
index 0000000..24fef2d
--- /dev/null
+++ b/src/views/system/area/index.vue
@@ -0,0 +1,534 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+