From 61850e9244065415e24b9dc6f8df785da60aaacb 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, 24 Feb 2023 15:11:57 +0800
Subject: [PATCH 01/46] =?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/certificate.js | 51 ++
src/api/system/settings.js | 44 ++
src/views/system/informationInfo/index.vue | 1 +
src/views/system/settings/index.vue | 615 +++++++++++++++++++++
4 files changed, 711 insertions(+)
create mode 100644 src/api/system/certificate.js
create mode 100644 src/api/system/settings.js
create mode 100644 src/views/system/settings/index.vue
diff --git a/src/api/system/certificate.js b/src/api/system/certificate.js
new file mode 100644
index 0000000..d28fbef
--- /dev/null
+++ b/src/api/system/certificate.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询健康咨询-科室人员资质证书信息列表
+export function listCertificate(query) {
+ return request({
+ url: '/system/certificate/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询健康咨询-科室人员信息列表
+export function listHospitalPerson(query) {
+ return request({
+ url: '/system/hospitalPerson/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询健康咨询-科室人员资质证书信息详细
+export function getCertificate(id) {
+ return request({
+ url: '/system/certificate/' + id,
+ method: 'get'
+ })
+}
+
+// 新增健康咨询-科室人员资质证书信息
+export function addCertificate(data) {
+ return request({
+ url: '/system/certificate/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改健康咨询-科室人员资质证书信息
+export function updateCertificate(data) {
+ return request({
+ url: '/system/certificate/edit',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除健康咨询-科室人员资质证书信息
+export function delCertificate(id) {
+ return request({
+ url: '/system/certificate/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/system/settings.js b/src/api/system/settings.js
new file mode 100644
index 0000000..978b2bf
--- /dev/null
+++ b/src/api/system/settings.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询泉医到家平台系统业务设置信息列表
+export function listSettings(query) {
+ return request({
+ url: '/system/settings/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询泉医到家平台系统业务设置信息详细
+export function getSettings(id) {
+ return request({
+ url: '/system/settings/' + id,
+ method: 'get'
+ })
+}
+
+// 新增泉医到家平台系统业务设置信息
+export function addSettings(data) {
+ return request({
+ url: '/system/settings/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改泉医到家平台系统业务设置信息
+export function updateSettings(data) {
+ return request({
+ url: '/system/settings/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除泉医到家平台系统业务设置信息
+export function delSettings(id) {
+ return request({
+ url: '/system/settings/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/system/informationInfo/index.vue b/src/views/system/informationInfo/index.vue
index 4656ba0..a79cf60 100644
--- a/src/views/system/informationInfo/index.vue
+++ b/src/views/system/informationInfo/index.vue
@@ -134,6 +134,7 @@
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
new file mode 100644
index 0000000..b897055
--- /dev/null
+++ b/src/views/system/settings/index.vue
@@ -0,0 +1,615 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.settingsType == "INTEGRAL_EXCHANGE_RULE" ? "积分兑换" : ""
+ }}
+ {{ scope.row.settingsType == "SIGN_IN_RULE" ? "签到" : "" }}
+ {{ scope.row.settingsType == "INTEGRAL_DEDUCTION" ? "积分抵扣" : "" }}
+ {{ scope.row.settingsType == "INVITE_FRIENDS" ? "邀请好友" : "" }}
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 7b2b17aff93ea9af62cc86d3e12bac2ac1f60a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 27 Feb 2023 11:11:13 +0800
Subject: [PATCH 02/46] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/coupon.js | 44 ++
src/views/system/coupon/index.vue | 647 ++++++++++++++++++++++++++++
src/views/system/settings/index.vue | 12 +-
3 files changed, 698 insertions(+), 5 deletions(-)
create mode 100644 src/api/system/coupon.js
create mode 100644 src/views/system/coupon/index.vue
diff --git a/src/api/system/coupon.js b/src/api/system/coupon.js
new file mode 100644
index 0000000..e369d09
--- /dev/null
+++ b/src/api/system/coupon.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询优惠券信息列表
+export function listCoupon(query) {
+ return request({
+ url: '/system/coupon/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询优惠券信息详细
+export function getCoupon(id) {
+ return request({
+ url: '/system/coupon/' + id,
+ method: 'get'
+ })
+}
+
+// 新增优惠券信息
+export function addCoupon(data) {
+ return request({
+ url: '/system/coupon/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改优惠券信息
+export function updateCoupon(data) {
+ return request({
+ url: '/system/coupon/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除优惠券信息
+export function delCoupon(id) {
+ return request({
+ url: '/system/coupon/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
new file mode 100644
index 0000000..a86af57
--- /dev/null
+++ b/src/views/system/coupon/index.vue
@@ -0,0 +1,647 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.couponType == "FULL_REDUCTION_COUPON" ? "满减券" : "" }}
+ {{ scope.row.couponType == "CASH_COUPON" ? "代金券" : "" }}
+ {{ scope.row.couponType == "EXCHANGE_COUPON" ? "兑换券" : "" }}
+ {{ scope.row.couponType == "DISCOUNT_COUPON" ? "抵扣券" : "" }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.receiveType == "NEW_PEOPLE_WELFARE" ? "新人福利" : "" }}
+ {{ scope.row.receiveType == "EVENT_GIFT" ? "活动赠送" : "" }}
+ {{ scope.row.receiveType == "CONSUME_REBATE" ? "消费返券" : "" }}
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
index b897055..d2de2af 100644
--- a/src/views/system/settings/index.vue
+++ b/src/views/system/settings/index.vue
@@ -329,12 +329,14 @@
/>
-
+ >
+
@@ -282,7 +275,7 @@
prop="groupQrCodeInfoDTOList[0].groupName"
>
{
this.$set(e, "groupQrCodeUrl", imgUrl);
});
+
},
/** 查询在线客服列表 */
getList() {
@@ -677,11 +683,29 @@ export default {
},
// 取消按钮
cancel() {
- this.open = false;
- this.reset();
- },
- editcancel() {
- this.editopen = false;
+ if (this.editopen) {
+ var obj = { pictureUrlList: [] };
+ if (this.form.groupQrCodeUrl != this.imgone) {
+ obj.pictureUrlList.push(this.form.groupQrCodeUrl);
+ }
+ console.log(obj);
+ updatePicture(obj).then((res) => {
+ this.editopen = false;
+ });
+ }
+ if (this.open) {
+ var obj = { pictureUrlList: [] };
+ if (this.form.groupQrCodeInfoDTOList) {
+ this.form.groupQrCodeInfoDTOList.forEach((e) => {
+ obj.pictureUrlList.push(e.groupQrCodeUrl);
+ });
+ }
+ updatePicture(obj).then((res) => {
+ this.open = false;
+ });
+ this.imgsurl = { pictureUrlList: [] };
+ }
+
this.reset();
},
// 表单重置
@@ -742,7 +766,9 @@ export default {
const id = row.id || this.ids;
getGroupQrCodeInfo(id).then((response) => {
this.form = response.data;
+ this.imgone = this.form.groupQrCodeUrl;
this.form.nurseStationId = response.data.nurseStationId;
+
this.editopen = true;
this.title = "修改在线客服";
});
@@ -753,6 +779,12 @@ export default {
if (valid) {
if (this.form.id != null) {
updateGroupQrCodeInfo(this.form).then((response) => {
+ if (this.form.groupQrCodeUrl != this.imgone) {
+ var obj = { pictureUrlList: [] };
+ obj.pictureUrlList.push(this.imgone);
+ updatePicture(obj).then((res) => {});
+ }
+
this.$modal.msgSuccess("修改成功");
this.editopen = false;
this.getList();
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 7098564..0b6d6e1 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -304,6 +304,10 @@ export default {
this.items.posterPictureUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items));
}
+ if(this.types == "certificateUrl"){
+ this.items.certificateUrl = response.imgUrl;
+ this.$emit("item", JSON.stringify(this.items));
+ }
this.openimg = false;
});
}
From b2019314b0367990504f74733ae10530aa1e10bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 28 Feb 2023 16:29:10 +0800
Subject: [PATCH 07/46] =?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 | 40 +++++-
src/views/system/OperateGoodsInfo/indexjs.js | 88 +++++++++----
src/views/system/coupon/index.vue | 128 +++++++++++--------
3 files changed, 175 insertions(+), 81 deletions(-)
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index 92b62f6..c761152 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -213,6 +213,7 @@
@click="clickinnerVisible"
v-if="StationName == '请选择所属护理站'"
style="
+
width: 210px;
text-align: left;
height: 36px;
@@ -344,7 +345,44 @@
>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0) {
- updatePicture(obj).then((res) => {});
+ updatePicture(obj).then((res) => { });
}
if (this.imgsurl.pictureUrlList.length > 0) {
- updatePicture(this.imgsurl).then((res) => {});
+ updatePicture(this.imgsurl).then((res) => { });
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
@@ -251,13 +264,16 @@ export default {
this.StationName = "请选择所属护理站";
this.goodDetailsLists = [{
attributeName: "",
+ integralExchangeCount:null,
+ integralExchangeFlag:null,
+ integralExchangeSill:null,
goodAttributeDetailsLists: [{
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
attributeDetailsSort: null,
- }, ],
- }, ];
+ },],
+ },];
++this.isResouceShow
},
//页面所属护理站
@@ -323,8 +339,11 @@ export default {
goodsPrice: "",
goodsStock: "",
attributeDetailsSort: null,
+ integralExchangeCount:null,
+ integralExchangeFlag:null,
+ integralExchangeSill:null,
idd: 9999999,
- }, ];
+ },];
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -363,9 +382,12 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
+ integralExchangeCount:null,
+ integralExchangeFlag:null,
+ integralExchangeSill:null,
sort: null,
idd: 9999999,
- }, ];
+ },];
this.open = true;
},
/** 修改按钮操作 */
@@ -396,6 +418,18 @@ export default {
submitForm() {
this.form.goodAttributeDetailsLists = [];
this.form.goodDetailsLists = this.goodDetailsLists;
+ console.log(this.form.goodDetailsLists)
+ if (!this.form.goodDetailsLists.integralExchangeFlag) {
+ this.form.goodDetailsLists.integralExchangeFlag = null
+ }
+ if (this.form.goodDetailsLists.integralExchangeSill=="") {
+ this.form.goodDetailsLists.integralExchangeSill = null
+
+ }
+ if (this.form.goodDetailsLists.integralExchangeCount == "") {
+ this.form.goodDetailsLists.integralExchangeCount = null
+ }
+
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.goodsInfoId != null) {
@@ -414,7 +448,7 @@ export default {
}
this.imgsurl = { pictureUrlList: [] };
if (obj.pictureUrlList.length > 0) {
- updatePicture(obj).then((res) => {});
+ updatePicture(obj).then((res) => { });
}
this.$modal.msgSuccess("修改成功");
++this.isResouceShow
@@ -423,9 +457,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) => {
this.$modal.msgSuccess("新增成功");
this.StationName = "请选择所属护理站";
@@ -440,22 +474,22 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
this.$confirm("是否确认删除订单信息的数据项?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
.then(() => {
delGoodsInfo(row.goodsInfoId).then((res) => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsPictureUrl);
if (obj.pictureUrlList.length > 0) {
- updatePicture(obj).then((res) => {});
+ updatePicture(obj).then((res) => { });
}
this.$message.success("删除成功");
this.getList();
});
})
- .catch(() => {});
+ .catch(() => { });
},
imgUrl(imgUrl) {
this.form.goodsPictureUrl = imgUrl;
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
index 5787c23..b127341 100644
--- a/src/views/system/coupon/index.vue
+++ b/src/views/system/coupon/index.vue
@@ -162,7 +162,12 @@
>
-
+
@@ -184,7 +189,6 @@
align="center"
prop="couponConsumePrice"
/>
-
{{ scope.row.receiveType == "NEW_PEOPLE_WELFARE" ? "新人福利" : "" }}
@@ -247,7 +251,7 @@
label-width="130px"
:inline="true"
>
-
+
-
+
@@ -376,6 +381,8 @@ import {
export default {
name: "Coupon",
data() {
+
+
return {
// 遮罩层
loading: true,
@@ -445,7 +452,7 @@ export default {
couponTitle: null,
couponCode: null,
couponType: null,
- couponReductionDays:null,
+ couponReductionDays: null,
couponPrice: null,
couponConsumePrice: null,
couponDescription: null,
@@ -459,54 +466,55 @@ export default {
form: {},
// 表单校验
rules: {
- couponTitle:[
- {
- required: true,
- message: "请输入优惠券名称",
- trigger: "blur"
- }
+ couponTitle: [
+ {
+ required: true,
+ message: "请输入优惠券名称",
+ trigger: "blur",
+ },
],
couponType: [
- {
- required: true,
- message: "请选择优惠券类型",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请选择优惠券类型",
+ trigger: "blur",
+ },
],
couponReductionDays: [
- {
- required: true,
- message: "请输入优惠券有效期",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请输入优惠券有效期",
+ trigger: "blur",
+ },
],
couponPrice: [
- {
- required: true,
- message: "请输入优惠券面额",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请输入优惠券面额",
+ trigger: "blur",
+ },
],
couponConsumePrice: [
- {
- required: true,
- message: "请输入优惠券面额",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请输入优惠券面额",
+ trigger: "blur",
+
+ },
],
couponDescription: [
- {
- required: true,
- message: "请输入优惠券概述",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请输入优惠券概述",
+ trigger: "blur",
+ },
],
receiveType: [
- {
- required: true,
- message: "请选择领取方式",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请选择领取方式",
+ trigger: "blur",
+ },
],
// useScope: [
// {
@@ -516,11 +524,11 @@ export default {
// }
// ],
showSort: [
- {
- required: true,
- message: "请输入显示顺序",
- trigger: "blur"
- }
+ {
+ required: true,
+ message: "请输入显示顺序",
+ trigger: "blur",
+ },
],
},
};
@@ -529,6 +537,7 @@ export default {
this.getList();
},
methods: {
+
/** 查询优惠券信息列表 */
getList() {
this.loading = true;
@@ -538,6 +547,12 @@ export default {
this.loading = false;
});
},
+ changeInput(e) {
+ if (e.target.value.indexOf('.') >= 0) {
+ e.target.value = e.target.value.substring(0, e.target.value.indexOf('.') + 3);
+ }
+ },
+
// 取消按钮
cancel() {
this.open = false;
@@ -600,6 +615,13 @@ export default {
},
/** 提交按钮 */
submitForm() {
+ if(this.form.couponPrice){
+ this.form.couponPrice = Number(this.form.couponPrice )
+ }
+ if(this.form.couponConsumePrice){
+ this.form.couponConsumePrice = Number(this.form.couponConsumePrice )
+ }
+
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
From d64676473522e6d389947c9daf56a04ebbc390f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 28 Feb 2023 16:59:51 +0800
Subject: [PATCH 08/46] =?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/certificate/index.vue | 28 ++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/views/system/certificate/index.vue b/src/views/system/certificate/index.vue
index ff5a6e7..45c3b9b 100644
--- a/src/views/system/certificate/index.vue
+++ b/src/views/system/certificate/index.vue
@@ -357,6 +357,7 @@ import {
updateCertificate,
} from "@/api/system/certificate";
import stationAcatar from "../stationAvatar/index.vue";
+import { updatePicture } from "@/api/system/station";
export default {
components: { stationAcatar },
name: "Certificate",
@@ -387,6 +388,9 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ deletNewImgs:[],
+ objitem:[],
+ imgsurl: { pictureUrlList: [] },
innerVisible: false,
hospitalPersonList: [],
total2: 0,
@@ -459,6 +463,10 @@ export default {
},
//接收图片所属的item
imgclassifyItem(item) {
+ let imgUrlData = JSON.parse(item);
+ // 存贮新上传的图片数组
+ this.deletNewImgs.push(imgUrlData.certificateUrl);
+ this.objitem.push(imgUrlData.certificateUrl);
console.log(item,'接受图片item')
let items = JSON.parse(item);
if (items.idd && !items.id) {
@@ -471,7 +479,10 @@ export default {
this.form.certificateUrl = items.certificateUrl;
}
},
- imgUrl(e) {},
+ imgUrl(imgUrl) {
+ console.log(imgUrl)
+
+ },
innerVisiblecancel() {
this.innerVisible = false;
},
@@ -514,7 +525,19 @@ export default {
},
// 取消按钮
cancel() {
- this.open = false;
+ var obj = { pictureUrlList: [] };
+ if (this.form.certificateUrlList) {
+ this.form.certificateUrlList.forEach((e) => {
+ obj.pictureUrlList.push(e.certificateUrl);
+ });
+ }
+ console.log("2222",this.deletNewImgs)
+ updatePicture({ pictureUrlList: this.deletNewImgs }).then(res => {
+ this.open = false;
+ });
+
+ this.imgsurl = { pictureUrlList: [] };
+
this.reset();
},
// 表单重置
@@ -537,6 +560,7 @@ export default {
updateBy: null,
updateTime: null,
};
+ this.deletNewImgs=[];
this.resetForm("form");
},
/** 搜索按钮操作 */
From d659517e22e429a9d912849f6b69567c7ff2ef40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Mar 2023 10:12:42 +0800
Subject: [PATCH 09/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +++-
src/views/system/OperateGoodsInfo/index.vue | 8 +++++---
src/views/system/OperateGoodsInfo/indexjs.js | 1 +
src/views/system/groupQrCodeInfo/index.vue | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.env.development b/.env.development
index e54b5c9..55f21af 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,9 @@ ENV = 'development'
# 泉医到家运营管理平台/开发环境
# VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.49:8080'
+VUE_APP_BASE_API = 'http://192.168.16.30:8088'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index c761152..c7af6a8 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -345,7 +345,7 @@
>
-
+
-
+
-
+
{
this.$set(e, "groupQrCodeUrl", imgUrl);
});
From a06efe45be34052cdcf197dc421a9e3716bc8b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Mar 2023 11:02:59 +0800
Subject: [PATCH 10/46] =?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/certificate/index.vue | 4 ++--
src/views/system/coupon/index.vue | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/system/certificate/index.vue b/src/views/system/certificate/index.vue
index 45c3b9b..396adab 100644
--- a/src/views/system/certificate/index.vue
+++ b/src/views/system/certificate/index.vue
@@ -83,7 +83,7 @@
>删除
-
+
@@ -282,6 +283,7 @@
Date: Wed, 1 Mar 2023 15:19:52 +0800
Subject: [PATCH 11/46] =?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/groupQrCodeInfo/index.vue | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/system/groupQrCodeInfo/index.vue b/src/views/system/groupQrCodeInfo/index.vue
index f9d9163..0d8153f 100644
--- a/src/views/system/groupQrCodeInfo/index.vue
+++ b/src/views/system/groupQrCodeInfo/index.vue
@@ -213,8 +213,6 @@
>
{
+ console.log(response.data)
this.form = response.data;
+
+ // this.form.nurseStationName = item.nurseStationName;
+ // this.form.nurseStationId = item.id;
this.imgone = this.form.groupQrCodeUrl;
- this.form.nurseStationId = response.data.nurseStationId;
-
+
this.editopen = true;
this.title = "修改在线客服";
});
From 622a50df62739cb3c94ff84fdbb6ace5bd001e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Mar 2023 16:50:59 +0800
Subject: [PATCH 12/46] =?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/certificate/index.vue | 6 +--
src/views/system/coupon/index.vue | 61 ++++++++++++++++++--------
2 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/src/views/system/certificate/index.vue b/src/views/system/certificate/index.vue
index 396adab..704f40f 100644
--- a/src/views/system/certificate/index.vue
+++ b/src/views/system/certificate/index.vue
@@ -596,15 +596,15 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
- this.reset();
+ this.open = true;
const hospitalPersonId = row.hospitalPersonId || this.hospitalPersonIds;
- // const id = row.id || this.ids;
getCertificate(hospitalPersonId).then((response) => {
console.log(response,'打印返回的值')
this.form = response.data;
- this.open = true;
+
this.title = "修改健康咨询-科室人员资质证书信息";
});
+ this.reset();
},
/** 提交按钮 */
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
index 5e2391f..8cc112e 100644
--- a/src/views/system/coupon/index.vue
+++ b/src/views/system/coupon/index.vue
@@ -259,7 +259,7 @@
style="width: 220px"
/>
-
+
1 && len1 == 0 && len2 != ".") {
+ str = str.substr(1, 1);
+ }
+ //第一位不能是.
+ if (len1 == ".") {
+ str = "";
+ }
+ //限制只能输入一个小数点
+ if (str.indexOf(".") != -1) {
+ const str_ = str.substr(str.indexOf(".") + 1);
+ if (str_.indexOf(".") != -1) {
+ str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
+ }
+ }
+ //正则替换
+ str = str.replace(/[^\d^.\\ .]+/g, ""); // 保留数字和小数点
+ str = str.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); // 小数点后只能输两位
+ str = str.replace(/^(-)*(\d+)\.(\d\d).*$/, "$1$2.$3");
+ return str;
+ },
+
/** 查询优惠券信息列表 */
getList() {
this.loading = true;
@@ -550,10 +572,13 @@ export default {
});
},
changeInput(e) {
- if (e.target.value.indexOf('.') >= 0) {
- e.target.value = e.target.value.substring(0, e.target.value.indexOf('.') + 3);
- }
- },
+ if (e.target.value.indexOf(".") >= 0) {
+ e.target.value = e.target.value.substring(
+ 0,
+ e.target.value.indexOf(".") + 3
+ );
+ }
+ },
// 取消按钮
cancel() {
@@ -617,13 +642,13 @@ export default {
},
/** 提交按钮 */
submitForm() {
- if(this.form.couponPrice){
- this.form.couponPrice = Number(this.form.couponPrice )
+ if (this.form.couponPrice) {
+ this.form.couponPrice = Number(this.form.couponPrice);
}
- if(this.form.couponConsumePrice){
- this.form.couponConsumePrice = Number(this.form.couponConsumePrice )
+ if (this.form.couponConsumePrice) {
+ this.form.couponConsumePrice = Number(this.form.couponConsumePrice);
}
-
+
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
From 8d67cac8d6b6eaa724fc0da6e733117d0744caef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Mar 2023 17:47:29 +0800
Subject: [PATCH 13/46] =?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/coupon/index.vue | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
index 8cc112e..b5e96c0 100644
--- a/src/views/system/coupon/index.vue
+++ b/src/views/system/coupon/index.vue
@@ -281,9 +281,9 @@
= 0) {
+ checkPlan = checkPlan
+ .replace(/^()*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+ }
+ this.form.couponConsumePrice = checkPlan
+
+ },
+
oninput(num) {
let str = num;
const len1 = str.substr(0, 1);
From 7aa0c098ebd1d4f2f9a270f2746923811a229ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Mar 2023 10:57:39 +0800
Subject: [PATCH 14/46] =?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/groupQrCodeInfo/index.vue | 40 +++++++++++-----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/system/groupQrCodeInfo/index.vue b/src/views/system/groupQrCodeInfo/index.vue
index 0d8153f..e7cddc7 100644
--- a/src/views/system/groupQrCodeInfo/index.vue
+++ b/src/views/system/groupQrCodeInfo/index.vue
@@ -318,7 +318,7 @@
{{ item.nurseStationName }}
@@ -527,7 +527,7 @@ export default {
groupSort: null,
},
nurseStationshow: false,
- stationidIndex:'',
+ stationidIndex: "",
editopen: false,
imgsurl: { pictureUrlList: [] },
imgone: "",
@@ -613,18 +613,20 @@ export default {
this.getList();
},
methods: {
- //护理站页面 =》选择护理站
+ //护理站页面 =》选择护理站
choicestationid(item) {
- this.stationidIndex = item.id
+ this.stationidIndex = item.id;
if (this.editopen) {
this.form.nurseStationName = item.nurseStationName;
this.form.nurseStationId = item.id;
- }
- else if (this.open) {
- this.form.groupQrCodeInfoDTOList[0].nurseStationId = item.id;
+ } else if (this.open) {
+ // this.form.groupQrCodeInfoDTOList[0].nurseStationId = item.id;
this.form.groupQrCodeInfoDTOList[0].nurseStationName =
item.nurseStationName;
+ this.form.nurseStationId = item.id;
+
}
+
this.nurseStationshow = false;
this.stationcancel();
},
@@ -641,12 +643,11 @@ export default {
this.nurseStationshow = false;
},
//所属护理站页面
- ParamsStation() {
+ ParamsStation(item) {
+ console.log(item,this.form.nurseStationId,'打印this.queryParams.nurseStationId')
this.info();
- // console.log( this.form.nurseStationId,'打印 this.nurseStationId')
- this.stationidIndex = this.form.nurseStationId;
+ this.stationidIndex = this.form.nurseStationId ;
this.nurseStationshow = true;
-
},
//护理站list
info() {
@@ -656,17 +657,16 @@ export default {
});
},
// 设置修改的图片地址
- setUpdateImgUrl(e){
- this.form.groupQrCodeUrl= e;
+ setUpdateImgUrl(e) {
+ this.form.groupQrCodeUrl = e;
console.log(this.form);
},
imgUrl(imgUrl) {
- console.log(this.form)
+ console.log(this.form);
// this.$set(this.form,"groupQrCodeInfoDTOList",[])
this.form.groupQrCodeInfoDTOList.forEach((e) => {
this.$set(e, "groupQrCodeUrl", imgUrl);
});
-
},
/** 查询在线客服列表 */
getList() {
@@ -758,17 +758,17 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
- // this.form.nurseStationId = response.data.nurseStationId;
+ // this.form.nurseStationId = response.data.nurseStationId;
this.reset();
const id = row.id || this.ids;
getGroupQrCodeInfo(id).then((response) => {
- console.log(response.data)
+ console.log(response.data);
this.form = response.data;
-
+
// this.form.nurseStationName = item.nurseStationName;
// this.form.nurseStationId = item.id;
this.imgone = this.form.groupQrCodeUrl;
-
+
this.editopen = true;
this.title = "修改在线客服";
});
From 13d7808893b07a94a2118c5a54b07be1dcf558df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Mar 2023 14:29:07 +0800
Subject: [PATCH 15/46] =?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/certificate/index.vue | 14 +---
src/views/system/coupon/index.vue | 67 +------------------
src/views/system/hospitalDepartment/index.vue | 16 ++---
3 files changed, 12 insertions(+), 85 deletions(-)
diff --git a/src/views/system/certificate/index.vue b/src/views/system/certificate/index.vue
index 704f40f..5e25cae 100644
--- a/src/views/system/certificate/index.vue
+++ b/src/views/system/certificate/index.vue
@@ -8,14 +8,6 @@
v-show="showSearch"
label-width="68px"
>
-
-
-
-
-
-
+
Date: Thu, 2 Mar 2023 14:56:07 +0800
Subject: [PATCH 16/46] =?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/hospitalPerson/index.vue | 42 ++++++++++++++++-------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue
index e43bc03..9a0928d 100644
--- a/src/views/system/hospitalPerson/index.vue
+++ b/src/views/system/hospitalPerson/index.vue
@@ -253,7 +253,7 @@
:rules="rules.hospitalPersonInfoList.personName"
:prop="`hospitalPersonInfoList.${index}.personName`"
>
-
+
@@ -280,7 +281,7 @@
:rules="rules.hospitalPersonInfoList.cardNo"
:prop="`hospitalPersonInfoList.${index}.cardNo`"
>
-
+
@@ -316,7 +318,10 @@
:rules="rules.hospitalPersonInfoList.personSort"
:prop="`hospitalPersonInfoList.${index}.personSort`"
>
-
+
-
-
+
+
{{ form.hospitalName }}
-
-
-
-
+
-
+
@@ -1243,11 +1259,11 @@ export default {
// }
this.innerVisibledepartmentxg = false;
},
-//医院关闭
+ //医院关闭
innerVisiblecancel() {
this.innerVisible = false;
},
-
+
innerVisiblecancelxg() {
this.innerVisiblexg = false;
},
@@ -1314,7 +1330,7 @@ export default {
this.innerVisibledepartment = true;
},
// 修改科室按钮
- clickdepartmentlist(){
+ clickdepartmentlist() {
this.departmentList();
// this.form.departmentId = item.departmentId;
this.innerVisibledepartmentxg = true;
From 4452b27999678fd67c8e975d23b3a38e9ce511ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Mar 2023 15:04:23 +0800
Subject: [PATCH 17/46] =?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/hospital/index.vue | 4 ++--
src/views/system/hospitalDepartment/index.vue | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue
index 6834fdc..491fb7e 100644
--- a/src/views/system/hospital/index.vue
+++ b/src/views/system/hospital/index.vue
@@ -128,10 +128,10 @@
-
+
-
+
Date: Thu, 2 Mar 2023 16:06:39 +0800
Subject: [PATCH 18/46] =?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/settings/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
index d2de2af..cc44fb3 100644
--- a/src/views/system/settings/index.vue
+++ b/src/views/system/settings/index.vue
@@ -227,7 +227,7 @@
Date: Thu, 2 Mar 2023 16:38:07 +0800
Subject: [PATCH 19/46] =?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/settings/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
index cc44fb3..54040d1 100644
--- a/src/views/system/settings/index.vue
+++ b/src/views/system/settings/index.vue
@@ -185,11 +185,11 @@
align="center"
prop="creditAmount"
/>
-
+ /> -->
-
-
+ -->
Date: Thu, 2 Mar 2023 17:29:19 +0800
Subject: [PATCH 20/46] =?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/goodsOrder/index.vue | 49 +++++++++++-
src/views/system/goodsOrder/indexjs.js | 101 ++++++++++++++-----------
2 files changed, 104 insertions(+), 46 deletions(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index d1f9a3a..5bc97c6 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -63,7 +63,7 @@
:data="goodsOrderList"
@selection-change="handleSelectionChange"
>
-
+
-
+
+
+
+ {{ scope.row.orderType == "INTEGRAL_EXCHANGE" ? "积分兑换" : "" }}
+ {{ scope.row.orderType == "DIRECT_BUY" ? "直接购买" : "" }}
+ {{ scope.row.orderType == "HEALTH_CONSULTATION" ? "健康咨询" : "" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
this.download(
"system/goodsOrder/export", {
- ...this.queryParams,
- },
+ ...this.queryParams,
+ },
`goodsOrder_${new Date().getTime()}.xlsx`
);
},
From db957bddce1c70c5d42a57f79301d682e8277721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Mar 2023 17:48:00 +0800
Subject: [PATCH 21/46] =?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/goodsOrder/index.vue | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 5bc97c6..74075fd 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -270,6 +270,8 @@
style="width: 240px"
/>
+
+
+
+
+
Date: Thu, 2 Mar 2023 17:53:24 +0800
Subject: [PATCH 22/46] =?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/goodsOrder/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 74075fd..362ca25 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -81,7 +81,7 @@
@@ -275,7 +275,7 @@
@@ -552,7 +552,7 @@
Date: Fri, 3 Mar 2023 11:26:04 +0800
Subject: [PATCH 23/46] =?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/goodsOrder/index.vue | 21 +++++++++++++++++++++
src/views/system/goodsOrder/indexjs.js | 1 +
2 files changed, 22 insertions(+)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 362ca25..e2179e1 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -295,6 +295,27 @@
style="width: 240px"
/>
+
+
+
+
+
+
+
+
+
Date: Fri, 3 Mar 2023 11:56:29 +0800
Subject: [PATCH 24/46] =?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/goodsOrder/index.vue | 45 +++++++++++++++++----------
1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index e2179e1..d3d5af4 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -263,15 +263,6 @@
style="width: 240px"
/>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Date: Fri, 3 Mar 2023 14:18:22 +0800
Subject: [PATCH 25/46] =?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/settings/index.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue
index 54040d1..0dff2da 100644
--- a/src/views/system/settings/index.vue
+++ b/src/views/system/settings/index.vue
@@ -165,9 +165,9 @@
/> -->
- {{
+
{{ scope.row.settingsType == "SIGN_IN_RULE" ? "签到" : "" }}
{{ scope.row.settingsType == "INTEGRAL_DEDUCTION" ? "积分抵扣" : "" }}
{{ scope.row.settingsType == "INVITE_FRIENDS" ? "邀请好友" : "" }}
@@ -363,10 +363,10 @@ export default {
return {
imgsurl: { pictureUrlList: [] },
options: [
- {
- value: "INTEGRAL_EXCHANGE_RULE",
- label: "积分兑换",
- },
+ // {
+ // value: "INTEGRAL_EXCHANGE_RULE",
+ // label: "积分兑换",
+ // },
{
value: "SIGN_IN_RULE",
label: "签到",
From 7e91eac02d576c04505d8c477b8dae7b28755dc7 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, 3 Mar 2023 15:24:19 +0800
Subject: [PATCH 26/46] =?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/patientArchives/index.vue | 63 ++++++++++++++++++----
1 file changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/views/system/patientArchives/index.vue b/src/views/system/patientArchives/index.vue
index 5162d49..5b1f063 100644
--- a/src/views/system/patientArchives/index.vue
+++ b/src/views/system/patientArchives/index.vue
@@ -231,7 +231,7 @@
label-width="110px"
:inline="true"
>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- console.log(res)
+ console.log(res);
const params = {
id,
- password: res.value
- }
+ password: res.value,
+ };
updatePassword(params).then((response) => {
this.$modal.msgSuccess("修改成功,新密码是:" + res.value);
});
})
- .catch(() => { });
+ .catch(() => {});
},
// 查询省事件
province(item) {
@@ -858,7 +901,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
From fe0105be15127bf8db22fe628e12955ada5732dc 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, 3 Mar 2023 17:23:31 +0800
Subject: [PATCH 27/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/views/system/OperateGoodsInfo/index.vue | 1 +
src/views/system/OperateGoodsInfo/indexjs.js | 39 ++++++++++++--------
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/.env.development b/.env.development
index 55f21af..50542d6 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
# 泉医到家运营管理平台/开发环境
# VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.30:8088'
+VUE_APP_BASE_API = 'http://192.168.16.49:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index c7af6a8..7a1a8b5 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -351,6 +351,7 @@
v-model.number="scope.row.integralExchangeFlag"
placeholder="请选择积分兑换标识"
clearable
+ @change="changeExchangeFlag(scope.row)"
>
{
if (valid) {
if (this.form.goodsInfoId != null) {
From 1c9b729226a276285e20f43ae43e3121c3b9d486 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, 3 Mar 2023 17:48:32 +0800
Subject: [PATCH 28/46] =?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/goodsOrder/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index d3d5af4..0c37b39 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -300,7 +300,7 @@
style="width: 240px"
/>
-
+
Date: Mon, 6 Mar 2023 09:57:38 +0800
Subject: [PATCH 29/46] =?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 | 8 ++++----
src/views/system/OperateGoodsInfo/indexjs.js | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index 7a1a8b5..781c0fe 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -362,24 +362,24 @@
-
+
-
+
diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js
index d0007b1..b596c5c 100644
--- a/src/views/system/OperateGoodsInfo/indexjs.js
+++ b/src/views/system/OperateGoodsInfo/indexjs.js
@@ -57,10 +57,10 @@ export default {
value: "BUSINESS",
label: "买卖",
},
- {
- value: "LEASE",
- label: "租赁",
- },
+ // {
+ // value: "LEASE",
+ // label: "租赁",
+ // },
],
options: [{
value: 0,
From 5d28818c3994215a261792a0ede850bb1b534b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 6 Mar 2023 10:04:33 +0800
Subject: [PATCH 30/46] =?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/coupon/index.vue | 253 +++++++++++++-----------------
1 file changed, 106 insertions(+), 147 deletions(-)
diff --git a/src/views/system/coupon/index.vue b/src/views/system/coupon/index.vue
index c8dbbbd..ada2d14 100644
--- a/src/views/system/coupon/index.vue
+++ b/src/views/system/coupon/index.vue
@@ -24,18 +24,10 @@
@keyup.enter.native="handleQuery"
/>
-
+
- 搜索
- 重置
+ 搜索
+ 重置
@@ -48,8 +40,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:coupon:add']"
- >新增
+ >新增
修改
+ >修改
删除
+ >删除
-
+ -->
+
-
+
-
+
@@ -115,17 +92,9 @@
-
+
-
+
{{ scope.row.receiveType == "NEW_PEOPLE_WELFARE" ? "新人福利" : "" }}
@@ -134,7 +103,7 @@
+ -->
+ -->
-
+
修改
+ >修改
删除
+ >删除
@@ -180,14 +143,14 @@
/>
-
-
+
+
-
+ >
@@ -254,8 +214,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
-
+ >
@@ -282,7 +241,7 @@
- -->
+ -->
+ -->
-
+
-
+
-
+
-
+
-
+ >
-
+
-
-
+
+
+
+
-
+
From e81a6e0b80c755ab6f254eb4f72ffcbdeecdd8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 6 Mar 2023 17:23:10 +0800
Subject: [PATCH 46/46] =?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/goodsOrder/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index a3e04c8..8253780 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -65,7 +65,7 @@
交易完成
退款中
待退货
- 退款成功
+ 已退款
已退货