---

src/i18n/zh/flowPool.js

@@ -49,4 +49,5 @@ export default {
     tariffName:'资费名称',
     ActivatedName:'已激活/总卡数量',
     HaveBeenUsedName:'已使用/总流量(G)',
+    TimeName:'过期时间',
 }

src/views/flowPool/config.js

@@ -1,5 +1,5 @@
 export const columns = [
-    { title: window.$t('flowPool.poolNumber'), dataIndex: 'poolNumber', align: 'center', width: 200 },
+    { 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.userId'), dataIndex: 'user_id', align: 'center', width: 200 },
     // { title: window.$t('flowPool.trafficPoolType'), dataIndex: 'trafficPoolType', align: 'center', width: 200 },

src/views/flowPool/index.vue

@@ -126,8 +126,8 @@
                 </a-option>
               </a-select>
             </a-form-item>
-            <a-form-item :label="$t('flowPool.ICCIDlabel')" field="simTariffId" v-if="formState.simTariffId!==null">
-              <a-select v-model="formState.iccids"  multiple
+            <a-form-item :label="$t('flowPool.ICCIDlabel')" v-if="formState.simTariffId!==null">
+              <a-select v-model="formState.iccids" multiple
                         :placeholder="$t('flowPool.ICCIDName')">
                 <a-option v-for=" item in card" :key="item.iccid" :value="item.iccid">{{
                     item.iccid
@@ -135,9 +135,9 @@
                 </a-option>
               </a-select>
             </a-form-item>
-            <a-form-item>
-            <a-date-picker v-model="formState.expireTime" show-time
-                           :time-picker-props="{ defaultValue: '09:09:06' }" format="YYYY-MM-DD HH:mm:ss"/>
+            <a-form-item :label="$t('flowPool.TimeName')" field="expireTime">
+              <a-date-picker v-model="formState.expireTime" show-time
+                             :time-picker-props="{ defaultValue: '09:09:06' }" format="YYYY-MM-DD HH:mm:ss"/>
             </a-form-item>
             <a-form-item>
               <a-button type="primary" html-type="submit" style="margin-right: 10px;">{{
@@ -372,13 +372,12 @@ const intData = async () => {
   }
   const {data} = await trafficPoolList(param)
   dataSource.value = (data.records || []).map((item, index) => {
-    const trafficPoolType = typeList.value.find(val => val.value == item.trafficPoolType)?.label
+    // 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
     return {
       ...item,
       sourceName,// 运营商名称
-      trafficPoolType,
       trafficPoolStatus,
       poolNumber: "NR0" + (index + 1),
     }
@@ -502,7 +501,6 @@ const rules = {
   status: [{required: true, trigger: 'change',}],
   simTariffId: [{required: true, trigger: 'change',}],
   expireTime: [{required: true, trigger: 'change',}],
-  iccids: [{required: true, trigger: 'change',}],
 };
 
 // 提交
@@ -510,7 +508,7 @@ const handleSubmit = ({values, errors}) => {
   formRef.value.validate(async (errors) => {
     if (!errors) {
       if (formState.value.id) {
-        const {code, data} = await updateTrafficPool(values)
+        const {code, data} = await updateTrafficPool(formState.value)
 
         if (code == 200) {
           Message.success({
@@ -521,7 +519,7 @@ const handleSubmit = ({values, errors}) => {
           intData()
         }
       } else {
-        const {code, data} = await addTrafficPool(values)
+        const {code, data} = await addTrafficPool(formState.value)
         if (code == 200) {
           Message.success({
             content: "添加成功！",
@@ -600,6 +598,7 @@ const handleDictValue = async () => {
 
 
 watch(() => formState.value.simTariffId, val => {
+  if (val == null || val == '') return
   updateCardList({id: val}).then(res => {
     if (res.code === 200) {
       card.value = res.data
@@ -764,4 +763,4 @@ silent-expire-alarm {
     }
   }
 }
-</style>
+</style>

src/views/flowPool/rearFlowPool/index.vue

@@ -147,7 +147,7 @@
                 <a-option value="GB">GB</a-option>
               </a-select>
             </a-form-item>
-            <a-form-item>
+            <a-form-item >
               <a-button type="primary" html-type="submit" style="margin-right: 10px;">{{
                   $t('form.Confirm')
                 }}
@@ -799,4 +799,4 @@ silent-expire-alarm {
     }
   }
 }
-</style>
+</style>