diff --git a/src/api/teamaster_account_log.ts b/src/api/teamaster_account_log.ts
index 099337c..4282bbf 100644
--- a/src/api/teamaster_account_log.ts
+++ b/src/api/teamaster_account_log.ts
@@ -23,4 +23,9 @@ export function apiTeamasterAccountLogDelete(params: any) {
// 茶艺师财务明细详情
export function apiTeamasterAccountLogDetail(params: any) {
return request.get({ url: '/teamaster_account_log/detail', params })
-}
\ No newline at end of file
+}
+
+// 茶艺师财务明细统计
+export function apiTeamasterAccountLogStats(params: any) {
+ return request.get({ url: '/teamasterAccountLog/statistics', params })
+}
diff --git a/src/views/finance/tea_room_record.vue b/src/views/finance/tea_room_record.vue
index 8d658f6..e75d368 100644
--- a/src/views/finance/tea_room_record.vue
+++ b/src/views/finance/tea_room_record.vue
@@ -66,7 +66,7 @@
-->
- 查询
+ 查询
重置
diff --git a/src/views/finance/teamaster_record.vue b/src/views/finance/teamaster_record.vue
index b373117..d347fbb 100644
--- a/src/views/finance/teamaster_record.vue
+++ b/src/views/finance/teamaster_record.vue
@@ -4,15 +4,15 @@
茶艺师提现总金额 (元)
-
1
+
{{ total.tixian }}
包间预定 (元)
-
2
+
{{ total.yueding }}
包间续订 (元)
-
3
+
{{ total.xuding }}
@@ -33,14 +33,18 @@
:value="item.value" />
-
+
+
+
+
- 查询
+ 查询
重置
@@ -65,7 +69,7 @@
-
+
@@ -89,7 +93,7 @@
diff --git a/src/views/tea_store/edit.vue b/src/views/tea_store/edit.vue
index 5d991d3..bb24cd6 100644
--- a/src/views/tea_store/edit.vue
+++ b/src/views/tea_store/edit.vue
@@ -75,8 +75,8 @@
-->
-
-
+
+
@@ -85,8 +85,8 @@
-
-
+
+
@@ -97,8 +97,8 @@
-
-
+
+
@@ -320,6 +320,17 @@ const setFormData = async (data: Record) => {
formData[key] = data[key]
}
}
+
+ if (Number(formData.lock_no) == 0) {
+ formData.lock_no = ''
+ }
+
+ if (formData.store_user_id) {
+ let arr = formData.store_user_id.split(',')
+ //@ts-ignore
+ formData.store_user_id = arr.map((item: string) => Number(item))
+ }
+ addressSelections.value = [String(formData.province_id), String(formData.city_id), String(formData.district_id)]
}
const getDetail = async (row: Record) => {
@@ -332,7 +343,7 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
- // await formRef.value?.validate()
+ await formRef.value?.validate()
let data = { ...formData }
if (Array.isArray(data.store_user_id)) {
data.store_user_id = data.store_user_id.join(',')
diff --git a/src/views/teamaster_real/edit.vue b/src/views/teamaster_real/edit.vue
index 4cb4ab4..823ee23 100644
--- a/src/views/teamaster_real/edit.vue
+++ b/src/views/teamaster_real/edit.vue
@@ -77,7 +77,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiTeamasterRealAdd, apiTeamasterRealEdit, apiTeamasterRealDetail } from '@/api/teamaster_real'
-import { timeFormat } from '@/utils/util'
+import { timeFormat, removeImageUrlPrefix } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
@@ -187,7 +187,21 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
- const data = { ...formData, gender: formData.gender.join(",") }
+ let data = { ...formData, gender: formData.gender.join(",") }
+ data.avatar = removeImageUrlPrefix(data.avatar)
+
+ if (data.certificate && data.certificate[0]) {
+ data.certificate = removeImageUrlPrefix(data.certificate[0])
+ }
+
+ if (data.certificate && data.certificate[1]) {
+ data.certificate = removeImageUrlPrefix(data.certificate[1])
+ }
+
+ if (data.license_img) {
+ data.license_img = removeImageUrlPrefix(data.license_img)
+ }
+
mode.value == 'edit'
? await apiTeamasterRealEdit(data)
: await apiTeamasterRealAdd(data)
diff --git a/src/views/teamaster_real/index.vue b/src/views/teamaster_real/index.vue
index e31442d..6c5a7a8 100644
--- a/src/views/teamaster_real/index.vue
+++ b/src/views/teamaster_real/index.vue
@@ -46,7 +46,7 @@
-
+