字段修改

src/views/admin/tariffManagement/SetMeal/addSetMeal.vue

@@ -62,6 +62,7 @@
                                 }}</a-option>
                         </a-select>
                     </a-form-item>
+                    <div class="title">若更改绑定资费后已充值的用户仍使用之前的资费请谨慎操作!!</div>
                     <a-form-item label="流量大小" field="Flow" validate-trigger="change" v-if="Form.type == 2">
                         <a-input v-model="Form.flow"></a-input>
                         <a-select v-model="Form.flowUnit" style="width: 140px; margin:0 8px;">

src/views/admin/tariffManagement/SetMeal/index.vue

@@ -50,7 +50,9 @@
           <a-form-item label="套餐计划类型" field="isRecharge">
             <a-radio-group v-model="Form.isRecharge" :options="SetMealList" />
           </a-form-item>
-          <a-form-item label="充值绑定资费" >
+          <div class="title" v-if="Form.isRecharge==1">此类型下,一个套餐计划代表一个充值二维码请在下载粘贴二维码时仔细核对</div>
+          <div class="title" v-if="Form.isRecharge==2">非充值类型套餐计划,则无需用户充值,导卡成功充值后用户可直接使用流量</div>
+          <a-form-item label="默认绑定资费" >
             <a-select v-model="Form.defaultTrafficId">
               <a-option v-for="item in tariffListData" :value="item.id" :key="item.id">{{ item.label
                 }}</a-option>

src/views/admin/tariffManagement/config.js

@@ -366,7 +366,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "供应商名称",
+    label: "运应商名称",
     field: "source",
     options: [], // 默认空，后面会通过字典加载
     dict: "source",
@@ -375,7 +375,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费方式",
+    label: "流量方式",
     field: "billingMethod",
     options: [], // 默认空，后面会通过字典加载
     dict: "billingMethod",
@@ -384,7 +384,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费周期",
+    label: "账单计费周期",
     field: "BillingCycle",
     options: [], // 默认空，后面会通过字典加载
     dict: "BillingCycle",

src/views/user/SetMeal/addSetMeal.vue

@@ -26,7 +26,7 @@ import { defineEmits, defineProps, toRefs, ref, onMounted } from 'vue';
 import { CheckTariffPackages } from '@/api/path/tariffManagement.api'
 import { Getdictionary, tableFunction, filterDict } from '@/mixins/index.js'
 import Search from '@/components/Search/index.vue'
-import { columnsTarrit } from './config'
+import { columnsTarrit ,SetMealSearchForm} from './config'
 import { tariffList } from "@/api/path/tariffManagement.api"
 const props = defineProps({
     id: [Array, String]

src/views/user/tariffManagement/config.js

@@ -88,7 +88,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "供应商名称",
+    label: "运应商名称",
     field: "source",
     options: [], // 默认空，后面会通过字典加载
     dict: "source",
@@ -97,7 +97,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费方式",
+    label: "流量结算方式",
     field: "billingMethod",
     options: [], // 默认空，后面会通过字典加载
     dict: "billingMethod",
@@ -106,7 +106,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "计费周期",
+    label: "账单计费周期",
     field: "BillingCycle",
     options: [], // 默认空，后面会通过字典加载
     dict: "BillingCycle",

src/views/user/tariffManagement/index.vue

@@ -44,7 +44,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.trafficBilling + item.trafficBillingType  +'/'+  item.trafficBillingAmount + item.currency   : item.pricing + item.currency,
       billingCycleName: filterDict(cycleist.value, item.billingCycle),
       Activated: item.trafficBilling + item.trafficBillingType,
       status: "正常",