1

src/i18n/zh/tariffManagement.js

@@ -8,7 +8,7 @@ export default {
     billingType: "计费分类",//计费方式
     billingCycle: "计费周期",
     bagSize: "资费包大小",
-    pricing: "标准价格",
+    pricing: "结算价格",
     settlementCycle: "周期限制",// 结算周期
     settlementCycleLabel: "周期限制(月)",// 结算周期
 

src/views/lotCard/cardList/config.js

@@ -23,7 +23,7 @@ export const columns = [
     dataIndex: 'id',
     slotName: 'id',
     align: 'center',
-    width: 280,
+    width: 200,
     fixed: "right",
   }
 ]

src/views/lotCard/cardList/index.vue

@@ -1,16 +1,6 @@
 <template>
   <!-- 卡清单管理 -->
   <div class="container">
-    <div class="head-title">
-      <span>{{ route.meta.title }} </span>
-      <span class="head-title-right">
-        <a-popconfirm :content="$t('form.ImportConfirm')" :ok-text="$t('form.Confirm')" :cancel-text="$t('form.Cancel')"
-          @ok="handleImport()">
-          <!-- <a-button class="m-r-10" type="primary"> {{ $t('form.Import') }}</a-button> -->
-        </a-popconfirm>
-      </span>
-
-    </div>
     <!-- 搜索条件区 -->
     <div class="search-section">
       <a-form :model="searchForm" ref="formRef" layout="inline">
@@ -48,7 +38,7 @@
     </div>
 
     <a-table row-key="iccid" :data="dataSource" :columns="columns" :pagination="pagination" :scroll="{ x: 'auto' }"
-      :expandable="expandable" @page-change="evChangePage">
+      @page-change="evChangePage">
       <template #id="{ record }">
         <!-- 查看流量消耗 -->
         <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handletrafficUseDialog(record)">详情</a>
@@ -56,20 +46,17 @@
 
     </a-table>
     <!-- 查看流量消耗 -->
-    <trafficUseDialog ref="trafficUseDialogRef" @submit="intData()"/>
+    <trafficUseDialog ref="trafficUseDialogRef" @submit="intData()" />
+
 
-    
   </div>
 </template>
 
 <script setup>
-import { onMounted, ref, reactive, getCurrentInstance, h } from "vue";
-import { useRoute } from "vue-router";
+import { onMounted, ref, getCurrentInstance, h } from "vue";
 import { columns } from "./config";
-import { Message, Notification } from '@arco-design/web-vue'
-import { cardInfoList, cardInfoImport, orderList, orderFlowData } from "@/api/path/lotCard.api"
+import { cardInfoList } from "@/api/path/lotCard.api"
 import trafficUseDialog from "./trafficUseDialog.vue";
-import list from "./list.vue";
 import { Getdictionary } from '@/mixins/index.js'
 const { proxy } = getCurrentInstance()
 const formRef = ref()
@@ -81,7 +68,6 @@ const statusList = ref([]);
 const sourceList = ref([]);
 const serviceList = ref([]);
 const dataSource = ref([]);
-const route = useRoute();
 const pagination = ref({
   total: 0,
   pageSize: 10,
@@ -104,7 +90,7 @@ const intData = async () => {
     const payType = item.payType == 0 ? 'Prepay' : 'Postpay';
     const dataPackage = item.Info.dataPackage.map(res => res.productName).join(',');
     const soure = soureName.find(val => val.value == item.source)?.label
-    const accountStatus = accountStatusName.find(val=>val.value == item.Info.accountStatus)?.label
+    const accountStatus = accountStatusName.find(val => val.value == item.Info.accountStatus)?.label
     return {
       ...item,
       ...item.Info,
@@ -117,65 +103,7 @@ const intData = async () => {
   pagination.value.total = data.total
 }
 
-
-// const { data: orderData } = await orderList({ current: 1, size: 999, ICCID: ICCID.value })
-//     orderData.records?.forEach(async (orderItem) => {
-
-//         const params = {
-//             // iccid: orderItem.ICCID,
-//             iccid: '89852342022040149139',
-//             childOrderId: orderItem.id,
-//             subscriptionKey: "1824754463183432097",
-//         }
-
-//         let trafficList = []
-//         const { data } = await orderFlowData(params)
-//         trafficList = data.historyData || []
-
-//         dataSource.value.push({
-//             ...orderItem,
-//             trafficList
-//         })
-//     })
-
-
-const expandable = {
-  expandedRowRender: (record) => {
-    if (record.orderArr && Array.isArray(record.orderArr) && record.orderArr.length > 0) {
-      return h('div', {}, [
-        h(list, { 'data': record.orderArr })
-      ]);
-    }
-    return h('div', {}, '暂无数据')
-  },
-};
-
-const handleImport = async () => {
-  if (!searchForm.value.iccid) {
-    Message.warning({
-      content: '请先输入ICCID,可输入多个以逗号分隔,然后再点击导入！',
-      duration: 2000,
-    })
-    return
-  }
-  const iccids = searchForm.value.iccid.split(',')
-  const iccidList = iccids.map(item => {
-    return {
-      iccid: item
-    }
-  })
-  const { code, data } = await cardInfoImport({ iccidList })
-  if (code == 200) {
-    Message.success({
-      content: data,
-      duration: 2000,
-    })
-    intData()
-  }
-
-};
-
-// 查看当前流量消耗详情
+// 详情
 const handletrafficUseDialog = (data) => {
   trafficUseDialogRef.value.open(data)
 }
@@ -185,6 +113,8 @@ const evChangePage = (page) => {
   pagination.value.current = page
   intData()
 }
+
+
 const handleSearch = () => {
   formRef.value.validate((errors) => {
     if (!errors) {

src/views/lotCard/cardList/list.vue

@@ -1,94 +0,0 @@
-<template>
-    <!-- 订单列表-查看订单流量明细 -->
-    <div class="trafficUse">
-        <ul class="order_list_box">
-            <li class="list_box_item" v-for="(item, index) in data" key="index">
-                <div class="list_item_left">
-                    <a-progress type="circle" :percent="0.2" />
-                </div>
-                <div class="list_item_right">
-                    <p>
-                        <span>{{ $t('lotCard.orderID') }}：{{ item.id }}</span>
-                        <!-- <span class="list_item_right_span">{{ $t('lotCard.orderType') }}：{{ item.orderType }}</span> -->
-                        <!-- <span>更新时间：{{ item.updated_at }}</span> -->
-                    </p>
-                    <template v-if="item.trafficList">
-                        <p v-for="trafficVal in item.trafficList" :key="trafficVal.id">
-                            <span class="list_item_right_span"> 流量总量：{{ trafficVal.qtaconsumption }}</span>
-                            <span class="list_item_right_span">流量使用时间：{{ trafficVal.time }}</span>
-                            <span>国家：中国</span>
-                        </p>
-                    </template>
-
-                </div>
-            </li>
-        </ul>
-    </div>
-</template>
-<script setup>
-import lotCard from '@/i18n/zh/lotCard';
-
-const props = defineProps({
-    data: Array
-});
-
-
-
-
-</script>
-
-<style scoped lang="less">
-ul,
-li,
-p,
-span {
-    margin: 0;
-    padding: 0;
-    line-height: 1.5;
-}
-
-
-.order_list_box {
-    list-style: none;
-    max-height: 700px;
-    overflow-y: scroll;
-    margin: auto;
-    padding: 0 20px;
-}
-
-.list_box_item {
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-
-    .list_item_left {
-        width: 60px;
-        height: 60px;
-        // background: gainsboro;
-        margin-right: 10px;
-    }
-
-    .list_item_right {
-        p {
-            display: flex;
-            align-items: center;
-            margin: 5px 0;
-        }
-
-        span {
-            display: flex;
-            align-items: center;
-
-        }
-
-        .list_item_right_span::after {
-            content: "";
-            display: inline-block;
-            width: 1px;
-            height: 20px;
-            background-color: gray;
-            margin: 0 10px;
-        }
-    }
-}
-</style>

src/views/tariffManagement/config.js

@@ -13,6 +13,8 @@ export let columns = [
     { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200,ellipsis:true },
     { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', align: 'center', width: 200,ellipsis:true },
     { title: window.$t('tariffManagement.feeStatus'), dataIndex: 'status', align: 'center', width: 200 ,ellipsis:true},
+    { title: window.$t('tariffManagement.MRCName'), dataIndex: 'mrcAmount', align: 'center', width: 200 ,ellipsis:true},
+    { title: window.$t('tariffManagement.networkName'), dataIndex: 'networkAccessFee', align: 'center', width: 200 ,ellipsis:true},
     {
         title: window.$t('global.common.operations'),
         dataIndex: 'id',

src/views/tariffManagement/index.vue

@@ -122,9 +122,7 @@
         </a-form-item>
         <div class="formTitle">计费信息</div>
         <a-form-item field="billingCycle" :label="$t('tariffManagement.billingCycle')" required>
-          <a-radio-group v-model="formState.billingCycle">
-            <a-radio value="1">按天</a-radio>
-            <a-radio value="2">按月</a-radio>
+          <a-radio-group v-model="formState.billingCycle" :options="billingCycleData">
           </a-radio-group>
         </a-form-item>
         <a-form-item field="" :label="$t('tariffManagement.pricing')" required>
@@ -233,7 +231,7 @@ const searchForm = ref({
 
 const currency = ref([])
 
-
+const billingCycleData = ref([])
 const dataSource = ref([]);
 const route = useRoute();
 const pagination = ref({
@@ -526,6 +524,7 @@ const handleDictValue = async () => {
   typeList.value = await Getdictionary('Billingcycle')
   methodList.value = await Getdictionary('billingMethod')
   currency.value = await Getdictionary('currencyType')
+  billingCycleData.value = await Getdictionary('Billingcycle')
 }