增加h5充值订单时间 && 增加tags标签

src/api/path/lotCard.api.js

@@ -86,12 +86,9 @@ export function OffSIMCard(data) {
 // 操作日志
 export function OperationRecord(data) {
     return service.post("/logs/logCardOperation", data);
-<<<<<<< HEAD
-=======
 }
 
 // 查询当前卡下的充值记录
 export function getOrderCard(data){
     return service.post("/admin/sim/payOrders", data);
->>>>>>> dev
 }

src/views/financialManagement/appPuy/index.vue

@@ -14,6 +14,9 @@
             <template #status="{ record }">
                 <div>{{ handleStatusTxt(record.status) }}</div>
             </template>
+            <template #puyStatus="{ record }">
+                <a-tag :color="record.payStatus=='SUCCESS'?'#00b42a':''">{{ record .puyStatus}}</a-tag>
+            </template>
             <template #image="{ record }">
                 <a-image width="60" height="60" :src="record.certificateImg" :preview-props="{
                     actionsLayout: ['rotateRight', 'zoomIn', 'zoomOut'],
@@ -72,9 +75,10 @@ const getTopUpRecordListFc = async (item) => {
     let puyType = await Getdictionary('puyType')
     res = await getAdiroePuyList(param)
     tableData.value = (res.data?.records || []).map(res => {
-        res.payStatus = puyType.filter(item => item.value == res.payStatus)[0]?.label
+        res.puyStatus = puyType.filter(item => item.value == res.payStatus)[0]?.label
         return res
     })
+
     pagination.value.total = res.data.total;
 };
 

src/views/financialManagement/config.js

@@ -128,7 +128,7 @@ export const UserAdiroColumns = [
   },
   {
     title: "支付状态",
-    dataIndex: "payStatus",
+    slotName: "puyStatus",
     align: "center",
     ellipsis: true,
     tooltip: true,
@@ -154,6 +154,13 @@ export const UserAdiroColumns = [
     ellipsis: true,
     tooltip: true,
   },
+  {
+    title: "充值时间",
+    dataIndex: "createdAt",
+    align: "center",
+    ellipsis: true,
+    tooltip: true,
+  },
   {
     title: "备注",
     dataIndex: "remark",

src/views/lotCard/cardList/config.js

@@ -269,7 +269,7 @@ export const columnsTopup = [
   },
   {
     title: window.$t('lotCard.PaymentStatus'),
-    dataIndex: 'payStatus',
+    slotName: 'puyStatus',
     ellipsis: true,
     align: 'center',
   },

src/views/lotCard/cardList/trafficUseDialog.vue

@@ -127,7 +127,11 @@
           </a-tab-pane>
           <a-tab-pane key="4" :title="$t('lotCard.RechargeRecord')">
             <a-table :columns="columnsTopup" :data="dataTopup" :scroll="{ x: 'auto' }" :pagination="pagination"
-              @page-change="evChangePageCardPuy" />
+              @page-change="evChangePageCardPuy">
+              <template #puyStatus="{ record }">
+                <a-tag :color="record.payStatus == 'SUCCESS' ? '#00b42a' : ''">{{ record.puyStatus }}</a-tag>
+              </template>
+            </a-table>
           </a-tab-pane>
           <a-tab-pane key="5" :title="$t('lotCard.UsageAmount')">
             <a-table :columns="columnsAmount" :data="dataAmount" :scroll="{ x: 'auto' }" :pagination="false" />
@@ -240,7 +244,7 @@ const ICCIDPuyData = async (id) => {
     const payType = res1.filter(item => item.value == val.payStatus)[0]?.label
     return {
       ...val,
-      payStatus:payType ,
+      puyStatus: payType,
       payAmount: val.payAmount + '/' + val.currency
     }
   })