资费增加原价字段 && 修改客户端资费字段展示

src/i18n/zh/tariffManagement.js

@@ -1,9 +1,9 @@
 export default {
     // 资费计划
-    simDataPlanId: "流量包",
+    simDataPlanId: "主流量包",
     label: "资费名称",
     userId: "客户",
-    source: "供应商名称",
+    source: "运应商名称",
     trafficType: "流量类型",
     billingType: "计费分类", //计费方式
     billingCycle: "计费周期",
@@ -12,7 +12,6 @@ export default {
     settlementCycle: "周期限制", // 结算周期
     settlementCycleLabel: "周期限制(月)", // 结算周期
 
-    billingMethod: "计费方式",
     sourcePrice: "来源价格",
     currency: "结算币种",
 
@@ -48,5 +47,7 @@ export default {
     BillingMode:'计费方式',
     TestFlowPacket:'测试流量包',
     simDataPlanIdName:'流量包名称',
-    TestFlowPacketName:'测试流量包名称'
+    TestFlowPacketName:'测试流量包名称',
+    billingCycleUser:'账单计费周期',
+    pricingUser:'流量结算方式',
 }

src/views/tariffManagement/Management/add.vue

@@ -8,7 +8,7 @@
                 <a-select v-model="formState.source">
                     <a-option v-for=" item in sourceList" :key="item.id" :value="item.value">{{
                         item.label
-                        }}
+                    }}
                     </a-option>
                 </a-select>
             </a-form-item>
@@ -25,7 +25,7 @@
             </template>
             <template v-if="formState.source">
                 <a-form-item :label="$t('tariffManagement.TestFlowPacket')" field="testSimDataPlanId">
-                    <a-select v-model="formState.testSimDataPlanId" >
+                    <a-select v-model="formState.testSimDataPlanId">
                         <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.productId">{{
                             $t('tariffManagement.TestFlowPacket') }} {{
                                 item.productName
@@ -41,15 +41,15 @@
                 <a-select v-model="formState.userId">
                     <a-option v-for=" item in userIdList" :key="item.id" :value="item.id">{{
                         item.name
-                        }}
+                    }}
                     </a-option>
                 </a-select>
             </a-form-item>
-            <a-form-item :label="$t('tariffManagement.billingMethod')" field="billingMethod">
+            <a-form-item :label="$t('tariffManagement.pricingUser')" field="billingMethod">
                 <a-select v-model="formState.billingMethod">
                     <a-option v-for=" item in methodList" :key="item.id" :value="item.value">{{
                         item.label
-                        }}
+                    }}
                     </a-option>
                 </a-select>
             </a-form-item>
@@ -57,7 +57,7 @@
                 <a-select v-model="formState.currency">
                     <a-option v-for=" item in currency" :key="item.id" :value="item.value">{{
                         item.label
-                        }}
+                    }}
                     </a-option>
                 </a-select>
             </a-form-item>
@@ -85,46 +85,46 @@
                     </template>
                 </a-input>
             </a-form-item>
-            <!-- <a-form-item label="原价" field="networkAccessFee">
-                <a-input v-model="formState.pricing" v-if="formState.billingMethod == 2">
+            <a-form-item label="原价" field="networkAccessFee">
+                <a-input v-model="formState.oldPricing" v-if="formState.billingMethod == 2">
                     <template #append>
                         {{ formState.currency }}
                     </template>
                 </a-input>
-                <a-input v-model="formState.trafficBilling" v-if="formState.billingMethod == 1"></a-input>
-                <a-select v-model="formState.trafficBillingType" style="width: 80px; margin:0 8px;"
+                <a-input v-model="formState.oldTrafficBilling" v-if="formState.billingMethod == 1"></a-input>
+                <a-select v-model="formState.oldTrafficBillingType" style="width: 80px; margin:0 8px;"
                     v-if="formState.billingMethod == 1">
                     <a-option value="MB">MB</a-option>
                     <a-option value="GB">GB</a-option>
                     <a-option value="KB">KB</a-option>
                 </a-select>
-                <a-input v-model="formState.trafficBillingAmount" v-if="formState.billingMethod == 1">
+                <a-input v-model="formState.oldTrafficBillingAmount" v-if="formState.billingMethod == 1">
                     <template #append>
                         {{ formState.currency }}
                     </template>
                 </a-input>
-            </a-form-item> -->
+            </a-form-item>
             <a-form-item field="endDate" :label="$t('tariffManagement.cycleBuy')">
                 <a-date-picker v-model="formState.endDate" style="width: 100%;" />
             </a-form-item>
             <a-form-item :label="$t('tariffManagement.MRCName')" field="mrcAmount">
                 <a-input v-model="formState.mrcAmount">
                     <template #append>
-                        {{ formState.currency }} 
+                        {{ formState.currency }}
                     </template>
                 </a-input>
             </a-form-item>
             <a-form-item :label="$t('tariffManagement.networkName')" field="networkAccessFee">
                 <a-input v-model="formState.networkAccessFee">
                     <template #append>
-                        {{ formState.currency  }}
+                        {{ formState.currency }}
                     </template>
                 </a-input>
             </a-form-item>
             <a-form-item>
                 <a-button type="primary" html-type="submit" style="margin-right: 10px;">{{
                     $t('form.Confirm')
-                    }}
+                }}
                 </a-button>
                 <a-button @click="resetForm">{{ $t('form.Cancel') }}</a-button>
             </a-form-item>
@@ -185,7 +185,11 @@ const state = ref({
         // 网络接入费
         "networkAccessFee": '',
         "endDate": '',
-        "testSimDataPlanId":null, // 测试流量包
+        "testSimDataPlanId": null, // 测试流量包
+        "oldPricing": "",
+        "oldTrafficBilling": "",
+        "oldTrafficBillingType": "MB",
+        "oldTrafficBillingAmount": ""
     },
     sourceList: [],
     userIdList: [],
@@ -305,8 +309,13 @@ watch(() => formState.value.billingMethod, val => {
         formState.value.trafficBillingType = ''
         formState.value.trafficBilling = ''
         formState.value.trafficBillingAmount = ''
+        formState.value.oldTrafficBilling = ""
+        formState.value.oldTrafficBillingType = ""
+        formState.value.oldTrafficBillingAmount = ""
     } else {
         formState.value.pricing = ''
+        formState.value.trafficBillingType = 'MB'
+        formState.value.oldTrafficBillingType = "MB"
     }
 })
 

src/views/tariffManagement/config.js

@@ -111,6 +111,88 @@ export let columns = [
     fixed: "right",
   },
 ];
+
+
+export const userClounms = [
+  {
+    title: window.$t("tariffManagement.id"),
+    dataIndex: "Number",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.label"),
+    dataIndex: "label",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.source"),
+    dataIndex: "sourceName",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.TestFlowPacketName"),
+    dataIndex: "testMetadataPackagesName",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.billingCycleUser"),
+    dataIndex: "billingCycleName",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.pricingUser"),
+    dataIndex: "billingMethodName",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: window.$t("tariffManagement.pricing"),
+    dataIndex: "pricingName",
+    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("tariffManagement.endDate"),
+    dataIndex: "endDate",
+    align: "center",
+    width: 200,
+    ellipsis: true,
+  },
+]
+
 // 资费套餐
 export const planColumns = [
   {

src/views/tariffManagement/index.vue

@@ -13,7 +13,7 @@
         <template #default>{{ $t('form.Add') }}</template>
       </a-button>
     </div>
-    <a-table row-key="id" :data="tableData" :columns="columns" :pagination="pagination" :scroll="{ x: 'auto' }"
+    <a-table row-key="id" :data="tableData" :columns="role.getRole == 1?columns:userClounms" :pagination="pagination" :scroll="{ x: 'auto' }"
       @page-change="evChangePage">
       <template #id="{ record }">
         <!-- 修改 -->
@@ -61,7 +61,7 @@
 <script setup>
 import { onMounted, ref, toRefs, getCurrentInstance } from "vue";
 import { useRoute } from "vue-router";
-import { columns, planColumns, trafficSearchFrom } from "./config";
+import { columns, planColumns, trafficSearchFrom,userClounms } from "./config";
 import { deleteTariff, tariffList, UpdateTariffName } from "@/api/path/tariffManagement.api"
 import { Getdictionary, tableFunction, filterDict } from '@/mixins/index.js'
 import { useSystemStore } from '@/store/modules/systemStore'
@@ -125,7 +125,7 @@ const processData = (data) => {
     return {
       ...item,
       sourceName:filterDict(sourceList.value, item.source),
-      pricingName: item.billingMethod == 1 ? item.trafficBillingAmount + '/' + item.currency : item.pricing + '/' + item.currency,
+      pricingName: item.billingMethod == 1 ? item.trafficBillingAmount + item.currency : item.pricing  + '/' + item.currency,
       billingCycleName:filterDict(cycleist.value, item.billingCycle),
       Activated: item.trafficBilling + item.trafficBillingType,
       status: "正常",