Sfoglia il codice sorgente

fix:充值记录排序和管理机字段

zhb 8 mesi fa
parent
commit
afabea099d

+ 5 - 1
src/api/card/index.js

@@ -59,7 +59,11 @@ export const getRechargercdList = (query) => {
   return request({
     url: '/wpr/rechargercd/list',
     method: 'get',
-    params: query
+    params: {
+      ...query,
+      orderByColumn: 'rechargercdRechargetime',
+      isAsc: 'desc'
+    }
   });
 };
 

+ 5 - 1
src/api/record/index.js

@@ -14,6 +14,10 @@ export function fetchRechargeRecordList(query) {
   return request({
     url: '/wpr/rechargercd/list',
     method: 'get',
-    params: query
+    params: {
+      ...query,
+      orderByColumn: 'rechargercdRechargetime',
+      isAsc: 'desc'
+    }
   });
 }

+ 15 - 3
src/views/equipmentList/components/MyCard.vue

@@ -46,9 +46,21 @@
           <el-descriptions-item label="SIM卡">
             {{ ListItem.devTag === '1' ? '高空测报灯' : '普通测报灯' }}
           </el-descriptions-item> -->
-          <el-descriptions-item label="上报日期">{{
-            ListItem.devUpdateddate
-          }}</el-descriptions-item>
+          <el-descriptions-item
+            label="上报日期"
+            v-if="ListItem.devtypePid !== DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.devUpdateddate }}</el-descriptions-item
+          >
+          <el-descriptions-item
+            label="行政区划"
+            v-if="ListItem.devtypePid === DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.extInfo || '' }}</el-descriptions-item
+          >
+          <el-descriptions-item
+            label="添加日期"
+            v-if="ListItem.devtypePid === DEVICETYPE.SDSJGLJ"
+            >{{ ListItem.devCreateddate || '' }}</el-descriptions-item
+          >
         </el-descriptions>
       </div>
       <div>