吴sir 4 ماه پیش
والد
کامیت
e1440c53f4

+ 1 - 1
src/views/flowPool/config.js

@@ -10,7 +10,7 @@ export const columns = [
     // { 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: 'index', align: 'center', width: 200 },
+    { title: window.$t('flowPool.ActivatedName'),dataIndex:'Activated', align: 'center', width: 200 },
     { title: window.$t('flowPool.HaveBeenUsedName'), dataIndex: 'index', align: 'center', width: 200 },
     // { title: window.$t('flowPool.cardRariffName'), dataIndex: 'cardRariffName', align: 'center', width: 200 },
     // { title: window.$t('flowPool.cardNum'), dataIndex: 'cardNum', align: 'center', width: 200 },

+ 2 - 1
src/views/flowPool/index.vue

@@ -375,11 +375,12 @@ const intData = async () => {
     // const trafficPoolType = typeList.value.find(val => val.value == item.trafficPoolType)?.label
     const trafficPoolStatus = trafficList.value.find(val => val.value == item.status)?.label
     const sourceName = sourceList.value.find(val => val.value == item.source)?.label
+    const Activated = 0 + '/' + item.iccids.length
     return {
       ...item,
       sourceName,// 运营商名称
       trafficPoolStatus,
-      index:0,
+      Activated: Activated,
       poolNumber: "NR0" + (index + 1),
     }
   })

+ 4 - 2
src/views/flowPool/rearFlowPool/index.vue

@@ -369,18 +369,20 @@ const intData = async () => {
     current: pagination.value.current,
     size: pagination.value.pageSize,
     ...searchForm.value,
-    type: 2
+    trafficPoolType: '2',
+    type:2
   }
   const {data} = await trafficPoolList(param)
   dataSource.value = (data.records || []).map((item, index) => {
     // const trafficPoolType = typeList.value.find(val => val.value == item.trafficPoolType)?.label
     const trafficPoolStatus = trafficList.value.find(val => val.value == item.status)?.label
     const sourceName = sourceList.value.find(val => val.value == item.source)?.label
+    const Activated = 0 + '/' + item.iccids.length
     return {
       ...item,
       sourceName,// 运营商名称
       // trafficPoolType,
-      index:0,
+      Activated:Activated,
       trafficPoolStatus,
     }
   })

+ 3 - 1
src/views/tariffManagement/index.vue

@@ -454,7 +454,9 @@ const handleDataPlan = async () => {
 // 取消
 const resetForm = () => {
   visible.value = false;
-  formRef.value.resetFields();
+  Object.keys(formState.value).forEach(key=>{
+    formState.value[key]= ''
+  })
 }
 
 // --------------------------------------------------------