feat: 字段调整

src/views/flowPool/components/add.vue

@@ -180,7 +180,7 @@ onMounted(()=>{
               </a-option>
             </a-select>
           </a-form-item>
-          <a-form-item :label="$t('flowPool.trafficPoolStatus')" field="status">
+          <!-- <a-form-item :label="$t('flowPool.trafficPoolStatus')" field="status"> -->
             <a-select v-model="formState.status"
                       :placeholder="$t('form.cardForm.pleaseSelect') + $t('flowPool.trafficPoolStatus')">
               <a-option v-for=" item in trafficList" :key="item.id" :value="item.value">{{
@@ -188,7 +188,7 @@ onMounted(()=>{
                 }}
               </a-option>
             </a-select>
-          </a-form-item>
+          <!-- </a-form-item> -->
           <a-form-item :label="$t('flowPool.simRariff')" field="simTariffId">
             <a-select v-model="formState.simTariffId" @change="selectChange"
                       :placeholder="$t('form.cardForm.pleaseSelect') + $t('flowPool.simRariff')">
@@ -198,7 +198,7 @@ onMounted(()=>{
               </a-option>
             </a-select>
           </a-form-item>
-          <a-form-item :label="$t('flowPool.ICCIDlabel')" v-if="formState?.simTariffId!==null">
+          <!-- <a-form-item :label="$t('flowPool.ICCIDlabel')" v-if="formState?.simTariffId!==null"> -->
             <a-select v-model="formState.iccids" multiple
                       :placeholder="$t('flowPool.ICCIDName')">
               <a-option v-for=" item in card" :key="item.iccid" :value="item.iccid">{{
@@ -206,7 +206,7 @@ onMounted(()=>{
                 }}
               </a-option>
             </a-select>
-          </a-form-item>
+          <!-- </a-form-item> -->
           <a-form-item :label="$t('flowPool.expireTime')" field="expireTime">
             <a-date-picker v-model="formState.expireTime" show-time
                            :time-picker-props="{ defaultValue: '09:09:06' }" format="YYYY-MM-DD HH:mm:ss"/>

src/views/flowPool/config.js

@@ -3,7 +3,7 @@ export const columns = [
     { title: window.$t('flowPool.label'), dataIndex: 'label', align: 'center', width: 200 },
     // { title: window.$t('flowPool.userId'), dataIndex: 'user_id', align: 'center', width: 200 },
     // { title: window.$t('flowPool.trafficPoolType'), dataIndex: 'trafficPoolType', align: 'center', width: 200 },
-    { title: window.$t('flowPool.trafficPoolStatus'), dataIndex: 'trafficPoolStatus', align: 'center', width: 200 },
+    // { title: window.$t('flowPool.trafficPoolStatus'), dataIndex: 'trafficPoolStatus', align: 'center', width: 200 },
     // { title: window.$t('flowPool.cardFlow'), dataIndex: 'cardFlow', align: 'center', width: 200 },
     // { title: window.$t('flowPool.UsedMonth'), dataIndex: 'UsedMonth', align: 'center', width: 200 },
     // { title: window.$t('flowPool.surplusFlow'), dataIndex: 'surplusFlow', align: 'center', width: 200 },

src/views/flowPool/customerFlowPool/config.js

@@ -3,7 +3,7 @@ export const columns = [
     { title: window.$t('flowPool.label'), dataIndex: 'label', align: 'center', width: 200 },
     // { title: window.$t('flowPool.userId'), dataIndex: 'user_id', align: 'center', width: 200 },
     // { title: window.$t('flowPool.trafficPoolType'), dataIndex: 'trafficPoolType', align: 'center', width: 200 },
-    { title: window.$t('flowPool.trafficPoolStatus'), dataIndex: 'trafficPoolStatus', align: 'center', width: 200 },
+    // { title: window.$t('flowPool.trafficPoolStatus'), dataIndex: 'trafficPoolStatus', align: 'center', width: 200 },
     // { title: window.$t('flowPool.cardFlow'), dataIndex: 'cardFlow', align: 'center', width: 200 },
     // { title: window.$t('flowPool.UsedMonth'), dataIndex: 'UsedMonth', align: 'center', width: 200 },
     // { title: window.$t('flowPool.surplusFlow'), dataIndex: 'surplusFlow', align: 'center', width: 200 },

src/views/lotCard/cardList/config.js

@@ -2,14 +2,14 @@ export const columns = [
     { title: window.$t('lotCard.iccid'), dataIndex: 'iccid', align: 'center', ellipsis: true },
     { title: window.$t('lotCard.source'), dataIndex: 'sourceName', align: 'center', ellipsis: true },
     { title: '客户名称', dataIndex: 'userName', align: 'center', ellipsis: true },
-    { title: 'IMSI', dataIndex: 'account', align: 'center', ellipsis: true },
+    { title: 'IMSI', dataIndex: 'currentImsi', align: 'center', ellipsis: true },
     { title: 'SIM绑定的IMSI', dataIndex: 'currentImsi', align: 'center', ellipsis: true },
     // { title: 'SIM货币余额', dataIndex: 'moneyBalances', align: 'center', ellipsis:true  },
     { title: 'SIM生成日期', dataIndex: 'createTime', align: 'center', ellipsis: true },
-    { title: '支付方式', dataIndex: 'payType', align: 'center', ellipsis: true },
+    // { title: '支付方式', dataIndex: 'payType', align: 'center', ellipsis: true },
     { title: 'SIM状态', dataIndex: 'accountStatus', align: 'center', ellipsis: true },
     { title: '预警状态', dataIndex: 'accountStatus', align: 'center', ellipsis: true },
-    { title: '已使用总流量', dataIndex: 'dataUsageTotal', align: 'center', ellipsis: true },
+    { title: '已使用总流量', dataIndex: 'dataUsageTotal', slotName: 'dataUsageTotal', align: 'center', ellipsis: true },
     { title: '语音呼入分钟数', dataIndex: 'voiceMtTotal', align: 'center', ellipsis: true },
     { title: '语音呼出分钟数', dataIndex: 'voiceMoTotal', align: 'center', ellipsis: true },
     { title: '总语音分钟数', dataIndex: 'voiceTotal', align: 'center', ellipsis: true },
@@ -18,10 +18,10 @@ export const columns = [
     { title: 'SIM关闭日期', dataIndex: 'closeTime', align: 'center', ellipsis: true },
     { title: 'SIM激活日期', dataIndex: 'activeTime', align: 'center', ellipsis: true },
     { title: 'IMSI所属供应商名称', dataIndex: 'currentImsiProvider', align: 'center', ellipsis: true },
-    { title: '卡套餐', dataIndex: 'dataPackageName', align: 'center', ellipsis: true },
+    { title: '卡套餐', dataIndex: 'tariffName', align: 'center', ellipsis: true },
     { title: '预警状态', dataIndex: 'forewarningStatus', align: 'center', width: 200, ellipsis: true },
     { title: '历史用量', dataIndex: 'HistoricalUsage', align: 'center', width: 200, ellipsis: true },
-    { title: '池名称/编号', dataIndex: 'poolNum', align: 'center', width: 200, ellipsis: true },
+    { title: '池名称/编号', dataIndex: 'poolNum',  slotName: 'poolNum', align: 'center', width: 200, ellipsis: true },
     { title: '沉默期到期时间', dataIndex: 'SilenceEndtime', align: 'center', width: 200, ellipsis: true },
     { title: '已用(套餐流量)', dataIndex: 'usedFlowrate', align: 'center', width: 200, ellipsis: true },
     { title: '可用(套餐流量)', dataIndex: 'usableFlowrate', align: 'center', width: 200, ellipsis: true },

src/views/lotCard/cardList/index.vue

@@ -39,6 +39,14 @@
 
     <a-table row-key="iccid" :data="dataSource" :columns="columns" :pagination="pagination" :scroll="{ x: 'auto' }"
       @page-change="evChangePage">
+      <template #poolNum="{ record }">
+        <span>{{ record.poolName }}</span>
+        <br/>
+        <span>{{ record.poolId }}</span>
+      </template>
+      <template #dataUsageTotal="{ record }">
+        <span>{{ record.dataUsageTotal }}MB</span>
+      </template>
       <template #id="{ record }">
         <!-- 查看流量消耗 -->
         <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="handletrafficUseDialog(record)">详情</a>
@@ -88,19 +96,19 @@ const intData = async () => {
   const { data } = await cardInfoList(param)
   dataSource.value = (data.records || []).map((item,index) => {
     const payType = item.payType == 0 ? 'Prepay' : 'Postpay';
-    const dataPackage = item.Info.dataPackage.map(res => res.productName).join(',');
+    // 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
     return {
       ...item,
       ...item.Info,
       payType: payType,
-      dataPackageName: dataPackage,
+      // dataPackageName: dataPackage,
       sourceName: soure,
       accountStatus,
       forewarningStatus:'正常',
       HistoricalUsage:'10/G',
-      poolNum:'Not/'+index,
+      poolNum:"-",
       SilenceEndtime:'2025-2-3',
       usedFlowrate:'14G',
       usableFlowrate:'3G',

src/views/order/BuyCard/index.vue

@@ -43,8 +43,8 @@
         <div v-if="userType == 2">
           <a-button type="text" @click="adminCancel(record)"
             v-if="record.moderationStatus == 2 && userType !== 1">退订</a-button>
-          <a-button @click="openDetail(record)" type="text">查看</a-button>
         </div>
+        <a-button @click="openDetail(record)" type="text">查看</a-button>
       </template>
     </a-table>
 
@@ -131,7 +131,7 @@ const columns = [
   { title: '客户名称', dataIndex: 'userName', align: 'center', ellipsis: true },
   { title: '采购数量', dataIndex: 'quantity', align: 'center', ellipsis: true },
   { title: '静默期(月)', dataIndex: 'periodOfSilence', align: 'center', ellipsis: true },
-  { title: '卡类型', dataIndex: 'CardType', align: 'center', ellipsis: true },
+  { title: '卡类型', dataIndex: 'cardType', align: 'center', ellipsis: true },
   { title: '运营商名称', dataIndex: 'sourceName', align: 'center', ellipsis: true },
   { title: '资费', dataIndex: 'trafficName', align: 'center', ellipsis: true },
   { title: '支付金额', dataIndex: 'quantity', align: 'center', ellipsis: true },
@@ -146,17 +146,17 @@ const intData = async () => {
     current: pageData.value.current,
     size: pageData.value.size,
   }
-  const res1 = await Getdictionary('cardType')
-  let res3 = await Getdictionary('source')
+  const simTypeList = await Getdictionary('cardType')
+  let sourceList = await Getdictionary('source')
   purchaseOrderList(param).then(res => {
     tableData.value = (res.data.records || []).map((item, key) => {
-      const sourceName = res3.filter((item) => item.typeKey == 'source')?.find(val => item.source == val.value)?.label
-      const CardType = res1.filter(val => val.typeKey == 'cardType')?.find(vals => vals.value == item.simType)?.label
+      const sourceName = sourceList.find(val => val.value == item.source)?.label
+      const cardType = simTypeList.find(val => val.value == item.simType)?.label
       return {
         ...item,
         index: key + 1,
         sourceName,
-        CardType
+        cardType
       }
     });
     pageData.value.total = res.data.total;