774078984@qq.com 2 kuukautta sitten
vanhempi
sitoutus
8eaccf4f5d

+ 3 - 3
src/hooks/enum.js

@@ -10,9 +10,9 @@ export const enum_dict = {
     CARD_TYPE: "cardType", // 卡类型
     GROUP_POOL: "groupPool", // 组池
     SILENCE: "silenceOf", // 沉默期
-    BILLING_CYCLE: "Billingcycle", // 计费周期
+    BILLING_CYCLE: "Billingcycle", // 账单计费周期
     BILLING_TYPE: "BillingType", // 计费分类
-    BILLING_METHOD: "billingMethod", // 计费方式
+    BILLING_METHOD: "billingMethod", // 流量结算方式
     SETTLEMENT_CYCLE: "settlementCycle", // 结算周期
     TRAFFIC_POOL_TYPE: "trafficPoolType", // 流量池类型
     TRAFFIC_USAGE_TYPE: "trafficUsageType", // 流量使用限制类型
@@ -21,7 +21,7 @@ export const enum_dict = {
     FLOW_PACKET_TYPE: "flowPacketType", // 流量包类型
     DEDUCTION_MODEL: "deductionModel", // 套餐收费方式
     FLOW_PERIOD: "flowPeriod", // 流量包套餐时长
-    ACTIVATE_METHOD: "activateMethod", // 激活方式-激活计费方式
+    ACTIVATE_METHOD: "activateMethod", // 激活方式-激活流量结算方式
     ORDER_AUDIT_STATUS: "orderAuditStatus", // 订单审核状态
     ORDER_TYPE: "orderType", // 订单状态
     CURRENCY_TYPE:'currencyType', // 币种

+ 1 - 1
src/i18n/zh/customerPackage.js

@@ -12,7 +12,7 @@ export default {
     packageName: '资费名称',
     providerName: '供应商名称',
     billingType: '计费分类',
-    billingPeriod: '计费周期',
+    billingPeriod: '账单计费周期',
     packageSize: '资费包大小',
     standardPrice: '标准价格',
     setPrice: '设置价格',

+ 1 - 1
src/i18n/zh/lotCard.js

@@ -91,7 +91,7 @@ export default {
     soundName:'请选择供应商',
     FlowTypeName:"请选择流量类型",
     BillingTypeName:'请选择计费分类',
-    ChargingCycleName:'请选择计费周期',
+    ChargingCycleName:'请选择账单计费周期',
 
     // 卡清单管理
     iccidType:'主卡状态',

+ 1 - 1
src/i18n/zh/order.js

@@ -12,7 +12,7 @@ export default {
     MinimumSubscriptionPeriod:'最短订阅周期',
     MaximumSubscriptionPeriod:'最长订阅周期',
     Months:'个月',
-    BillingMode:'计费方式',
+    BillingMode:'流量结算方式',
     SettlementCycle:'结算周期',
     StandardPrice:'标准价格',
     CardNum:'卡数量',

+ 3 - 3
src/i18n/zh/plan.js

@@ -11,7 +11,7 @@ export default {
     supplierName: '供应商名称',
     dataType: '流量类型',
     billingCategory: '计费分类',
-    billingCycle: '计费周期',
+    billingCycle: '账单计费周期',
     packageSize: '资费包大小',
     standardPrice: '标准价格',
     cycleLimitation: '周期限制',
@@ -45,7 +45,7 @@ export default {
     enterPackageSize: '请输入资费包大小',
     enterPrice: '请输入价格',
     currency: '元',
-    billingCycleType: '计费周期类型',
+    billingCycleType: '账单计费周期类型',
     month: '月',
     subscriptionPeriod: '订购周期',
     minimum: '最短',
@@ -66,7 +66,7 @@ export default {
     dataTypeRequired: '请选择流量类型',
     billingCategoryRequired: '请选择计费分类',
     statusRequired: '请选择状态',
-    billingCycleRequired: '请选择计费周期',
+    billingCycleRequired: '请选择账单计费周期',
     packageSizeRequired: '请输入资费包大小',
     standardPriceRequired: '请输入标准价格',
     minPeriodRequired: '请输入最短订购周期',

+ 5 - 5
src/i18n/zh/tariffManagement.js

@@ -5,8 +5,8 @@ export default {
     userId: "客户",
     source: "运应商名称",
     trafficType: "流量类型",
-    billingType: "计费分类", //计费方式
-    billingCycle: "计费周期",
+    billingType: "计费分类", //流量结算方式
+    billingCycle: "账单计费周期",
     bagSize: "资费包大小",
     pricing: "结算价格",
     settlementCycle: "周期限制", // 结算周期
@@ -30,7 +30,7 @@ export default {
     soundName: '供应商名称',
     FlowType: '流量类型',
     BillingType: '计费分类',
-    ChargingCycle: '计费周期',
+    ChargingCycle: '账单计费周期',
     userName: '客户名称',
     MRCName: 'MRC费(月租)',
     networkName: '网络接入费',
@@ -44,10 +44,10 @@ export default {
     Currency:'币种',
     AddPackage:'添加套餐',
     endDate:'有效期',
-    BillingMode:'计费方式',
+    BillingMode:'流量结算方式',
     TestFlowPacket:'测试流量包',
     simDataPlanIdName:'流量包名称',
     TestFlowPacketName:'测试流量包名称',
-    billingCycleUser:'账单计费周期',
+    billingCycleUser:'账单账单计费周期',
     pricingUser:'流量结算方式',
 }

+ 2 - 2
src/views/admin/OperationRecord/config.js

@@ -156,7 +156,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费方式",
+    label: "流量结算方式",
     field: "billingMethod",
     options: [], // 默认空,后面会通过字典加载
     dict: "billingMethod",
@@ -165,7 +165,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费周期",
+    label: "账单计费周期",
     field: "BillingCycle",
     options: [], // 默认空,后面会通过字典加载
     dict: "BillingCycle",

+ 1 - 1
src/views/admin/order/CancelOrder/detaile.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="detail-item-box">
                 <div class="detail-item">
-                    <div class="item-label">计费方式</div>
+                    <div class="item-label">流量结算方式</div>
                     <div class="item-content">{{ tariffForm.billingMethodName }}</div>
                 </div>
                 <div class="detail-item">

+ 1 - 1
src/views/admin/order/PackageRecharge/index.vue

@@ -122,7 +122,7 @@
                 </div>
                 <div class="detail-item-box">
                     <div class="detail-item">
-                        <div class="item-label">计费方式</div>
+                        <div class="item-label">流量结算方式</div>
                         <div class="item-content">按单流量消耗计费</div>
                     </div>
                     <div class="detail-item">

+ 1 - 1
src/views/admin/order/RenewalOrder/detaile.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="detail-item-box">
                 <div class="detail-item">
-                    <div class="item-label">计费方式</div>
+                    <div class="item-label">流量结算方式</div>
                     <div class="item-content">{{ tariffForm.billingMethodName }}</div>
                 </div>
                 <div class="detail-item">

+ 3 - 3
src/views/admin/tariffManagement/Management/add.vue

@@ -62,7 +62,7 @@
                 </a-select>
             </a-form-item>
             <div class="formTitle">{{ $t('tariffManagement.BillingInformation') }}</div>
-            <a-form-item field="billingCycle" label="账单计费周期" required>
+            <a-form-item field="billingCycle" label="账单账单计费周期" required>
                 <a-radio-group v-model="formState.billingCycle" :options="billingCycleData">
                 </a-radio-group>
             </a-form-item>
@@ -166,9 +166,9 @@ const state = ref({
         "userId": null,
         // 来源(必填)
         "source": "",
-        // 计费周期(必填)
+        // 账单计费周期(必填)
         "billingCycle": "",
-        // 计费方式(必填)
+        // 流量结算方式(必填)
         "billingMethod": "1",
         // 价格(必填)
         "pricing": "",

+ 1 - 1
src/views/admin/tariffManagement/config.js

@@ -384,7 +384,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "账单计费周期",
+    label: "账单账单计费周期",
     field: "BillingCycle",
     options: [], // 默认空,后面会通过字典加载
     dict: "BillingCycle",

+ 2 - 2
src/views/financialManagement/accountBalance/index.vue

@@ -116,7 +116,7 @@
                 <div class="item-content">7129.76G</div>
               </div>
               <div class="detail-item">
-                <div class="item-label">套餐流量计费方式</div>
+                <div class="item-label">套餐流量流量结算方式</div>
                 <div class="item-content">按单流量消耗计费</div>
               </div>
             </div>
@@ -136,7 +136,7 @@
                 <div class="item-content">11244G</div>
               </div>
               <div class="detail-item">
-                <div class="item-label">叠加流量计费方式</div>
+                <div class="item-label">叠加流量流量结算方式</div>
                 <div class="item-content">按周期计算</div>
               </div>
             </div>

+ 7 - 0
src/views/financialManagement/config.js

@@ -153,6 +153,13 @@ export const UserAdiroColumns = [
     ellipsis: true,
     tooltip: true,
   },
+  {
+    title: "用户手机号",
+    dataIndex: "phone",
+    align: "center",
+    ellipsis: true,
+    tooltip: true,
+  },
   {
     title: "充值时间",
     dataIndex: "createdAt",

+ 1 - 1
src/views/user/order/CancelOrder/detaile.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="detail-item-box">
                 <div class="detail-item">
-                    <div class="item-label">计费方式</div>
+                    <div class="item-label">流量结算方式</div>
                     <div class="item-content">{{ tariffForm.billingMethodName }}</div>
                 </div>
                 <div class="detail-item">

+ 1 - 1
src/views/user/order/RenewalOrder/detaile.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="detail-item-box">
                 <div class="detail-item">
-                    <div class="item-label">计费方式</div>
+                    <div class="item-label">流量结算方式</div>
                     <div class="item-content">{{ tariffForm.billingMethodName }}</div>
                 </div>
                 <div class="detail-item">

+ 1 - 1
src/views/user/tariffManagement/config.js

@@ -106,7 +106,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "账单计费周期",
+    label: "账单账单计费周期",
     field: "BillingCycle",
     options: [], // 默认空,后面会通过字典加载
     dict: "BillingCycle",