Ver código fonte

修改模态框值不回显问题

wxy 3 meses atrás
pai
commit
3a2a3a1fa7

+ 2 - 1
src/i18n/zh/customer.js

@@ -271,5 +271,6 @@ export default {
     userAdmin:'客户账号',
     startTime:'创建时间',
     platform:'平台',
-    client:'客户'
+    client:'客户',
+    note:'注:登录密码是明文加密,编辑并不会回显原密码,如无需修改密码,请直接保存信息即可!!'
 };

+ 31 - 27
src/views/flowPool/components/forewarning.vue

@@ -3,7 +3,7 @@ import { ref, onMounted, toRefs, toRef, watch, watchEffect } from 'vue';
 import { Message } from "@arco-design/web-vue";
 import { Getdictionary } from '@/mixins/index.js'
 import { createWarning, updateWarning } from '@/api/path/flowPool.api.js'
-import {useI18n} from 'vue-i18n'
+import { useI18n } from 'vue-i18n'
 
 const { t } = useI18n()
 const props = defineProps({
@@ -102,7 +102,6 @@ const handleSubmit = ({ values, error }) => {
       formWarning.value.clientNotifyNumber = Number(formWarning.value.clientNotifyNumber)
       formWarning.value.manageWarn = Number(formWarning.value.manageWarn)
       formWarning.value.clientSingleCardWarn = String(formWarning.value.clientSingleCardWarn)
-
       let res = formWarning.value.id ? await updateWarning(formWarning.value) : await createWarning(formWarning.value)
       if (res.code === 200) {
         Message.success(t('setting.ControlsSuccess'))
@@ -121,7 +120,6 @@ const handleDictValue = async () => {
 }
 
 watch(() => FormDataList.value, val => {
-  if (!val.id) return;
 
   formWarning.value.userId = val.userId;
   formWarning.value.poolId = val.id;
@@ -136,6 +134,9 @@ watch(() => FormDataList.value, val => {
     });
     formWarning.value.clientSingleCardWarn = Number(formWarning.value.clientSingleCardWarn)
   }
+  if (val.alert.id !== '') {
+    formWarning.value.id = val.alert.id
+  }
 
 })
 
@@ -146,18 +147,18 @@ onMounted(() => {
 </script>
 
 <template>
-  <a-modal :title="$t('forewarning.forewarning')" v-model:visible="modelValue" @cancel="resetForm" centered :maskClosable="false" :footer="null"
-    width="55%">
+  <a-modal :title="$t('forewarning.forewarning')" v-model:visible="modelValue" @cancel="resetForm" centered
+    :maskClosable="false" :footer="null" width="55%">
     <a-tabs>
       <a-tab-pane key="1" :title="$t('forewarning.PoolEarlyWarning')">
         <a-form :model="formWarning" direction="inline" ref="formRef" :rules="rules">
           <div class="form-pool-tit">
             <div class="pool-icon"></div>
-             {{ $t('forewarning.clientWarning') }}
+            {{ $t('forewarning.clientWarning') }}
           </div>
-          <a-form-item field="clientPooPc"  :label="$t('forewarning.TakeUpOf') ">
-            <a-input-number v-model="formWarning.clientPooPc" :style="{ width: '320px' }" :placeholder="$t('forewarning.PleaseEnter')" allow-clear
-              hide-button>
+          <a-form-item field="clientPooPc" :label="$t('forewarning.TakeUpOf')">
+            <a-input-number v-model="formWarning.clientPooPc" :style="{ width: '320px' }"
+              :placeholder="$t('forewarning.PleaseEnter')" allow-clear hide-button>
               <template #suffix>
                 %
               </template>
@@ -171,15 +172,16 @@ onMounted(() => {
             <a-checkbox v-model="formWarning.clientPooPcStopSwitch">{{ $t('forewarning.ShutDown') }}</a-checkbox>
           </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>
+            <a-select v-model="formWarning.clientPooPcStopNetwork" :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.clientPooPcStopNetworkSwitch">{{ $t('forewarning.NetworkOutage') }}</a-checkbox>
+            <a-checkbox v-model="formWarning.clientPooPcStopNetworkSwitch">{{ $t('forewarning.NetworkOutage')
+              }}</a-checkbox>
           </a-form-item>
           <a-form-item field="clientNotifyNumber" :label="$t('forewarning.ReminderTimes')">
-            <a-input-number v-model="formWarning.clientNotifyNumber" :style="{ width: '320px' }" :placeholder="$t('forewarning.PleaseEnter')"
-              allow-clear hide-button>
+            <a-input-number v-model="formWarning.clientNotifyNumber" :style="{ width: '320px' }"
+              :placeholder="$t('forewarning.PleaseEnter')" allow-clear hide-button>
               <template #suffix>
                 {{ $t('forewarning.TimesMonth') }}
               </template>
@@ -189,9 +191,9 @@ onMounted(() => {
             <div class="pool-icon"></div>
             {{ $t('forewarning.SingleCard') }}
           </div>
-          <a-form-item field="clientSingleCardWarn"  :label="$t('forewarning.SingleCardUsage')">
-            <a-input-number v-model="formWarning.clientSingleCardWarn" :style="{ width: '320px' }" :placeholder="$t('forewarning.PleaseEnter')"
-              allow-clear hide-button>
+          <a-form-item field="clientSingleCardWarn" :label="$t('forewarning.SingleCardUsage')">
+            <a-input-number v-model="formWarning.clientSingleCardWarn" :style="{ width: '320px' }"
+              :placeholder="$t('forewarning.PleaseEnter')" allow-clear hide-button>
               <template #suffix>
                 %
               </template>
@@ -206,19 +208,20 @@ onMounted(() => {
             <a-checkbox v-model="formWarning.clientSingleCardWarnStopSwitch">{{$t('forewarning.ShutDown')}}</a-checkbox>
           </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>
+            <a-select v-model="formWarning.clientSingleCardWarnStopNetwork"
+              :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.clientSingleCardWarnStopNetworkSwitch">{{$t('forewarning.NetworkOutage')}}</a-checkbox>
+            <a-checkbox
+              v-model="formWarning.clientSingleCardWarnStopNetworkSwitch">{{ $t('forewarning.NetworkOutage') }}</a-checkbox>
           </a-form-item>
           <div class="form-pool-tit">
             <div class="pool-icon"></div>
             {{ $t('forewarning.ManagementSide') }}
           </div>
-          <a-form-item field="manageWarn"  :label="$t('forewarning.consumed')">
-            <a-input-number v-model="formWarning.manageWarn" :style="{ width: '320px' }" :placeholder="$t('forewarning.PleaseEnter')" allow-clear
-              hide-button>
+          <a-form-item field="manageWarn" :label="$t('forewarning.consumed')">
+            <a-input-number v-model="formWarning.manageWarn" :style="{ width: '320px' }"
+              :placeholder="$t('forewarning.PleaseEnter')" allow-clear hide-button>
               <template #suffix>
                 %
               </template>
@@ -233,11 +236,12 @@ onMounted(() => {
             <a-checkbox v-model="formWarning.manageWarnSwitchStopSwitch">{{ $t('forewarning.ShutDown') }}</a-checkbox>
           </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>
+            <a-select v-model="formWarning.manageWarnStopNetwork" :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.manageWarnStopNetworkSwitch">{{ $t('forewarning.NetworkOutage') }}</a-checkbox>
+            <a-checkbox v-model="formWarning.manageWarnStopNetworkSwitch">{{ $t('forewarning.NetworkOutage')
+              }}</a-checkbox>
           </a-form-item>
           <a-form-item>
             <a-button type="primary" @click="handleSubmit" style="margin-right: 10px;">{{
@@ -249,7 +253,7 @@ onMounted(() => {
         </a-form>
       </a-tab-pane>
       <a-tab-pane key="2" title="卡预警">
-        
+
       </a-tab-pane>
     </a-tabs>
   </a-modal>

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

@@ -158,7 +158,6 @@ const dictShowModel = (type, data) => {
   typeCurrent.value = type
   record.value = data
   showAdd.value = true
-  console.log(record.value);
 }
 
 const handelForewring = (item) => {

+ 15 - 24
src/views/tariffManagement/Management/add.vue

@@ -8,7 +8,7 @@
                 <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>
@@ -41,7 +41,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>
@@ -49,7 +49,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>
@@ -57,7 +57,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>
@@ -103,7 +103,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>
@@ -112,7 +112,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, toRefs, toRef, watch } from 'vue';
+import { ref, onMounted, toRefs, toRef, watch,defineExpose } from 'vue';
 import { getDataPlanList } from "@/api/path/lotCard.api"
 import { getSTSInfoList } from '@/api/path/system.api'
 import { updateTariff, addTariff } from "@/api/path/tariffManagement.api"
@@ -129,15 +129,10 @@ const props = defineProps({
         type: Number,
         default: null
     },
-    FormDataList: {
-        type: Object,
-        default: () => { }
-    }
 })
 
 const modelValue = toRef(props, 'modelValue')
 const typeIndexSet = ref(null)
-const FormDataList = toRef(props, 'FormDataList')
 const emit = defineEmits(['update:modelValue', 'submit'])
 
 const state = ref({
@@ -248,8 +243,6 @@ const resetForm = () => {
         formState.value[key] = ''
     })
     delete formState.value.id
-    FormDataList.value = {}
-
 }
 
 const handleDataPlan = async () => {
@@ -263,7 +256,7 @@ const handleDataPlan = async () => {
     })
 }
 
-// 获取id数组
+// 获取用户
 const handleModelId = async () => {
     const param = {
         current: 1,
@@ -303,8 +296,12 @@ watch(
     { immediate: true, deep: true }
 );
 
+watch(() => props.typeIndex, val => {
+    if (val == null) return
+    typeIndexSet.value = val
+}, { immediate: true })
 
-watch(() => FormDataList.value, val => {
+const detaile = (val) => {
     if (!val.id) return
     Object.keys(formState.value).forEach(key => {
         if (val[key]) {
@@ -312,20 +309,14 @@ watch(() => FormDataList.value, val => {
         }
     })
     formState.value.id = val.id
-}, { immediate: true })
-
-
-watch(() => props.typeIndex, val => {
-    if (val == null) return
-    typeIndexSet.value = val
-
-    console.log(typeIndexSet.value);
-}, { immediate: true })
+}
 
 onMounted(() => {
     handleDictValue()
     handleModelId()
     formState.value.trafficBillingType = 'MB'
 })
+
+defineExpose({detaile})
 </script>
 <style scoped></style>

+ 13 - 26
src/views/tariffManagement/customer/NewCustomerForm.vue

@@ -13,7 +13,6 @@
             <a-input v-model="formData.zip" :placeholder="$t('customer.enterCustomerCode')" :max-length="60"
               show-word-limit />
           </a-form-item>
-
           <a-form-item field="email" :label="$t('customer.emailName')" required validate-trigger="blur">
             <a-input v-model="formData.email" :placeholder="$t('customer.emailType')" :max-length="60"
               show-word-limit />
@@ -37,20 +36,9 @@
               show-word-limit />
             <a-button type="primary" @click="generatePassword">{{ $t('customer.generatePassword') }}</a-button>
           </a-form-item>
-          <!--          role-->
-          <!--          <a-form-item field="roleIds" :label="$t('customer.roleldsName')" required validate-trigger="blur">-->
-          <!--            <a-select multiple v-model="formData.roleIds" :style="{width:'100%'}"-->
-          <!--                      :placeholder="$t('customer.roleldsNamedType')">-->
-          <!--              <a-option v-for="item of roles" :value="item.id" :label="item.name"/>-->
-          <!--            </a-select>-->
-          <!--          </a-form-item>-->
-          <!--          <a-form-item field="userType" :label="$t('customer.userTypeName')" required validate-trigger="blur">-->
-          <!--            <a-select  v-model="formData.userType" :style="{width:'100%'}"-->
-          <!--                       :placeholder="$t('customer.userTypeNameType')">-->
-          <!--              <a-option v-for="item of userTypeList" :value="item.value" :label="item.label"/>-->
-          <!--            </a-select>-->
-          <!--          </a-form-item>-->
-          <!-- Remark -->
+          <div class="note">
+            {{ $t('customer.note') }}
+          </div>
           <a-form-item field="note" :label="$t('customer.remark')" required validate-trigger="blur">
             <a-input v-model="formData.note" :placeholder="$t('customer.enterRemark')" :max-length="60"
               show-word-limit />
@@ -70,7 +58,7 @@
             <a-radio-group v-model="formData.state">
               <a-radio :value="item.value" v-for="item in userTypes">{{
                 item.value == 1 ? $t('customer.status.normal') : (item.value == 2 ? $t('customer.status.disabled') : (item.value == 3 ? $t('customer.status.pending') : $t('customer.status.suspended')))
-                }}</a-radio>
+                }} </a-radio>
             </a-radio-group>
           </a-form-item>
         </a-form>
@@ -177,15 +165,6 @@
               </template>
             </a-input-number>
           </a-form-item>
-          <!-- <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>
-                %
-              </template>
-            </a-input-number>
-            <a-radio-group v-model="formData.arriveStopOperation" :options="reachList"></a-radio-group>
-          </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>
@@ -406,7 +385,7 @@ const getRolesData = async () => {
 
 const getList = async () => {
   let res = await Getdictionary('userType')
-  userTypes.value = res.data
+  userTypes.value = res
 }
 
 watch(() => props.visible, val => {
@@ -429,4 +408,12 @@ watch(() => props.visible, val => {
   color: #999;
   margin-top: 4px;
 }
+
+.note{
+  color: #f73f3f;
+  text-align: center;
+  position: relative;
+  top: -20px;
+  left: 65px;
+}
 </style>

+ 4 - 4
src/views/tariffManagement/index.vue

@@ -60,7 +60,7 @@
     </a-modal>
 
     <Meal v-model:model-value="modealShow" :traffIds="ids" @submit="intData()" />
-    <Add v-model:model-value="visible" :type-index="typeCurrent" :FormDataList="FormDataList" @submit="intData()"></Add>
+    <Add v-model:model-value="visible" :type-index="typeCurrent"  ref="addDetaile" @submit="intData()"></Add>
   </div>
 </template>
 
@@ -82,7 +82,6 @@ const { proxy } = getCurrentInstance()
 const route = useRoute();
 const state = ref({
   searchForm: {},
-  FormDataList: {},
   currency: [],
   dataSource: [],
   pagination: {
@@ -109,7 +108,6 @@ const state = ref({
 })
 const {
   searchForm,
-  FormDataList,
   currency,
   dataSource,
   pagination,
@@ -127,6 +125,8 @@ const {
   methodList
 } = toRefs(state.value);
 
+const addDetaile = ref(null)
+
 const intData = async (item) => {
   if(item){
     searchForm.value = item
@@ -193,7 +193,7 @@ const evChangePage = (page) => {
 
 // 弹框
 const dictShowModel = (type, data) => {
-  FormDataList.value = type == 1 ? {} : data
+  addDetaile.value.detaile(data)
   typeCurrent.value = type;
   visible.value = true;
 }