diff --git a/src/api/clue/clueRemark.js b/src/api/clue/clueRemark.js
index cb63e9f..7752708 100644
--- a/src/api/clue/clueRemark.js
+++ b/src/api/clue/clueRemark.js
@@ -35,8 +35,8 @@ export const registerClue = (data) => {
}
// 分页查询报备信息
-export const getClueRemarkPage = (params) => {
- return request.get({ url: '/admin-api/crm/clue-remark/page', params })
+export const getClueRemarkPage = (data) => {
+ return request.post({ url: '/admin-api/crm/clue-remark/page', data })
}
// 区域查询报备信息
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index bb71ec7..654e3f3 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -36,7 +36,7 @@
其他费用，应收：{{ extraTotalPrice }}
-
+
@@ -110,7 +110,8 @@ const show = ref(false)
const clueInfo = ref({})
const orderInfo = ref({
signProducts: [],
- extraPay: []
+ extraPay: [],
+ otherPay: []
})
const returnRecordList = ref([])
const aftersaleList = ref([])
@@ -127,7 +128,7 @@ const prodTotalPrice = computed(() => {
// 其他费用
const extraTotalPrice = computed(() => {
- return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+ return orderInfo.value.otherPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
})
// 额外支出
diff --git a/src/views/Clue/Order/Comp/OrderRemark.vue b/src/views/Clue/Order/Comp/OrderRemark.vue
index 9f007b8..2b4eab7 100644
--- a/src/views/Clue/Order/Comp/OrderRemark.vue
+++ b/src/views/Clue/Order/Comp/OrderRemark.vue
@@ -160,16 +160,7 @@ async function getList() {
loading.value = true
try {
let params = { ...removeNullField(searchForm.value) }
- if (params.remarkDate && params.remarkDate.length === 2) {
- params.remarkDateStart = params.remarkDate[0] + ' 00:00:00'
- params.remarkDateEnd = params.remarkDate[1] + ' 23:59:59'
- delete params.remarkDate
- }
- if (params.signDate && params.signDate.length === 2) {
- params.signDateStart = params.signDate[0] + ' 00:00:00'
- params.signDateEnd = params.signDate[1] + ' 23:59:59'
- delete params.signDate
- }
+
const data = await getClueRemarkPage(params)
tableList.value = data.list
total.value = data.total
diff --git a/src/views/Clue/Pool/ClueEnroll.vue b/src/views/Clue/Pool/ClueEnroll.vue
index 2e4b132..51a0576 100644
--- a/src/views/Clue/Pool/ClueEnroll.vue
+++ b/src/views/Clue/Pool/ClueEnroll.vue
@@ -186,13 +186,13 @@
添加其他费用
-
-
+
+
-
+
@@ -214,7 +214,7 @@
-
+
-
-
+
+
-
+
-
+
-
- 提 交
-
+
+
+ 提 交
+
+
@@ -319,6 +327,7 @@ import { getClassTypeList } from '@/api/school/class'
import { getConfigByConfigKey } from '@/api/system/set'
import { getSimpleFieldList as getClueField } from '@/api/clue/clueField'
import { getSimpleFieldList } from '@/api/clue/orderField'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
import { formatDate } from '@/utils/formatTime'
import { getDictOptions } from '@/utils/dict'
@@ -345,7 +354,7 @@ const userStore = useUserStore()
const showSchema = ref([])
const otherPayOptions = getDictOptions('other_pay_type')
-const extraPayOptions = getDictOptions('extra_pay_type')
+const extraPayOptions = ref([])
const remarkInfo = ref({})
@@ -367,14 +376,14 @@ onMounted(() => {
ClueApi.getClue(remarkInfo.value.clueId).then((data) => {
info.value = { ...data, ...data.diyParams, signInfo: remarkInfo.value.signInfo }
let str = ''
- if (!remarkInfo.value.remarkContent.includes(data.name)) {
- // 提示姓名不一致
- str += '学员姓名不一致'
- }
- if (!remarkInfo.value.remarkContent.includes(data.phone)) {
- // 提示姓名不一致
- str += '手机号不一致'
- }
+ // if (!remarkInfo.value.remarkContent.includes(data.name)) {
+ // // 提示姓名不一致
+ // str += '学员姓名不一致'
+ // }
+ // if (!remarkInfo.value.remarkContent.includes(data.phone)) {
+ // // 提示姓名不一致
+ // str += '手机号不一致'
+ // }
if (str.length) {
message.warning(`请注意：${str}`)
}
@@ -519,6 +528,9 @@ function getOptions() {
getDiyFieldList().then((data) => {
diyFieldList.value = data
})
+ getExtraFeeSimpleList().then((data) => {
+ extraPayOptions.value = data
+ })
}
function changeSchool() {