From ac3db5c05391fa2b28c6f9cde0550c09d33404a1 Mon Sep 17 00:00:00 2001 From: zz <2510566342@qq.com> Date: Mon, 19 Aug 2024 15:02:03 +0800 Subject: [PATCH] =?UTF-8?q?8.19=20=E4=B8=8B=E5=8D=88=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hoursAndMinutes/modelTimeForm.vue | 2 +- .../hoursAndMinutes/modelTimeList.vue | 45 ++++++-- .../billingModel/index.vue | 12 ++- .../hoursAndMinutes/ElectricityTimeForm.vue | 2 +- .../components/hoursAndMinutes/index.vue | 47 +++++--- .../components/month/index.vue | 13 +-- .../electricityPriceModel/index.vue | 10 +- .../electricityPriceModel/yuanForm.vue | 4 +- .../hoursAndMinutes/index.vue | 12 +-- .../operationalModel/index.vue | 17 ++- .../operationalModel/yuanForm.vue | 102 ++++++++++++++++++ 11 files changed, 221 insertions(+), 45 deletions(-) create mode 100644 src/views/system/operationsManagement/operationalModel/yuanForm.vue diff --git a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue index 0447c9e..7ce2fcb 100644 --- a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue +++ b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeForm.vue @@ -269,7 +269,7 @@ const resetForm = () => { async function getbillingDateData(){ const data = await ElectricityDateApi.getElectricityDatenew({modeId:props.selectId})//此处传月模型的id // const data = await ElectricityDateApi.getElectricityDatePage({modelId:props.selectId}) - console.log(data,"----------") + // console.log(data,"----------") billingDateData.value=data||[] } diff --git a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue index b97dd06..960958f 100644 --- a/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue +++ b/src/views/system/operationsManagement/billingModel/components/hoursAndMinutes/modelTimeList.vue @@ -17,7 +17,25 @@ class="!w-200px" /> - + + + + + + + 搜索 重置 @@ -98,7 +116,12 @@ - + + + @@ -158,7 +181,8 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import download from '@/utils/download' import { BillingTimeApi, BillingTimeVO } from '@/api/operationsManagement/billingModel/timeModel' - + // 获取单独模型月列表名称 +import { ElectricityDateApi, ElectricityDateVO } from '@/api/operationsManagement/billingModel/monthModel' // import modelTimeForm from './hoursAndMinutes/modelTimeForm.vue' /** 换电计费分时模型 列表 */ @@ -174,6 +198,7 @@ const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 + const namelist = ref('') // 列表的加载中 const list = ref([]) // 列表的数据 // 列表的总页数 const total = ref(0) @@ -255,7 +280,12 @@ exportLoading.value = false } } - + async function getbillingDateData(){ + const data = await ElectricityDateApi.getElectricityDatenew({modeId:props.selectId})//此处传月模型的id + + namelist.value=data||[] + +} /** 初始化 **/ // onMounted(() => { // getList() @@ -264,6 +294,7 @@ watch(()=>props.selectId,async(newValue)=>{ getList() + getbillingDateData() },{ deep:true, immediate:true diff --git a/src/views/system/operationsManagement/billingModel/index.vue b/src/views/system/operationsManagement/billingModel/index.vue index 179c6e2..80951e1 100644 --- a/src/views/system/operationsManagement/billingModel/index.vue +++ b/src/views/system/operationsManagement/billingModel/index.vue @@ -33,10 +33,10 @@ 搜索 重置 - @@ -113,6 +113,8 @@ + + @@ -125,6 +127,7 @@ import download from '@/utils/download' import { BillingModelApi, BillingModelVO } from '@/api/operationsManagement/billingModel' import BillingModelForm from './BillingModelForm.vue' import billingModelDetails from './billingModelDetails.vue' +import YuanForm from './YuanForm.vue' /** 换电计费模型 列表 */ defineOptions({ name: 'BillingModel' }) @@ -182,6 +185,11 @@ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } +/** 添加*/ +const formRefone = ref() +const openFormone = (type: string, id?: number) => { + formRefone.value.open(type, id) +} /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/views/system/operationsManagement/electricityPriceModel/components/hoursAndMinutes/ElectricityTimeForm.vue b/src/views/system/operationsManagement/electricityPriceModel/components/hoursAndMinutes/ElectricityTimeForm.vue index 62eb609..6e280a8 100644 --- a/src/views/system/operationsManagement/electricityPriceModel/components/hoursAndMinutes/ElectricityTimeForm.vue +++ b/src/views/system/operationsManagement/electricityPriceModel/components/hoursAndMinutes/ElectricityTimeForm.vue @@ -63,7 +63,7 @@ - + - - + + + + @@ -74,17 +83,17 @@ - + @@ -102,6 +103,7 @@ import { } from '@/api/operationsManagement/electricityPriceModel' import ElectricityPriceForm from './ElectricityPriceForm.vue' import electricityPriceModelDetails from './electricityPriceModelDetails.vue' +import yuanForm from './yuanForm.vue' /** 电价模型 列表 */ defineOptions({ name: 'ElectricityPrice' }) @@ -159,6 +161,10 @@ const formRef = ref() const openForm = (type: string, id?: number) => { formRef.value.open(type, id) } +const formRefone = ref() +const openFormone = (type: string, id?: number) => { + formRefone.value.open(type, id) +} /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/views/system/operationsManagement/electricityPriceModel/yuanForm.vue b/src/views/system/operationsManagement/electricityPriceModel/yuanForm.vue index f6f350f..a3f5d32 100644 --- a/src/views/system/operationsManagement/electricityPriceModel/yuanForm.vue +++ b/src/views/system/operationsManagement/electricityPriceModel/yuanForm.vue @@ -10,7 +10,7 @@ - +