修改bug字段

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="$t('tariffManagement.billingCycle')" required>
+            <a-form-item field="billingCycle" label="账单计费周期" required>
                 <a-radio-group v-model="formState.billingCycle" :options="billingCycleData">
                 </a-radio-group>
             </a-form-item>

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

@@ -5,7 +5,7 @@
         </div>
 
         <div class="addSetMeal">
-            <a-button type="primary" @click="visible = true; Edit = true">新增套餐</a-button>
+            <a-button type="primary" @click="visible = true; Edit = true;Type=true">新增套餐</a-button>
             <a-button @click="breakFlos">返回</a-button>
         </div>
 
@@ -120,9 +120,10 @@ const state = ref({
         id: "",
     },
     formRef: null,
-    Edit: true
+    Edit: true,
+    Type:true
 })
-const { pagination, visible, puyType, Currency, cyciy, tariffListData, Form, formRef, billingMethodList, Edit } = toRefs(state.value)
+const { pagination, visible, puyType, Currency, cyciy, tariffListData, Form, formRef, billingMethodList, Edit,Type } = toRefs(state.value)
 
 const rules = {
     label: [{ required: true, message: '套餐名称不能为空' }, {
@@ -170,8 +171,9 @@ const processData = (data) => {
             typeName: item.type == 1 ? '服务时长' : "购买流量",
             profitPrice: item.billingMethod == 1 ? '---' : item.profitPrice + item.currency,
             billingMethod: filterDict(billingMethodList.value, item.billingMethod),
-            costPrice: item.costPrice + item.trafficCurrency,
+            costPrice: item.billingMethod == 1? item.flow+item.flowUnit+'/'+ item.price +item.currency  : item.costPrice + item.trafficCurrency,
             oldPrice: item.billingMethod == 1 ? '---' : item.oldPrice + item.trafficCurrency,
+            
         }
     })
 }
@@ -252,6 +254,7 @@ const SetUpPackage = async (record) => {
     Form.value.type = String(Form.value.type)
     visible.value = true
     Edit.value = false
+    Type.value = false
 }
 
 const breakFlos = () => {

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

@@ -50,12 +50,15 @@
           <a-form-item label="套餐计划类型" field="isRecharge">
             <a-radio-group v-model="Form.isRecharge" :options="SetMealList" />
           </a-form-item>
-          <a-form-item label="充值绑定资费" field="defaultTrafficId" validate-trigger="blur">
+          <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>
             </a-select>
           </a-form-item>
+          <div class="title">
+            终端用户充值类该字段必填,非充值类该字段非必填
+          </div>
         </a-form>
       </div>
       <template #footer>
@@ -219,4 +222,12 @@ onMounted(async () => {
   justify-content: center;
   display: flex;
 }
+
+.title {
+    font-size: 14px;
+    color: #ccc;
+    margin-left: 120px;
+    margin-top: -15px;
+    margin-bottom: 10px;
+}
 </style>

src/views/admin/tariffManagement/config.js

@@ -152,7 +152,7 @@ export const SetMealSearchForm = [
 
 export const columnsSetMeal = [
   {
-    title: "序号",
+    title: "编号",
     dataIndex: "id",
     align: "center",
     ellipsis: true,
@@ -163,12 +163,12 @@ export const columnsSetMeal = [
     align: "center",
     ellipsis: true,
   },
-  {
-    title: "所属客户",
-    dataIndex: "userName",
-    align: "center",
-    ellipsis: true,
-  },
+  // {
+  //   title: "所属客户",
+  //   dataIndex: "userName",
+  //   align: "center",
+  //   ellipsis: true,
+  // },
   {
     title: "客户名称",
     dataIndex: "name",

src/views/lotCard/cardList/trafficUseDialog.vue

@@ -58,8 +58,8 @@
         <a-form :model="dataPackage" auto-label-width label-align="left">
           <a-row :gutter="10" wrap>
             <a-col :span="12">
-              <a-form-item label="套餐计划名称">
-                {{ Card_info?.simTerminalName }}
+              <a-form-item label="资费名称">
+                {{ Card_info?.tariffName }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -85,7 +85,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item :label="$t('lotCard.PackageExpirationDate')">
+              <a-form-item label="流量包过期日期">
                 {{ dataPackage?.expiryTime }}
               </a-form-item>
             </a-col>

src/views/user/SetMeal/config.js

@@ -1,17 +1,5 @@
 
 export const SetMealSearchForm = [
-  {
-    type: "input",
-    label: "客户名称",
-    field: "name",
-    value: "", // 双向绑定的值
-  },
-  {
-    type: "input",
-    label: "客户编号",
-    field: "num",
-    value: "", // 双向绑定的值
-  },
   {
     type: "input",
     label: "套餐计划名称",
@@ -57,7 +45,7 @@ export const SetMealSearchForm = [
 
 export const columnsSetMeal = [
   {
-    title: "序号",
+    title: "编号",
     dataIndex: "id",
     align: "center",
     ellipsis: true,
@@ -68,12 +56,12 @@ export const columnsSetMeal = [
     align: "center",
     ellipsis: true,
   },
-  {
-    title: "所属客户",
-    dataIndex: "userName",
-    align: "center",
-    ellipsis: true,
-  },
+  // {
+  //   title: "所属客户",
+  //   dataIndex: "userName",
+  //   align: "center",
+  //   ellipsis: true,
+  // },
   {
     title: "客户名称",
     dataIndex: "name",