diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue
index 2fc125656..62527f2da 100644
--- a/yudao-ui-admin/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin/src/views/bpm/group/index.vue
@@ -45,7 +45,7 @@
- {{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}
+
diff --git a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
index fa5ba466d..4b25faf84 100644
--- a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
@@ -49,7 +49,7 @@
- {{ getDictDataLabel(DICT_TYPE.USER_TYPE, scope.row.userType) }}
+
>
@@ -90,7 +90,7 @@
{{ form.traceId }}
{{ form.applicationName }}
- {{ form.userId }} | {{ getDictDataLabel(DICT_TYPE.USER_TYPE, form.userType) }} | {{ form.userIp }} | {{ form.userAgent}}
+ {{ form.userId }} | {{ form.userIp }} | {{ form.userAgent}}
{{ form.requestMethod }} | {{ form.requestUrl }}
{{ form.requestParams }}
diff --git a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
index 8b8222075..09c0c72a6 100644
--- a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
@@ -49,7 +49,7 @@
- {{ getDictDataLabel(DICT_TYPE.USER_TYPE, scope.row.userType) }}
+
>
diff --git a/yudao-ui-admin/src/views/infra/config/index.vue b/yudao-ui-admin/src/views/infra/config/index.vue
index 2da7aee0b..2248881b7 100644
--- a/yudao-ui-admin/src/views/infra/config/index.vue
+++ b/yudao-ui-admin/src/views/infra/config/index.vue
@@ -57,7 +57,7 @@
- {{ getDictDataLabel(DICT_TYPE.INFRA_CONFIG_TYPE, scope.row.type) }}
+
diff --git a/yudao-ui-admin/src/views/infra/job/index.vue b/yudao-ui-admin/src/views/infra/job/index.vue
index 0a2a072f4..bb3b2259f 100644
--- a/yudao-ui-admin/src/views/infra/job/index.vue
+++ b/yudao-ui-admin/src/views/infra/job/index.vue
@@ -40,7 +40,7 @@
- {{ getDictDataLabel(DICT_TYPE.INFRA_JOB_STATUS, scope.row.status) }}
+
>
@@ -107,7 +107,9 @@
{{ form.id }}
{{ form.name }}
- {{ getDictDataLabel(DICT_TYPE.INFRA_JOB_STATUS, form.status) }}
+
+
+
{{ form.handlerName }}
{{ form.handlerParam }}
{{ form.cronExpression }}
diff --git a/yudao-ui-admin/src/views/infra/job/log.vue b/yudao-ui-admin/src/views/infra/job/log.vue
index 11416e8df..3f6a734fe 100644
--- a/yudao-ui-admin/src/views/infra/job/log.vue
+++ b/yudao-ui-admin/src/views/infra/job/log.vue
@@ -49,7 +49,7 @@
- {{ getDictDataLabel(DICT_TYPE.INFRA_JOB_LOG_STATUS, scope.row.status) }}
+
@@ -75,7 +75,9 @@
{{ form.executeIndex }}
{{ parseTime(form.beginTime) + ' ~ ' + parseTime(form.endTime) }}
{{ parseTime(form.duration) + ' 毫秒' }}
- {{ getDictDataLabel(DICT_TYPE.INFRA_JOB_LOG_STATUS, form.status) }}
+
+
+
{{ form.result }}
diff --git a/yudao-ui-admin/src/views/infra/redis/index.vue b/yudao-ui-admin/src/views/infra/redis/index.vue
index 5a79285cb..5699031d1 100644
--- a/yudao-ui-admin/src/views/infra/redis/index.vue
+++ b/yudao-ui-admin/src/views/infra/redis/index.vue
@@ -72,9 +72,9 @@
-
+
- {{ getDictDataLabel(DICT_TYPE.INFRA_REDIS_TIMEOUT_TYPE, scope.row.timeoutType) }}
+
({{ scope.row.timeout / 1000 }} 秒)
diff --git a/yudao-ui-admin/src/views/pay/order/index.vue b/yudao-ui-admin/src/views/pay/order/index.vue
index bd4b38e81..50aeb26e2 100755
--- a/yudao-ui-admin/src/views/pay/order/index.vue
+++ b/yudao-ui-admin/src/views/pay/order/index.vue
@@ -135,8 +135,9 @@
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_STATUS, scope.row.status) }}
+
+
@@ -145,7 +146,7 @@
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, scope.row.notifyStatus) }}
+
@@ -200,14 +201,10 @@
{{ parseFloat(orderDetail.channelFeeRate / 100, 2) }}%
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_STATUS, orderDetail.status) }}
-
+
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, orderDetail.notifyStatus) }}
-
+
{{ orderDetail.notifyUrl }}
{{ parseTime(orderDetail.createTime) }}
@@ -220,9 +217,7 @@
{{ orderDetail.channelCodeName }}
{{ orderDetail.userIp }}
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_REFUND_STATUS, orderDetail.refundStatus) }}
-
+
{{ orderDetail.refundTimes }}
@@ -341,12 +336,6 @@ export default {
// 订单退款状态字典数据集合
payOrderRefundDictDatum: getDictDatas(DICT_TYPE.PAY_ORDER_REFUND_STATUS),
orderDetail: JSON.parse(JSON.stringify(defaultOrderDetail)),
- // el-tag订单状态type值
- statusType: '',
- // el-tag订单回调通知状态type值
- notifyStatusType: '',
- // el-tag订单退款状态type值
- refundStatusType: '',
};
},
created() {
@@ -416,40 +405,6 @@ export default {
if (response.data.payOrderExtension === null) {
this.orderDetail.payOrderExtension = Object.assign(defaultOrderDetail.payOrderExtension, {});
}
- switch (this.orderDetail.status) {
- case PayOrderStatusEnum.WAITING.status:
- this.statusType = "info";
- break;
- case PayOrderStatusEnum.SUCCESS.status:
- this.statusType = "success";
- break;
- case PayOrderStatusEnum.CLOSED.status:
- this.statusType = "danger";
- break;
- }
- switch (this.orderDetail.notifyStatus) {
- case PayOrderNotifyStatusEnum.NO.status:
- this.notifyStatusType = "info";
- break;
- case PayOrderNotifyStatusEnum.SUCCESS.status:
- this.notifyStatusType = "success";
- break;
- case PayOrderNotifyStatusEnum.FAILURE.status:
- this.notifyStatusType = "danger";
- break;
- }
-
- switch (this.orderDetail.refundStatus) {
- case PayOrderRefundStatusEnum.NO.status:
- this.refundStatusType = "success";
- break;
- case PayOrderRefundStatusEnum.SOME.status:
- this.refundStatusType = "warning";
- break;
- case PayOrderRefundStatusEnum.ALL.status:
- this.refundStatusType = "danger";
- break;
- }
this.open = true;
});
diff --git a/yudao-ui-admin/src/views/pay/refund/index.vue b/yudao-ui-admin/src/views/pay/refund/index.vue
index 7aa861dfd..e2c6097e3 100755
--- a/yudao-ui-admin/src/views/pay/refund/index.vue
+++ b/yudao-ui-admin/src/views/pay/refund/index.vue
@@ -145,23 +145,17 @@
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_REFUND_STATUS, scope.row.type) }}
-
+
-
- {{ getDictDataLabel(DICT_TYPE.PAY_REFUND_ORDER_STATUS, scope.row.status) }}
-
+
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, scope.row.notifyStatus) }}
-
+
@@ -211,14 +205,12 @@
{{ parseFloat(refundDetail.refundAmount / 100).toFixed(2) }}
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_REFUND_STATUS, refundDetail.type) }}
-
+
+
+
-
- {{ getDictDataLabel(DICT_TYPE.PAY_REFUND_ORDER_STATUS, refundDetail.status) }}
-
+
{{ parseTime(refundDetail.createTime) }}
{{ parseTime(refundDetail.successTime) }}
@@ -235,9 +227,7 @@
{{ refundDetail.notifyUrl }}
-
- {{ getDictDataLabel(DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, refundDetail.notifyStatus) }}
-
+
{{ parseTime(refundDetail.notifyTime) }}
diff --git a/yudao-ui-admin/src/views/system/errorCode/index.vue b/yudao-ui-admin/src/views/system/errorCode/index.vue
index 0a9ca2a08..25443d7ee 100644
--- a/yudao-ui-admin/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin/src/views/system/errorCode/index.vue
@@ -46,11 +46,11 @@
- {{ getDictDataLabel(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE, scope.row.type) }}
+
-
+
diff --git a/yudao-ui-admin/src/views/system/loginlog/index.vue b/yudao-ui-admin/src/views/system/loginlog/index.vue
index 87c309755..8c6192721 100644
--- a/yudao-ui-admin/src/views/system/loginlog/index.vue
+++ b/yudao-ui-admin/src/views/system/loginlog/index.vue
@@ -35,7 +35,7 @@
-
+