-
+
@@ -193,6 +199,16 @@
{{ scope.row.actualRefundAmount || '无' }}
+
+
+
+ {{ scope.row.tkyy === '转卡' ? '转卡' : '退卡' }}
+
+
+
@@ -261,6 +277,7 @@
czry:undefined,
jksId:undefined,
kjblsId:undefined,
+ refundType:undefined,
},
list: [],
listLoading: true,
@@ -281,14 +298,18 @@
{ prop: 'hy', label: '会员' },
{ prop: 'hymc', label: '会员姓名' },
{ prop: 'hyzh', label: '会员账号' },
+ { prop: 'hyPhone', label: '会员电话' },
{ prop: 'jks', label: '健康师' },
{ prop: 'jkszh', label: '健康师账号' },
{ prop: 'jksxm', label: '健康师姓名' },
{ prop: 'bz', label: '备注' },
{ prop: 'tkpx', label: '退卡品项' },
+ { prop: 'tkje', label: '退卡金额' },
+ { prop: 'actualRefundAmount', label: '实际退款金额' },
+ { prop: 'tkyy', label: '类型' },
{ prop: 'tksj', label: '退卡时间' },
{ prop: 'czry', label: '退卡人' },
- ],
+ ],
mdOptions : [],
hyOptions : [],
kdhyOptions:[],
@@ -415,12 +436,18 @@
};
let query = {}
for (let key in _query) {
+ if (key === 'refundType') continue
if (Array.isArray(_query[key])) {
query[key] = _query[key].join()
} else {
query[key] = _query[key]
}
}
+ if (this.query.refundType === 'refund') {
+ query.excludeTransferCard = 1
+ } else if (this.query.refundType === 'transfer') {
+ query.onlyTransferCard = 1
+ }
request({
url: `/api/Extend/LqHytkHytk`,
method: 'GET',
@@ -496,6 +523,12 @@
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query }
+ delete query.refundType
+ if (this.query.refundType === 'refund') {
+ query.excludeTransferCard = 1
+ } else if (this.query.refundType === 'transfer') {
+ query.onlyTransferCard = 1
+ }
request({
url: `/api/Extend/LqHytkHytk/Actions/Export`,
method: 'GET',
diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/edit-dialog.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/edit-dialog.vue
index ae70f3d..bf21923 100644
--- a/antis-ncc-admin/src/views/lqReimbursementApplication/edit-dialog.vue
+++ b/antis-ncc-admin/src/views/lqReimbursementApplication/edit-dialog.vue
@@ -67,7 +67,9 @@
placeholder="请选择申请时间"
format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
+ :default-time="applicationTimeDefaultTime"
style="width: 100%"
+ @change="onApplicationTimePickerChange"
/>
@@ -275,10 +277,30 @@ export default {
initialPurchaseRecordIds: [] // 存储初始的购买记录ID列表
}
},
+ computed: {
+ applicationTimeDefaultTime() {
+ const now = new Date()
+ const hh = String(now.getHours()).padStart(2, '0')
+ const mm = String(now.getMinutes()).padStart(2, '0')
+ const ss = String(now.getSeconds()).padStart(2, '0')
+ return `${hh}:${mm}:${ss}`
+ }
+ },
created() {
this.loadStoreOptions()
},
methods: {
+ /** 日期时间选择器若落成 00:00:00,补当前时分秒,避免申请时间只剩日期 */
+ onApplicationTimePickerChange(val) {
+ if (!val && val !== 0) return
+ const date = new Date(val)
+ if (Number.isNaN(date.getTime())) return
+ if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
+ const now = new Date()
+ date.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
+ this.dataForm.applicationTime = date.getTime()
+ }
+ },
async init(id) {
this.visible = true
this.loading = true
diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/form-dialog.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/form-dialog.vue
index 8af71da..db4eadb 100644
--- a/antis-ncc-admin/src/views/lqReimbursementApplication/form-dialog.vue
+++ b/antis-ncc-admin/src/views/lqReimbursementApplication/form-dialog.vue
@@ -66,7 +66,9 @@
placeholder="请选择申请时间"
format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp"
+ :default-time="applicationTimeDefaultTime"
style="width: 100%"
+ @change="onApplicationTimePickerChange"
/>
@@ -369,11 +371,31 @@ export default {
purchaseSelection: []
}
},
+ computed: {
+ applicationTimeDefaultTime() {
+ const now = new Date()
+ const hh = String(now.getHours()).padStart(2, '0')
+ const mm = String(now.getMinutes()).padStart(2, '0')
+ const ss = String(now.getSeconds()).padStart(2, '0')
+ return `${hh}:${mm}:${ss}`
+ }
+ },
created() {
this.loadStoreOptions()
this.loadWorkflowConfigOptions()
},
methods: {
+ /** 日期时间选择器若落成 00:00:00,补当前时分秒,避免申请时间只剩日期 */
+ onApplicationTimePickerChange(val) {
+ if (!val && val !== 0) return
+ const date = new Date(val)
+ if (Number.isNaN(date.getTime())) return
+ if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
+ const now = new Date()
+ date.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), now.getMilliseconds())
+ this.dataForm.applicationTime = date.getTime()
+ }
+ },
openPurchaseDialog() {
this.showPurchaseDialog = true
this.loadPurchaseRecords()
diff --git a/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue b/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue
index 52e9569..517f767 100644
--- a/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue
+++ b/antis-ncc-admin/src/views/lqReimbursementApplication/index.vue
@@ -123,6 +123,15 @@
+
+
+
+
+ {{ scope.row.applicationNo || '无' }}
+
+
+
+
@@ -481,12 +490,14 @@ export default {
formatDateTime(dateTime) {
if (!dateTime) return '无'
const date = new Date(dateTime)
+ if (Number.isNaN(date.getTime())) return '无'
const year = date.getFullYear()
const month = String(date.getMonth() + 1).padStart(2, '0')
const day = String(date.getDate()).padStart(2, '0')
const hours = String(date.getHours()).padStart(2, '0')
const minutes = String(date.getMinutes()).padStart(2, '0')
- return `${year}-${month}-${day} ${hours}:${minutes}`
+ const seconds = String(date.getSeconds()).padStart(2, '0')
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
},
getStatusType(status) {
diff --git a/antis-ncc-admin/src/views/lqUploadRecord/index.vue b/antis-ncc-admin/src/views/lqUploadRecord/index.vue
index fc1a086..e1066bb 100644
--- a/antis-ncc-admin/src/views/lqUploadRecord/index.vue
+++ b/antis-ncc-admin/src/views/lqUploadRecord/index.vue
@@ -23,7 +23,7 @@
-
+
+
+
+
+
+
-
+
-
+
查询
重置
@@ -163,9 +168,11 @@
+
+
+
+
diff --git a/antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/index.vue b/antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/index.vue
index b611d9f..202b4ab 100644
--- a/antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/index.vue
+++ b/antis-ncc-admin/src/views/monitorCenter/duplicate-recharge-audit/index.vue
@@ -63,6 +63,16 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ {{ displayText(scope.row.exceptionTypeName || scope.row.ExceptionTypeName) }}
+
+
+
-
+
- {{ scope.row.daySequence || scope.row.DaySequence || '无' }}
- /
- {{ scope.row.dayTotalCount || scope.row.DayTotalCount || '无' }}
+ {{ formatDaySequenceDisplay(scope.row) }}
-
+
- {{ displayText(scope.row.bizId || scope.row.BizId) }}
+
+
+ {{ displayText(scope.row.bizId || scope.row.BizId) }}
+
+ {{ displayText(scope.row.bizId || scope.row.BizId) }}
+
+ 同组{{ getRelatedGroupCount(scope.row) }}笔
+
+
+
+
+
+
+ 详情
+
+ {{ relatedButtonText(scope.row) }}
+
@@ -163,6 +220,14 @@
/>
+
+