增加字段

src/i18n/zh/tariffManagement.js

@@ -35,5 +35,5 @@ export default {
     userName:'客户名称',
     MRCName:'MRC费(月租)',
     networkName:'网络接入费',
-    ActivatedNames:'流量总数'
+    ActivatedNames:'流量大小'
 }

src/views/flowPool/index.vue

@@ -110,13 +110,6 @@
                 </a-option>
               </a-select>
             </a-form-item>
-            <!-- <a-form-item :label="$t('flowPool.trafficPoolType')" field="trafficPoolType">
-                <a-select v-model="formState.trafficPoolType" disabled
-                    :placeholder="$t('form.cardForm.pleaseSelect') + $t('flowPool.trafficPoolType')">
-                    <a-option v-for=" item in typeList" :key="item.id" :value="item.value">{{ item.label
-                        }}</a-option>
-                </a-select>
-            </a-form-item> -->
             <a-form-item :label="$t('flowPool.simRariff')" field="simTariffId">
               <a-select v-model="formState.simTariffId"
                         :placeholder="$t('form.cardForm.pleaseSelect') + $t('flowPool.simRariff')">
@@ -148,109 +141,110 @@
             </a-form-item>
           </a-form>
         </a-tab-pane>
-        <!--                <a-tab-pane key="2" :title="$t('flowPool.warnTabs')">-->
-        <!--                    <a-form :model="formWarning" direction="inline">-->
-        <!--                        <div class="form-pool-tit">-->
-        <!--                            <div class="pool-icon"></div>-->
-        <!--                            客户端·池预警设置-->
-        <!--                        </div>-->
-        <!--                        <a-form-item field="totalDosage" tooltip="请输入" label="总用量占比">-->
-        <!--                            <a-input-number v-model="formWarning.totalDosage" :style="{ width: '320px' }"-->
-        <!--                                placeholder="请输入" allow-clear hide-button>-->
-        <!--                                <template #suffix>-->
-        <!--                                    %-->
-        <!--                                </template>-->
-        <!--                            </a-input-number>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.totalDosageCheck">达量预警</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stoppagePool" label="达量停机">-->
-        <!--                            <a-select v-model="formWarning.stoppagePool" placeholder="请选择" :style="{ width: '320px' }"-->
-        <!--                                allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stoppagePoolCheck">达量停机</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stopNetworkPool" label="达量断网">-->
-        <!--                            <a-select v-model="formWarning.stopNetworkPool" placeholder="请选择"-->
-        <!--                                :style="{ width: '320px' }" allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stopNetworkPoolCheck">达量断网</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="remindTotal" label="提醒次数">-->
-        <!--                            <a-input-number v-model="formWarning.remindTotal" :style="{ width: '320px' }"-->
-        <!--                                placeholder="请输入" allow-clear hide-button>-->
-        <!--                                <template #suffix>-->
-        <!--                                    次/月-->
-        <!--                                </template>-->
-        <!--                            </a-input-number>-->
-        <!--                        </a-form-item>-->
-        <!--                        <div class="form-pool-tit">-->
-        <!--                            <div class="pool-icon"></div>-->
-        <!--                            客户端·单卡预警设置-->
-        <!--                        </div>-->
-        <!--                        <a-form-item field="oneCardWarning" tooltip="请输入" label="单卡用量预警">-->
-        <!--                            <a-input-number v-model="formWarning.oneCardWarning" :style="{ width: '320px' }"-->
-        <!--                                placeholder="请输入" allow-clear hide-button>-->
-        <!--                            </a-input-number>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.outTotalCheck">达量预警</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stoppageCard" label="达量停机">-->
-        <!--                            <a-select v-model="formWarning.stoppageCard" placeholder="请选择" :style="{ width: '320px' }"-->
-        <!--                                allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stoppageCardCheck">达量停机</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stopNetworkCard" label="达量断网">-->
-        <!--                            <a-select v-model="formWarning.stopNetworkCard" placeholder="请选择"-->
-        <!--                                :style="{ width: '320px' }" allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stopNetworkCardCheck">达量断网</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <div class="form-pool-tit">-->
-        <!--                            <div class="pool-icon"></div>-->
-        <!--                            管理端预警设置-->
-        <!--                        </div>-->
-        <!--                        <a-form-item field="poolUsedWarning" tooltip="请输入" label="池已用量预警">-->
-        <!--                            <a-input-number v-model="formWarning.poolUsedWarning" :style="{ width: '320px' }"-->
-        <!--                                placeholder="请输入" allow-clear hide-button>-->
-        <!--                                <template #suffix>-->
-        <!--                                    %-->
-        <!--                                </template>-->
-        <!--                            </a-input-number>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.poolUsedCheck">达量预警</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stoppageManagement" label="达量停机">-->
-        <!--                            <a-select v-model="formWarning.stoppageManagement" placeholder="请选择"-->
-        <!--                                :style="{ width: '320px' }" allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stoppageManagementCheck">达量停机</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item field="stopNetworkManagement" label="达量断网">-->
-        <!--                            <a-select v-model="formWarning.stopNetworkManagement" placeholder="请选择"-->
-        <!--                                :style="{ width: '320px' }" allow-clear>-->
-        <!--                                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"-->
-        <!--                                    :label="item.label" />-->
-        <!--                            </a-select>-->
-        <!--                            <a-checkbox value="1" v-model="formWarning.stopNetworkManagementCheck">达量断网</a-checkbox>-->
-        <!--                        </a-form-item>-->
-        <!--                        <a-form-item>-->
-        <!--                            <a-button type="primary" html-type="submit" @click="resetForm"-->
-        <!--                                style="margin-right: 10px;">{{-->
-        <!--                                    $t('form.Confirm')-->
-        <!--                                }}</a-button>-->
-        <!--                            <a-button @click="resetForm">{{ $t('form.Cancel') }}</a-button>-->
-        <!--                        </a-form-item>-->
-        <!--                    </a-form>-->
-        <!--                </a-tab-pane>-->
+        <a-tab-pane key="2" :title="$t('flowPool.warnTabs')">
+          <a-form :model="formWarning" direction="inline">
+            <div class="form-pool-tit">
+              <div class="pool-icon"></div>
+              客户端·池预警设置
+            </div>
+            <a-form-item field="totalDosage" tooltip="请输入" label="总用量占比">
+              <a-input-number v-model="formWarning.totalDosage" :style="{ width: '320px' }"
+                              placeholder="请输入" allow-clear hide-button>
+                <template #suffix>
+                  %
+                </template>
+              </a-input-number>
+              <a-checkbox value="1" v-model="formWarning.totalDosageCheck">达量预警</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stoppagePool" label="达量停机">
+              <a-select v-model="formWarning.stoppagePool" placeholder="请选择" :style="{ width: '320px' }"
+                        allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stoppagePoolCheck">达量停机</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stopNetworkPool" label="达量断网">
+              <a-select v-model="formWarning.stopNetworkPool" placeholder="请选择"
+                        :style="{ width: '320px' }" allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stopNetworkPoolCheck">达量断网</a-checkbox>
+            </a-form-item>
+            <a-form-item field="remindTotal" label="提醒次数">
+              <a-input-number v-model="formWarning.remindTotal" :style="{ width: '320px' }"
+                              placeholder="请输入" allow-clear hide-button>
+                <template #suffix>
+                  次/月
+                </template>
+              </a-input-number>
+            </a-form-item>
+            <div class="form-pool-tit">
+              <div class="pool-icon"></div>
+              客户端·单卡预警设置
+            </div>
+            <a-form-item field="oneCardWarning" tooltip="请输入" label="单卡用量预警">
+              <a-input-number v-model="formWarning.oneCardWarning" :style="{ width: '320px' }"
+                              placeholder="请输入" allow-clear hide-button>
+              </a-input-number>
+              <a-checkbox value="1" v-model="formWarning.outTotalCheck">达量预警</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stoppageCard" label="达量停机">
+              <a-select v-model="formWarning.stoppageCard" placeholder="请选择" :style="{ width: '320px' }"
+                        allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stoppageCardCheck">达量停机</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stopNetworkCard" label="达量断网">
+              <a-select v-model="formWarning.stopNetworkCard" placeholder="请选择"
+                        :style="{ width: '320px' }" allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stopNetworkCardCheck">达量断网</a-checkbox>
+            </a-form-item>
+            <div class="form-pool-tit">
+              <div class="pool-icon"></div>
+              管理端预警设置
+            </div>
+            <a-form-item field="poolUsedWarning" tooltip="请输入" label="池已用量预警">
+              <a-input-number v-model="formWarning.poolUsedWarning" :style="{ width: '320px' }"
+                              placeholder="请输入" allow-clear hide-button>
+                <template #suffix>
+                  %
+                </template>
+              </a-input-number>
+              <a-checkbox value="1" v-model="formWarning.poolUsedCheck">达量预警</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stoppageManagement" label="达量停机">
+              <a-select v-model="formWarning.stoppageManagement" placeholder="请选择"
+                        :style="{ width: '320px' }" allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stoppageManagementCheck">达量停机</a-checkbox>
+            </a-form-item>
+            <a-form-item field="stopNetworkManagement" label="达量断网">
+              <a-select v-model="formWarning.stopNetworkManagement" placeholder="请选择"
+                        :style="{ width: '320px' }" allow-clear>
+                <a-option v-for="item in earlyList" :key="item.value" :value="item.value"
+                          :label="item.label"/>
+              </a-select>
+              <a-checkbox value="1" v-model="formWarning.stopNetworkManagementCheck">达量断网</a-checkbox>
+            </a-form-item>
+            <a-form-item>
+              <a-button type="primary" html-type="submit" @click="resetForm"
+                        style="margin-right: 10px;">{{
+                  $t('form.Confirm')
+                }}
+              </a-button>
+              <a-button @click="resetForm">{{ $t('form.Cancel') }}</a-button>
+            </a-form-item>
+          </a-form>
+        </a-tab-pane>
       </a-tabs>
 
     </a-modal>
@@ -376,13 +370,13 @@ const intData = async () => {
     const trafficPoolStatus = trafficList.value.find(val => val.value == item.status)?.label
     const sourceName = sourceList.value.find(val => val.value == item.source)?.label
     const Activated = 0 + '/' + item.iccids?.length
-    const HaveBeenUsed = 0+ '/' + item.size+item.sizeType
+    const HaveBeenUsed = 0 + '/' + item.size + item.sizeType
     return {
       ...item,
       sourceName,// 运营商名称
       trafficPoolStatus,
       Activated: Activated,
-      HaveBeenUsed:HaveBeenUsed,
+      HaveBeenUsed: HaveBeenUsed,
       poolNumber: "NR0" + (index + 1),
     }
   })

src/views/lotCard/cardList/config.js

@@ -3,7 +3,7 @@ export const columns = [
   { title: window.$t('lotCard.source'), dataIndex: 'sourceName', align: 'center',  ellipsis:true },
   { title: 'IMSI', dataIndex: 'account', align: 'center', ellipsis:true},
   { title: 'SIM绑定的IMSI', dataIndex: 'currentImsi', align: 'center', ellipsis:true  },
-  { title: 'SIM货币余额', dataIndex: 'moneyBalances', 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: 'SIM状态', dataIndex: 'accountStatus', align: 'center', ellipsis:true  },
@@ -17,7 +17,15 @@ 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: 'dataPackageName', 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: '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},
+  { title: '已用(加油包流量)', dataIndex: 'usedBg', align: 'center', width: 200 ,ellipsis:true},
+  { title: '可用(加油包流量)', dataIndex: 'usableBg', align: 'center', width: 200 ,ellipsis:true},
   {
     title: window.$t('global.common.operations'),
     dataIndex: 'id',

src/views/lotCard/cardList/index.vue

@@ -86,7 +86,7 @@ const intData = async () => {
   const soureName = await Getdictionary('source')
   const accountStatusName = await Getdictionary('account')
   const { data } = await cardInfoList(param)
-  dataSource.value = (data.records || []).map((item) => {
+  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 soure = soureName.find(val => val.value == item.source)?.label
@@ -97,7 +97,15 @@ const intData = async () => {
       payType: payType,
       dataPackageName: dataPackage,
       sourceName: soure,
-      accountStatus
+      accountStatus,
+      forewarningStatus:'正常',
+      HistoricalUsage:'10/G',
+      poolNum:'Not/'+index,
+      SilenceEndtime:'2025-2-3',
+      usedFlowrate:'14G',
+      usableFlowrate:'3G',
+      usedBg:'50MB',
+      usableBg:'140MB',
     }
   })
   pagination.value.total = data.total
@@ -176,4 +184,4 @@ onMounted(() => {
     }
   }
 }
-</style>
+</style>

src/views/lotCard/cardList/trafficUseDialog.vue

@@ -18,7 +18,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :span="12">
-                            <a-form-item label="SIM绑定的IMSI">
+                            <a-form-item label="IMSI">
                                 {{ Card_info.currentImsi }}
                             </a-form-item>
                         </a-col>

src/views/tariffManagement/config.js

@@ -35,6 +35,9 @@ export const columnsCustomer = [
     // { title: window.$t('tariffManagement.billingType'), dataIndex: 'billingTypeName', align: 'center', width: 200 },
     { title: window.$t('tariffManagement.billingCycle'), dataIndex: 'billingCycleName', align: 'center', width: 200,ellipsis:true },
     // { title: window.$t('tariffManagement.bagSize'), dataIndex: 'bagSize', align: 'center', width: 200 },
+    { title: '结算周期', dataIndex: 'bagSize', align: 'center', width: 200 },
+    { title: '流量资费价格', dataIndex: 'bagSize', align: 'center', width: 200 },
+    { title: '充值定价', dataIndex: 'bagSize', align: 'center', width: 200 },
     { title: window.$t('tariffManagement.pricing'), dataIndex: 'pricingName', align: 'center', width: 200 ,ellipsis:true},
     // { title: window.$t('tariffManagement.billingMethod'), dataIndex: 'billing_method', align: 'center', width: 200 },
     { title: window.$t('tariffManagement.settlementCycleLabel'), dataIndex: 'settlementCycle', align: 'center', width: 200,ellipsis:true },

src/views/tariffManagement/index.vue

@@ -42,7 +42,6 @@
         </a-form-item>
       </a-form>
     </div>
-
     <div class="audit-btn">
       <a-button type="text" @click="dictShowModel(1, null)" v-if="role.getRole == 1">
         <template #icon>
@@ -252,14 +251,13 @@ const intData = async () => {
     const billingCycleName = cycleist.value.find(val => val.value == item.billingCycle)?.label
     const pricingCurrty = currency.value.find(val => val.value == item.currency)?.label || '人民币'
     const Activated = item.trafficBilling + '/' + item.trafficBillingType
-
     return {
       ...item,
       sourceName,
       pricingName: item.pricing !== '' ? item.pricing + '/' + pricingCurrty : '',
       billingCycleName,
       Activated: Activated,
-      status: "正常"
+      status: "正常",
     }
   })
   pagination.value.total = data.total