字段修改 && 数据清理

src/components/Layout/components/layout/blendLeft.vue

@@ -1,6 +1,6 @@
 <template>
   <a-layout style="min-height: 100vh">
-    <a-layout-sider theme="dark" :width="140" :collapsed-width="48" collapsible :trigger="null"
+    <a-layout-sider theme="dark" :width="160" :collapsed-width="48" collapsible :trigger="null"
       @collapse="evMenuSecondLongShow" v-model:collapsed="menuSecondLongShow">
       <div class="logo-layout">
         <div class="logo">

src/i18n/zh/lotCard.js

@@ -169,7 +169,7 @@ export default {
      Controls:'操作',
      remark:'备注',
      userName:'客户名称',
-     bind:'SIM绑定的IMSI',
+     bind:'MSISDN',
      GenerationDate:'SIM生成日期',
      SimStatus:'SIM状态',
      TotalFlow:'已使用总流量',

src/i18n/zh/tariffManagement.js

@@ -45,5 +45,6 @@ export default {
     PackagePrice:'套餐价格',
     Currency:'币种',
     AddPackage:'添加套餐',
-    endDate:'有效期'
+    endDate:'有效期',
+    BillingMode:'计费方式'
 }

src/views/flowPool/components/forewarning.vue

@@ -25,21 +25,21 @@ const state = ref({
     "poolId": null, // 流量池ID
     "clientPooPc": null, // 客户端-池预警设置:端流量池预计
     "clientPooPcWarnSwitch": false, // 客户端-池预警设置:达量预警
-    "clientPooPcStop": "", // 客户端-池预警设置:达量停机
-    "clientPooPcStopSwitch": false, // 客户端-池预警设置:达量停机开关
+    // "clientPooPcStop": "", // 客户端-池预警设置:达量停机
+    // "clientPooPcStopSwitch": false, // 客户端-池预警设置:达量停机开关
     "clientPooPcStopNetwork": "", // 客户端-池预警设置:达量断网
     "clientPooPcStopNetworkSwitch": false, // 客户端-池预警设置:达量断网开关
     "clientNotifyNumber": null, // 客户端-池预警设置:通知次数 次/月
     "clientSingleCardWarn": "", // 客户端-单卡预警设置:单卡预警 M
     "clientSingleCardWarnSwitch": false, // 客户端-单卡预警设置:单卡预警 M 开关
-    "clientSingleCardWarnStop": "", // 客户端-单卡预警设置:达量停机
-    "clientSingleCardWarnStopSwitch": false, // 客户端-单卡预警设置:达量停机开关
+    // "clientSingleCardWarnStop": "", // 客户端-单卡预警设置:达量停机
+    // "clientSingleCardWarnStopSwitch": false, // 客户端-单卡预警设置:达量停机开关
     "clientSingleCardWarnStopNetwork": "", // 客户端-单卡预警设置:达量断网
     "clientSingleCardWarnStopNetworkSwitch": false, // 客户端-单卡预警设置:达量断网开关
     "manageWarn": null, // 管理端-预警设置:单卡预警 M
     "manageWarnSwitch": false, // 管理端-预警设置:单卡预警 M 开关
-    "manageWarnSwitchStop": "", // 管理端-预警设置:达量停机
-    "manageWarnSwitchStopSwitch": false, // 管理端-预警设置:达量停机开关
+    // "manageWarnSwitchStop": "", // 管理端-预警设置:达量停机
+    // "manageWarnSwitchStopSwitch": false, // 管理端-预警设置:达量停机开关
     "manageWarnStopNetwork": "", // 管理端-预警设置:达量断网
     "manageWarnStopNetworkSwitch": false // 管理端-预警设置:达量断网开关
   },
@@ -51,14 +51,14 @@ const { formWarning, formRef, earlyList } = toRefs(state.value)
 
 const rules = {
   clientPooPc: [{ required: true, trigger: 'change', }],
-  clientPooPcStop: [{ required: true, trigger: 'change', }],
+  // clientPooPcStop: [{ required: true, trigger: 'change', }],
   clientPooPcStopNetwork: [{ required: true, trigger: 'change', }],
   clientNotifyNumber: [{ required: true, trigger: 'change', }],
   clientSingleCardWarn: [{ required: true, trigger: 'change', }],
-  clientSingleCardWarnStop: [{ required: true, trigger: 'change', }],
+  // clientSingleCardWarnStop: [{ required: true, trigger: 'change', }],
   clientSingleCardWarnStopNetwork: [{ required: true, trigger: 'change', }],
   manageWarn: [{ required: true, trigger: 'change', }],
-  manageWarnSwitchStop: [{ required: true, trigger: 'change', }],
+  // manageWarnSwitchStop: [{ required: true, trigger: 'change', }],
   manageWarnStopNetwork: [{ required: true, trigger: 'change', }],
 };
 
@@ -69,21 +69,21 @@ const resetForm = () => {
     "userId": null, // 用户ID
     "clientPooPc": null, // 客户端-池预警设置:端流量池预计
     "clientPooPcWarnSwitch": false, // 客户端-池预警设置:达量预警
-    "clientPooPcStop": "", // 客户端-池预警设置:达量停机
-    "clientPooPcStopSwitch": false, // 客户端-池预警设置:达量停机开关
+    // "clientPooPcStop": "", // 客户端-池预警设置:达量停机
+    // "clientPooPcStopSwitch": false, // 客户端-池预警设置:达量停机开关
     "clientPooPcStopNetwork": "", // 客户端-池预警设置:达量断网
     "clientPooPcStopNetworkSwitch": false, // 客户端-池预警设置:达量断网开关
     "clientNotifyNumber": null, // 客户端-池预警设置:通知次数 次/月
     "clientSingleCardWarn": "", // 客户端-单卡预警设置:单卡预警 M
     "clientSingleCardWarnSwitch": false, // 客户端-单卡预警设置:单卡预警 M 开关
-    "clientSingleCardWarnStop": "", // 客户端-单卡预警设置:达量停机
-    "clientSingleCardWarnStopSwitch": false, // 客户端-单卡预警设置:达量停机开关
+    // "clientSingleCardWarnStop": "", // 客户端-单卡预警设置:达量停机
+    // "clientSingleCardWarnStopSwitch": false, // 客户端-单卡预警设置:达量停机开关
     "clientSingleCardWarnStopNetwork": "", // 客户端-单卡预警设置:达量断网
     "clientSingleCardWarnStopNetworkSwitch": false, // 客户端-单卡预警设置:达量断网开关
     "manageWarn": null, // 管理端-预警设置:单卡预警 M
     "manageWarnSwitch": false, // 管理端-预警设置:单卡预警 M 开关
-    "manageWarnSwitchStop": "", // 管理端-预警设置:达量停机
-    "manageWarnSwitchStopSwitch": false, // 管理端-预警设置:达量停机开关
+    // "manageWarnSwitchStop": "", // 管理端-预警设置:达量停机
+    // "manageWarnSwitchStopSwitch": false, // 管理端-预警设置:达量停机开关
     "manageWarnStopNetwork": "", // 管理端-预警设置:达量断网
     "manageWarnStopNetworkSwitch": false // 管理端-预警设置:达量断网开关
   }
@@ -164,12 +164,12 @@ onMounted(() => {
             </a-input-number>
             <a-checkbox v-model="formWarning.clientPooPcWarnSwitch">{{ $t('forewarning.reach') }}</a-checkbox>
           </a-form-item>
-          <a-form-item field="clientPooPcStop" :label="$t('forewarning.ShutDown')">
+          <!-- <a-form-item field="clientPooPcStop" :label="$t('forewarning.ShutDown')">
             <a-select v-model="formWarning.clientPooPcStop" :placeholder="$t('forewarning.PleaseEnter')" :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 v-model="formWarning.clientPooPcStopSwitch">{{ $t('forewarning.ShutDown') }}</a-checkbox>
-          </a-form-item>
+          </a-form-item> -->
           <a-form-item field="clientArriveStopNetwork" :label="$t('forewarning.NetworkOutage')">
             <a-select v-model="formWarning.clientPooPcStopNetwork" :placeholder="$t('forewarning.PleaseSelect')"  :style="{ width: '320px' }"
               allow-clear>
@@ -195,13 +195,13 @@ onMounted(() => {
             </a-input-number>
             <a-checkbox v-model="formWarning.clientSingleCardWarnSwitch">{{ $t('forewarning.reach') }}</a-checkbox>
           </a-form-item>
-          <a-form-item field="clientSingleCardWarnStop" :label="$t('forewarning.ShutDown')">
+          <!-- <a-form-item field="clientSingleCardWarnStop" :label="$t('forewarning.ShutDown')">
             <a-select v-model="formWarning.clientSingleCardWarnStop" :placeholder="$t('forewarning.PleaseSelect')" :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 v-model="formWarning.clientSingleCardWarnStopSwitch">{{$t('forewarning.ShutDown')}}</a-checkbox>
-          </a-form-item>
+          </a-form-item> -->
           <a-form-item field="clientSingleCardWarnStopNetwork" :label="$t('forewarning.NetworkOutage')">
             <a-select v-model="formWarning.clientSingleCardWarnStopNetwork" :placeholder="$t('forewarning.PleaseSelect')"
               :style="{ width: '320px' }" allow-clear>
@@ -222,13 +222,13 @@ onMounted(() => {
             </a-input-number>
             <a-checkbox v-model="formWarning.manageWarnSwitch">{{ $t('forewarning.reach') }}</a-checkbox>
           </a-form-item>
-          <a-form-item field="manageWarnSwitchstop" :label="$t('forewarning.ShutDown')">
+          <!-- <a-form-item field="manageWarnSwitchstop" :label="$t('forewarning.ShutDown')">
             <a-select v-model="formWarning.manageWarnSwitchStop" :placeholder="$t('forewarning.PleaseSelect')" :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 v-model="formWarning.manageWarnSwitchStopSwitch">{{ $t('forewarning.ShutDown') }}</a-checkbox>
-          </a-form-item>
+          </a-form-item> -->
           <a-form-item field="manageWarnStopNetwork" :label="$t('forewarning.NetworkOutage')">
             <a-select v-model="formWarning.manageWarnStopNetwork" :placeholder="$t('forewarning.PleaseSelect')" :style="{ width: '320px' }"
               allow-clear>

src/views/flowPool/config.js

@@ -1,21 +1,21 @@
 export const columns = [
-    { title: window.$t('flowPool.poolNumber'), dataIndex: 'id', align: 'center', width: 200 },
-    { title: window.$t('flowPool.label'), dataIndex: 'label', align: 'center', width: 200 },
+    { title: window.$t('flowPool.poolNumber'), dataIndex: 'id', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
+    { title: window.$t('flowPool.label'), dataIndex: 'label', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
     // { title: window.$t('flowPool.userId'), dataIndex: 'user_id', align: 'center', width: 200 },
     // { title: window.$t('flowPool.trafficPoolType'), dataIndex: 'trafficPoolType', align: 'center', width: 200 },
-    { title: window.$t('flowPool.trafficPoolStatus'), slotName: 'status', align: 'center', width: 200 },
+    { title: window.$t('flowPool.trafficPoolStatus'), slotName: 'status', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
     // { title: window.$t('flowPool.cardFlow'), dataIndex: 'cardFlow', align: 'center', width: 200 },
     // { title: window.$t('flowPool.UsedMonth'), dataIndex: 'UsedMonth', align: 'center', width: 200 },
     // { title: window.$t('flowPool.surplusFlow'), dataIndex: 'surplusFlow', align: 'center', width: 200 },
     // { title: window.$t('flowPool.exceededFlow'), dataIndex: 'exceededFlow', align: 'center', width: 200 },
-    { title: window.$t('flowPool.source'), dataIndex: 'sourceName', align: 'center', width: 200 },
-    { title: window.$t('flowPool.tariffName'), dataIndex: 'simTariffName', align: 'center', width: 200 },
-    { title: window.$t('flowPool.ActivatedName'),dataIndex:'Activated', align: 'center', width: 200 },
-    { title: window.$t('flowPool.HaveBeenUsedName'), dataIndex: 'HaveBeenUsed', align: 'center', width: 200 },
+    { title: window.$t('flowPool.source'), dataIndex: 'sourceName', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
+    { title: window.$t('flowPool.tariffName'), dataIndex: 'simTariffName', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
+    { title: window.$t('flowPool.ActivatedName'),dataIndex:'Activated', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
+    { title: window.$t('flowPool.HaveBeenUsedName'), dataIndex: 'HaveBeenUsed', align: 'center', width: 200 ,tooltip:true,ellipsis:true},
     // { title: window.$t('flowPool.cardRariffName'), dataIndex: 'cardRariffName', align: 'center', width: 200 },
     // { title: window.$t('flowPool.cardNum'), dataIndex: 'cardNum', align: 'center', width: 200 },
     // { title: window.$t('flowPool.totalFlow'), dataIndex: 'totalFlow', align: 'center', width: 200 },
-    { title: window.$t('flowPool.updated_at'), dataIndex: 'updatedAt', align: 'center', width: 200 },
+    { title: window.$t('flowPool.updated_at'), dataIndex: 'updatedAt', align: 'center', width: 200,tooltip:true,ellipsis:true },
     {
         title: window.$t('global.common.operations'),
         dataIndex: 'id',

src/views/lotCard/cardList/config.js

@@ -1,6 +1,6 @@
 export const columns = [
     { title: window.$t('lotCard.iccid'), dataIndex: 'iccid', align: 'center', ellipsis: true },
-    { title: window.$t('lotCard.source'), dataIndex: 'sourceName', align: 'center', ellipsis: true },
+    { title: window.$t('lotCard.source'), dataIndex: 'source', align: 'center', ellipsis: true },
     { title: window.$t('lotCard.userName'), dataIndex: 'userName', align: 'center', ellipsis: true },
     { title: 'IMSI', dataIndex: 'currentImsi', align: 'center', ellipsis: true },
     { title: window.$t('lotCard.bind'), dataIndex: 'currentImsi', align: 'center', ellipsis: true },

src/views/lotCard/cardList/index.vue

@@ -43,8 +43,7 @@
       </a-space>
     </div> -->
 
-    <a-table row-key="iccid" :data="dataSource" :columns="columns" :pagination="pagination" :scroll="{ x: 'auto' }"
-      @page-change="evChangePage">
+    <a-table row-key="iccid" :data="dataSource" :columns="columns" :pagination="false" :scroll="{ x: 'auto' }">
       <template #poolNum="{ record }">
         <span>{{ record.poolName }}</span>
         <br />
@@ -59,6 +58,10 @@
       </template>
 
     </a-table>
+
+    <div class="pagtion">
+      <a-pagination :total="pagination.total"  show-total show-jumper show-page-size @change="evChangePage" @page-size-change="pagesChange"/>
+    </div>
     <!-- 查看流量消耗 -->
     <trafficUseDialog ref="trafficUseDialogRef" @submit="intData()" />
     <Add v-model="showAdd"></Add>
@@ -106,13 +109,13 @@ const intData = async () => {
   const { data } = await cardInfoList(param)
   dataSource.value = (data.records || []).map((item, index) => {
     const payType = item.payType == 0 ? 'Prepay' : 'Postpay';
-    const soure = soureName.find(val => val.value == item.source)?.label
+    // const soure = soureName.find(val => val.value == item.source)?.label
     const iccidStatus = accountStatusName.find(val => val.value == item.iccidStatus)?.label
     return {
       ...item,
       ...item.Info,
       payType: payType,
-      sourceName: soure,
+      // sourceName: soure,
       iccidStatus,
       forewarningStatus: '正常',
       SilenceEndtime: '一个月',
@@ -136,6 +139,11 @@ const evChangePage = (page) => {
   intData()
 }
 
+const pagesChange = (size) => {
+  pagination.value.pageSize = size
+  intData()
+}
+
 
 const handleSearch = () => {
   formRef.value.validate((errors) => {
@@ -148,7 +156,7 @@ const handleSearch = () => {
 
 // 获取字典
 const handleDictValue = async () => {
-  sourceList.value = await Getdictionary('source')
+  // sourceList.value = await Getdictionary('source')
   statusList.value = await Getdictionary('mainCardStatus')
   serviceList.value = await Getdictionary('activationPackageMethod')
 }
@@ -165,6 +173,11 @@ onMounted(() => {
 </script>
 
 <style scoped lang="less">
+.pagtion{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 30px;
+}
 .head-title-right {
   .m-r-10 {
     margin-right: 10px;

src/views/lotCard/cardList/trafficUseDialog.vue

@@ -17,11 +17,11 @@
                 {{ Card_info.currentImsi }}
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item :label="$t('lotCard.currencyBalance')">
                 {{ Card_info.moneyBalances }}
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item :label="$t('lotCard.ActivationDate')">
                 {{ Card_info.activeTime }}

src/views/order/BuyCard/detaile.vue

@@ -24,18 +24,6 @@
                     <div class="item-content">{{ tariffForm.label }}</div>
                 </div>
             </div>
-            <div class="detail-item-box">
-                <div class="detail-item">
-                    <div class="item-label">{{ $t('order.MinimumSubscriptionPeriod') }}</div>
-                    <div class="item-content">{{ tariffForm.settlementCycle?.split('~')[0] }} {{ $t('order.Months') }}
-                    </div>
-                </div>
-                <div class="detail-item">
-                    <div class="item-label">{{ $t('order.MaximumSubscriptionPeriod') }}</div>
-                    <div class="item-content">{{ tariffForm.settlementCycle?.split('~')[1] }} {{ $t('order.Months') }}
-                    </div>
-                </div>
-            </div>
             <div class="detail-item-box">
                 <div class="detail-item">
                     <div class="item-label">{{ $t('order.BillingMode') }}</div>
@@ -51,12 +39,6 @@
                     <div class="item-label">{{ $t('order.CardType') }}</div>
                     <div class="item-content">{{ FormDataList.cardType }}</div>
                 </div>
-                <div class="detail-item">
-                    <div class="item-label">{{ $t('order.StandardPrice') }}</div>
-                    <div class="item-content">{{ tariffForm.pricingName }}</div>
-                </div>
-            </div>
-            <div class="detail-item-box">
                 <div class="detail-item">
                     <div class="item-label">{{ $t('order.FlowPool') }}</div>
                     <div class="item-content">{{ FormDataList.isTrafficPool == 1 ? $t('lotCard.Yes') : $t('lotCard.No')
@@ -107,7 +89,7 @@ import { AcquireOrdertariff, DistributionCard, ReturntheOrderCard } from '@/api/
 import { Message } from '@arco-design/web-vue';
 import Upload from "@/components/upload/index.vue";
 import { Getdictionary } from '@/mixins/index.js'
-import {downloadFile} from '@/utils/xlsx.js'
+import { downloadFile } from '@/utils/xlsx.js'
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n();
 const props = defineProps({
@@ -218,9 +200,9 @@ const updatePageData = () => {
     dataDetail.value = tableDataList.value.slice(startIndex, endIndex);
 };
 
-const DownloadSampleFile = ()=>{
+const DownloadSampleFile = () => {
     // 下载示例文件
-    downloadFile(['ICCID'],[['8968099000011939']])
+    downloadFile(['ICCID'], [['8968099000011939']])
 }
 
 onMounted(async () => {

src/views/tariffManagement/Management/add.vue

@@ -8,16 +8,17 @@
                 <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>
             <template v-if="formState.source">
                 <a-form-item :label="$t('tariffManagement.simDataPlanId')" field="simDataPlanId">
-                    <a-select v-model="formState.simDataPlanId" :disabled="typeIndex!==1">
-                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.id">{{ $t('tariffManagement.DataPackage') }} {{
-                            item.productName
-                        }}
+                    <a-select v-model="formState.simDataPlanId" :disabled="typeIndex !== 1">
+                        <a-option v-for=" (item, index) in planList" :key="item.id" :value="item.id">{{
+                            $t('tariffManagement.DataPackage') }} {{
+                                item.productName
+                            }}
                         </a-option>
                     </a-select>
                 </a-form-item>
@@ -29,7 +30,7 @@
                 <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>
@@ -37,7 +38,7 @@
                 <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>
@@ -45,7 +46,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>
@@ -77,7 +78,7 @@
             <a-form-item :label="$t('tariffManagement.MRCName')" field="mrcAmount">
                 <a-input v-model="formState.mrcAmount">
                     <template #append>
-                        {{ formState.currency === '0' ? $t('setting.yuan') : $t('setting.USD')}}
+                        {{ formState.currency === '0' ? $t('setting.yuan') : $t('setting.USD') }}
                     </template>
                 </a-input>
             </a-form-item>
@@ -91,7 +92,7 @@
             <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>
@@ -106,8 +107,8 @@ import { getSTSInfoList } from '@/api/path/system.api'
 import { updateTariff, addTariff } from "@/api/path/tariffManagement.api"
 import { Getdictionary } from '@/mixins/index.js'
 import { Message } from '@arco-design/web-vue'
-import {useI18n} from 'vue-i18n'
-const {t} = useI18n();
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n();
 const props = defineProps({
     modelValue: {
         type: Boolean,
@@ -156,7 +157,7 @@ const state = ref({
         "mrcAmount": '',
         // 网络接入费
         "networkAccessFee": '',
-        "endDate":''
+        "endDate": ''
     },
     sourceList: [],
     userIdList: [],
@@ -267,21 +268,13 @@ const handleDictValue = async () => {
     billingCycleData.value = await Getdictionary('Billingcycle')
 }
 
-watch(() => modelValue.value, val => {
-    if (val) {
-        handleDictValue()
-        handleModelId()
-        formState.value.billingMethod = '1'
-        formState.value.trafficBillingType = 'MB'
-    }
-})
 
 watch(() => formState.value.billingMethod, val => {
     if (val == 2) {
         formState.value.trafficBillingType = ''
         formState.value.trafficBilling = ''
         formState.value.trafficBillingAmount = ''
-    }else{
+    } else {
         formState.value.pricing = ''
     }
 })
@@ -294,7 +287,7 @@ watch(
             handleDataPlan()
         }
     },
-    { immediate: true,deep:true }
+    { immediate: true, deep: true }
 );
 
 
@@ -306,6 +299,14 @@ watch(() => FormDataList.value, val => {
         }
     })
     formState.value.id = val.id
-},{deep:true})
+
+    console.log(val);
+}, { immediate: true })
+
+onMounted(() => {
+    handleDictValue()
+    handleModelId()
+    formState.value.trafficBillingType = 'MB'
+})
 </script>
 <style scoped></style>

src/views/tariffManagement/config.js

@@ -7,14 +7,15 @@ export let columns = [
     // { title: window.$t('tariffManagement.trafficType'), dataIndex: 'trafficTypeName', align: 'center', width: 200 },
     // { 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.BillingMode'), dataIndex: 'billingMethodName', align: 'center', width: 200, ellipsis: true },
     // { title: window.$t('tariffManagement.bagSize'), 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.endDate'), dataIndex: 'endDate', align: 'center', width: 200, ellipsis: true },
     { title: window.$t('tariffManagement.ActivatedNames'), dataIndex: 'Activated', 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 },
     {
         title: window.$t('global.common.operations'),
         dataIndex: 'id',

src/views/tariffManagement/customer/NewCustomerForm.vue

@@ -178,7 +178,7 @@
               </template>
             </a-input-number>
           </a-form-item>
-          <a-form-item field="arriveStop" :label="$t('forewarning.ShutDown')" required validate-trigger="blur">
+          <!-- <a-form-item field="arriveStop" :label="$t('forewarning.ShutDown')" required validate-trigger="blur">
             <a-input-number v-model="formData.arriveStop" :style="{ width: '320px' }"
               :placeholder="$t('form.datapoolForm.pleaseEnter')" allow-clear hide-button>
               <template #suffix>
@@ -186,7 +186,7 @@
               </template>
             </a-input-number>
             <a-radio-group v-model="formData.arriveStopOperation" :options="reachList"></a-radio-group>
-          </a-form-item>
+          </a-form-item> -->
           <a-form-item field="arriveNetwork" :label="$t('forewarning.NetworkOutage')" required validate-trigger="blur">
             <a-input-number v-model="formData.arriveNetwork" :style="{ width: '320px' }"
               :placeholder="$t('form.datapoolForm.pleaseEnter')" allow-clear hide-button>
@@ -302,7 +302,7 @@ const formData = ref({
   taxpayerQualification: "",
   amountWarn: '',
   arriveWarn: '',
-  arriveStop: '',
+  // arriveStop: '',
   arriveNetwork: '',
   arriveStopOperation: '',
   arriveStopNetwork: '',

src/views/tariffManagement/index.vue

@@ -19,14 +19,16 @@
         <template #default>{{ $t('form.Add') }}</template>
       </a-button>
     </div>
-    <a-table row-key="id" :data="dataSource" :columns="columns"
-      :pagination="pagination" :scroll="{ x: 'auto' }" @page-change="evChangePage">
+    <a-table row-key="id" :data="dataSource" :columns="columns" :pagination="pagination" :scroll="{ x: 'auto' }"
+      @page-change="evChangePage">
       <template #id="{ record }">
         <!-- 修改 -->
-        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="dictShowModel(2, record)" v-if="role.getRole == 1">{{
-          $t('form.alter')
-        }}</a>
-        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="meal(record)">{{ $t('tariffManagement.SetMeal') }}</a>
+        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="dictShowModel(2, record)"
+          v-if="role.getRole == 1">{{
+            $t('form.alter')
+          }}</a>
+        <a class="a-link" href="javascript:;" style="margin-right: 1rem" @click="meal(record)">{{
+          $t('tariffManagement.SetMeal') }}</a>
         <!-- 删除 -->
         <a-popconfirm :content="$t('form.Delete')" :ok-text="$t('form.Confirm')" :cancel-text="$t('form.Cancel')"
           @ok="handleDel(record.id)">
@@ -39,7 +41,8 @@
 
 
 
-    <a-modal width="70%" :visible="planVisible" :title="$t('tariffManagement.SelectiveTrafficPacket')" @ok="handleSubmitPlan" @cancel="handleCancel">
+    <a-modal width="70%" :visible="planVisible" :title="$t('tariffManagement.SelectiveTrafficPacket')"
+      @ok="handleSubmitPlan" @cancel="handleCancel">
       <!-- 搜索条件区 -->
       <div class="search-section">
         <a-form :model="formData" layout="inline">
@@ -77,9 +80,9 @@ import { useSystemStore } from '@/store/modules/systemStore'
 import Meal from './Management/meal.vue'
 import Add from './Management/add.vue'
 import Search from '@/components/Search/index.vue'
-import {useI18n} from 'vue-i18n'
+import { useI18n } from 'vue-i18n'
 import { Message } from '@arco-design/web-vue'
-const {t} = useI18n();
+const { t } = useI18n();
 const role = useSystemStore()
 const { proxy } = getCurrentInstance()
 const route = useRoute();
@@ -133,7 +136,8 @@ const state = ref({
     showCheckedAll: true,
     onlyCurrent: false,
   },
-  ids: null
+  ids: null,
+  methodList: []
 })
 const {
   searchForm,
@@ -151,7 +155,8 @@ const {
   formData,
   selectedKeysPlan,
   rowSelectionPlan,
-  ids
+  ids,
+  methodList
 } = toRefs(state.value);
 
 const intData = async () => {
@@ -165,16 +170,27 @@ const intData = async () => {
     const sourceName = sourceList.value.find(val => val.value == item.source)?.label
     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
+    const Activated = item.trafficBilling + item.trafficBillingType
     const bagSize = item.pricing + '/' + item.mrcAmount + '/' + item.networkAccessFee
+    const billingMethodName = methodList.value.find(val => val.value == item.billingMethod)?.label
+
+    let pricingName;
+
+    if (item.billingMethod == 1) {
+      pricingName = item.trafficBillingAmount + pricingCurrty
+    } else if (item.billingMethod == 2) {
+      pricingName = item.pricing + pricingCurrty
+    }
     return {
       ...item,
       sourceName,
-      pricingName: item.pricing !== '' ? item.pricing + '/' + pricingCurrty : '',
+      pricingName,
       billingCycleName,
       Activated: Activated,
       status: "正常",
-      bagSize
+      bagSize,
+      billingMethodName,
+      id: index + 1
     }
   })
   pagination.value.total = data.total
@@ -228,6 +244,7 @@ const handleDictValue = async () => {
   sourceList.value = await Getdictionary('source')
   cycleist.value = await Getdictionary('Billingcycle')
   currency.value = await Getdictionary('currencyType')
+  methodList.value = await Getdictionary('billingMethod')
 }
 
 const meal = (data) => {