|
@@ -29,34 +29,39 @@
|
|
|
<el-table v-loading="loading" :data="calcList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
<!-- <el-table-column label="统计ID" align="center" prop="calcId" />-->
|
|
|
- <el-table-column label="日期" align="center" prop="dataDate" width="180">
|
|
|
+ <el-table-column label="日期" align="center" width="180">
|
|
|
<template #default="scope">
|
|
|
- <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
|
|
|
+ <span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="费用(元/天)" align="center">
|
|
|
- <el-table-column label="总费用" align="center" prop="price"/>
|
|
|
+ <el-table-column label="总费用" align="center" prop="totalPrice"/>
|
|
|
<el-table-column label="电费" align="center">
|
|
|
<template #default="scope">
|
|
|
- <span class="clickable-text" @click="df(scope.row)">{{ parseFloat(scope.row.d.price).toFixed(2) }}</span>
|
|
|
+ <span class="clickable-text" @click="df(scope.row)">{{ parseFloat(scope.row.dPrice).toFixed(2) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="水费" align="center">
|
|
|
<template #default="scope">
|
|
|
- {{ parseFloat(scope.row.s.price).toFixed(2) }}
|
|
|
-<!-- <span class="clickable-text" @click="sf(scope.row)">{{ parseFloat(scope.row.s.price).toFixed(2) }}</span>-->
|
|
|
+ {{ parseFloat(scope.row.sPrice).toFixed(2) }}
|
|
|
+ <!-- <span class="clickable-text" @click="sf(scope.row)">{{ parseFloat(scope.row.s.price).toFixed(2) }}</span>-->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="气费" align="center">
|
|
|
<template #default="scope">
|
|
|
- <span class="clickable-text" @click="qf(scope.row)">{{ parseFloat(scope.row.q.price).toFixed(2) }}</span>
|
|
|
+ <span class="clickable-text" @click="qf(scope.row)">{{ parseFloat(scope.row.qPrice).toFixed(2) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="总米数(米/天)" align="center" prop="aPrice"/>
|
|
|
- <el-table-column label="单位能耗(米/元)" align="center" prop=""/>
|
|
|
- <el-table-column label="重量(KG/天)" align="center" prop=""/>
|
|
|
- <el-table-column label="单位能耗(KG/元)" align="center" prop=""/>
|
|
|
+ <el-table-column label="总米数(米/天)" align="center" prop="length"/>
|
|
|
+ <el-table-column label="单位能耗(米/元)" align="center" prop="lengthPrice"/>
|
|
|
+ <el-table-column label="重量(KG/天)" align="center" prop="weight"/>
|
|
|
+ <el-table-column label="单位能耗(KG/元)" align="center" prop="weightPrice"/>
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <template #default="scope">
|
|
|
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">填报</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<el-dialog :title="d_title" v-model="d_open" width="1000px" append-to-body>
|
|
@@ -74,6 +79,122 @@
|
|
|
<el-table-column label="用能" prop="yn"></el-table-column>
|
|
|
</el-table>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!-- 添加或修改染整月统计对话框 -->
|
|
|
+ <el-dialog :title="title" v-model="open" width="500px" append-to-body>
|
|
|
+ <el-form ref="rzMonthRef" :model="form" :rules="rules" label-width="150px">
|
|
|
+ <el-form-item label="日期" prop="dataDate">
|
|
|
+ <el-date-picker clearable
|
|
|
+ v-model="form.dataDate"
|
|
|
+ type="date"
|
|
|
+ value-format="YYYY-MM-DD" disabled
|
|
|
+ placeholder="请选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="总费用(元)" prop="totalPrice">
|
|
|
+ <el-input v-model="form.totalPrice" placeholder="请输入总费用" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="总米数(米)" prop="length">
|
|
|
+ <el-input-number v-model="form.length" placeholder="请输入总米数"/>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <el-form-item label="平均每米价" prop="lengthPrice">-->
|
|
|
+<!-- <el-input v-model="form.lengthPrice" placeholder="请输入平均每米价"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item label="总重量(KG)" prop="weight">
|
|
|
+ <el-input-number v-model="form.weight" placeholder="请输入总重量"/>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <el-form-item label="平均每KG价" prop="weightPrice">-->
|
|
|
+<!-- <el-input v-model="form.weightPrice" placeholder="请输入平均每KG价"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item label="电总用量(kWh)" prop="dUse">
|
|
|
+ <el-input v-model="form.dUse" placeholder="请输入电总用量" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="电费(元)" prop="dPrice">
|
|
|
+ <el-input v-model="form.dPrice" placeholder="请输入电费" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+<!-- <el-form-item label="前整用量" prop="qzUse">-->
|
|
|
+<!-- <el-input v-model="form.qzUse" placeholder="请输入前整用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="前整电费" prop="qzPrice">-->
|
|
|
+<!-- <el-input v-model="form.qzPrice" placeholder="请输入前整电费"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="前整峰电用量" prop="qzFUse">-->
|
|
|
+<!-- <el-input v-model="form.qzFUse" placeholder="请输入前整峰电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="前整谷电用量" prop="qzGUse">-->
|
|
|
+<!-- <el-input v-model="form.qzGUse" placeholder="请输入前整谷电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="前整平电用量" prop="qzPUse">-->
|
|
|
+<!-- <el-input v-model="form.qzPUse" placeholder="请输入前整平电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="前整尖峰用量" prop="qzJfUse">-->
|
|
|
+<!-- <el-input v-model="form.qzJfUse" placeholder="请输入前整尖峰用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整用量" prop="hzUse">-->
|
|
|
+<!-- <el-input v-model="form.hzUse" placeholder="请输入后整用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整电费" prop="hzPrice">-->
|
|
|
+<!-- <el-input v-model="form.hzPrice" placeholder="请输入后整电费"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整峰电用量" prop="hzFUse">-->
|
|
|
+<!-- <el-input v-model="form.hzFUse" placeholder="请输入后整峰电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整谷电用量" prop="hzGUse">-->
|
|
|
+<!-- <el-input v-model="form.hzGUse" placeholder="请输入后整谷电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整平电用量" prop="hzPUse">-->
|
|
|
+<!-- <el-input v-model="form.hzPUse" placeholder="请输入后整平电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="后整尖峰用量" prop="hzJfUse">-->
|
|
|
+<!-- <el-input v-model="form.hzJfUse" placeholder="请输入后整尖峰用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染用量" prop="yrUse">-->
|
|
|
+<!-- <el-input v-model="form.yrUse" placeholder="请输入印染用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染电费" prop="yrPrice">-->
|
|
|
+<!-- <el-input v-model="form.yrPrice" placeholder="请输入印染电费"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染峰电用量" prop="yrFUse">-->
|
|
|
+<!-- <el-input v-model="form.yrFUse" placeholder="请输入印染峰电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染谷电用量" prop="yrGUse">-->
|
|
|
+<!-- <el-input v-model="form.yrGUse" placeholder="请输入印染谷电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染平电用量" prop="yrPUse">-->
|
|
|
+<!-- <el-input v-model="form.yrPUse" placeholder="请输入印染平电用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- <el-form-item label="印染尖峰用量" prop="yrJfUse">-->
|
|
|
+<!-- <el-input v-model="form.yrJfUse" placeholder="请输入印染尖峰用量"/>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+ <el-form-item label="工业水费(元)" prop="sPrice">
|
|
|
+ <el-input v-model="form.sPrice" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="工业水用量(m³)" prop="sUse">
|
|
|
+ <el-input v-model="form.sUse" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="蒸汽费用(元)" prop="qPrice">
|
|
|
+ <el-input v-model="form.qPrice" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="低压蒸汽用量(GJ)" prop="qLowUse">
|
|
|
+ <el-input v-model="form.qLowUse" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="低压蒸汽费用(元)" prop="qLowPrice">
|
|
|
+ <el-input v-model="form.qLowPrice" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="中亚蒸汽用量(GJ)" prop="qMidUse">
|
|
|
+ <el-input-number v-model="form.qMidUse" placeholder="请输入中亚蒸汽用量"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="中亚蒸汽费用(元)" prop="qMidPrice">
|
|
|
+ <el-input v-model="form.qMidPrice" disabled/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template #footer>
|
|
|
+ <div class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
+ <el-button @click="cancel">取 消</el-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
|
|
|
|
|
@@ -93,7 +214,7 @@
|
|
|
</style>
|
|
|
|
|
|
<script setup name="MonthCalc">
|
|
|
-import {addCalc, delCalc, getCalc, listCalcMonth, updateCalc} from "@/api/ws/calc";
|
|
|
+import {addRzMonth, getRzMonth, listRzMonth, updateRzMonth} from "@/api/ws/rzMonth";
|
|
|
|
|
|
const {proxy} = getCurrentInstance();
|
|
|
|
|
@@ -109,16 +230,15 @@ const month = ref("");
|
|
|
const d_title = ref("");
|
|
|
const d_open = ref(false);
|
|
|
const d_form = ref({});
|
|
|
-const s_title = ref("");
|
|
|
-const s_open = ref(false);
|
|
|
-const s_form = ref({});
|
|
|
+const title = ref("");
|
|
|
+const open = ref(false);
|
|
|
const q_title = ref("");
|
|
|
const q_open = ref(false);
|
|
|
const q_form = ref({});
|
|
|
const originalData = ref({});
|
|
|
-
|
|
|
+const price = ref({});
|
|
|
const data = reactive({
|
|
|
-
|
|
|
+ form: {},
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
@@ -146,41 +266,27 @@ const {queryParams, form, rules} = toRefs(data);
|
|
|
function df(row) {
|
|
|
d_open.value = true;
|
|
|
d_form.value = [
|
|
|
- {type: "总电(kWh)", qz: row.d.qz.use, hz: row.d.hz.use, yr: row.d.yr.use},
|
|
|
- {type: "峰电(kWh/"+row.elecPrice.pricePeak+")", qz: row.d.qz.fuse, hz: row.d.hz.fuse, yr: row.d.yr.fuse},
|
|
|
- {type: "谷电(kWh/"+row.elecPrice.priceValley+")", qz: row.d.qz.guse, hz: row.d.hz.guse, yr: row.d.yr.guse},
|
|
|
- {type: "平电(kWh/"+row.elecPrice.priceFlat+")", qz: row.d.qz.puse, hz: row.d.hz.puse, yr: row.d.yr.puse},
|
|
|
- {type: "尖峰(kWh/"+row.elecPrice.priceSuperPeak+")", qz: row.d.qz.jfUse, hz: row.d.hz.jfUse, yr: row.d.yr.jfUse},
|
|
|
- {type: "电费(元/天)", qz: row.d.qz.price, hz: row.d.hz.price, yr: row.d.yr.price},
|
|
|
+ {type: "总电(kWh)", qz: row.qzUse, hz: row.hzUse, yr: row.yrUse},
|
|
|
+ {type: "峰电(kWh/" + price.value.pricePeak + ")", qz: row.qzFUse, hz: row.hzFUse, yr: row.yrFUse},
|
|
|
+ {type: "谷电(kWh/" + price.value.priceValley + ")", qz: row.qzGUse, hz: row.hzGUse, yr: row.yrGUse},
|
|
|
+ {type: "平电(kWh/" + price.value.priceFlat + ")", qz: row.qzPUse, hz: row.hzPUse, yr: row.yrPUse},
|
|
|
+ {type: "尖峰(kWh/" + price.value.priceSuperPeak + ")", qz: row.qzJfUse, hz: row.hzJfUse, yr: row.yrJfUse},
|
|
|
+ {type: "电费(元/天)", qz: row.qzPrice, hz: row.hzPrice, yr: row.yrPrice},
|
|
|
]
|
|
|
|
|
|
- d_title.value = "电费明细(" + new Date(row.date).Format('yyyy-MM-dd') + ")";
|
|
|
+ d_title.value = "电费明细(" + new Date(row.dataDate).Format('yyyy-MM-dd') + ")";
|
|
|
}
|
|
|
|
|
|
-// function sf(row) {
|
|
|
-// d_open.value = true;
|
|
|
-// d_form.value = [
|
|
|
-// {type: "总电(kWh)", qz: row.d.qz.use, hz: row.d.hz.use, yr: row.d.yr.use},
|
|
|
-// {type: "峰电(kWh/"+row.elecPrice.pricePeak+")", qz: row.d.qz.fuse, hz: row.d.hz.fuse, yr: row.d.yr.fuse},
|
|
|
-// {type: "谷电(kWh/"+row.elecPrice.priceValley+")", qz: row.d.qz.guse, hz: row.d.hz.guse, yr: row.d.yr.guse},
|
|
|
-// {type: "平电(kWh/"+row.elecPrice.priceFlat+")", qz: row.d.qz.puse, hz: row.d.hz.puse, yr: row.d.yr.puse},
|
|
|
-// {type: "尖峰(kWh/"+row.elecPrice.priceSuperPeak+")", qz: row.d.qz.jfUse, hz: row.d.hz.jfUse, yr: row.d.yr.jfUse},
|
|
|
-// {type: "电费(元/天)", qz: row.d.qz.price, hz: row.d.hz.price, yr: row.d.yr.price},
|
|
|
-// ]
|
|
|
-//
|
|
|
-// d_title.value = "电费明细(" + new Date(row.date).Format('yyyy-MM-dd') + ")";
|
|
|
-// }
|
|
|
-
|
|
|
function qf(row) {
|
|
|
q_open.value = true;
|
|
|
q_form.value = [
|
|
|
- {type: "低压蒸汽(GJ/"+row.q.lowUnitPrice+")",yn:row.q.lowUse},
|
|
|
- {type: "低压费用(元/天)", yn: row.q.lowPrice,},
|
|
|
- {type: "中压蒸汽(GJ/"+row.q.midUnitPrice+")",yn:row.q.midUse},
|
|
|
- {type: "中亚费用(元/天)", yn: row.q.midPrice},
|
|
|
+ {type: "低压蒸汽(GJ/" + price.value.lowStreamPrice + ")", yn: row.qLowUse},
|
|
|
+ {type: "低压费用(元/天)", yn: row.qLowPrice},
|
|
|
+ {type: "中压蒸汽(GJ/" + price.value.midStreamPrice + ")", yn: row.qMidUse},
|
|
|
+ {type: "中亚费用(元/天)", yn: row.qMidPrice},
|
|
|
]
|
|
|
|
|
|
- q_title.value = "气费明细(" + new Date(row.date).Format('yyyy-MM-dd') + ")";
|
|
|
+ q_title.value = "气费明细(" + new Date(row.dataDate).Format('yyyy-MM-dd') + ")";
|
|
|
}
|
|
|
|
|
|
/** 查询能源统计列表 */
|
|
@@ -190,9 +296,10 @@ function getList() {
|
|
|
if (null != month && '' != month) {
|
|
|
queryParams.value.params["month"] = month.value;
|
|
|
}
|
|
|
- listCalcMonth(queryParams.value).then(response => {
|
|
|
- calcList.value = response.rows;
|
|
|
- total.value = response.total;
|
|
|
+ listRzMonth(queryParams.value).then(response => {
|
|
|
+ calcList.value = response.data.list.rows;
|
|
|
+ total.value = response.data.list.total;
|
|
|
+ price.value = response.data.price;
|
|
|
loading.value = false;
|
|
|
});
|
|
|
}
|
|
@@ -215,31 +322,70 @@ function handleSelectionChange(selection) {
|
|
|
single.value = selection.length != 1;
|
|
|
multiple.value = !selection.length;
|
|
|
}
|
|
|
-
|
|
|
+// 表单重置
|
|
|
+function reset() {
|
|
|
+ form.value = {
|
|
|
+ calcId: null,
|
|
|
+ dataDate: null,
|
|
|
+ totalPrice: null,
|
|
|
+ length: null,
|
|
|
+ lengthPrice: null,
|
|
|
+ weight: null,
|
|
|
+ weightPrice: null,
|
|
|
+ dUse: null,
|
|
|
+ dPrice: null,
|
|
|
+ qzUse: null,
|
|
|
+ qzPrice: null,
|
|
|
+ qzFUse: null,
|
|
|
+ qzGUse: null,
|
|
|
+ qzPUse: null,
|
|
|
+ qzJfUse: null,
|
|
|
+ hzUse: null,
|
|
|
+ hzPrice: null,
|
|
|
+ hzFUse: null,
|
|
|
+ hzGUse: null,
|
|
|
+ hzPUse: null,
|
|
|
+ hzJfUse: null,
|
|
|
+ yrUse: null,
|
|
|
+ yrPrice: null,
|
|
|
+ yrFUse: null,
|
|
|
+ yrGUse: null,
|
|
|
+ yrPUse: null,
|
|
|
+ yrJfUse: null,
|
|
|
+ sPrice: null,
|
|
|
+ sUse: null,
|
|
|
+ qPrice: null,
|
|
|
+ qLowUse: null,
|
|
|
+ qLowPrice: null,
|
|
|
+ qMidUse: null,
|
|
|
+ qMidPrice: null
|
|
|
+ };
|
|
|
+ proxy.resetForm("rzMonthRef");
|
|
|
+}
|
|
|
|
|
|
/** 修改按钮操作 */
|
|
|
function handleUpdate(row) {
|
|
|
reset();
|
|
|
const _calcId = row.calcId || ids.value
|
|
|
- getCalc(_calcId).then(response => {
|
|
|
+ getRzMonth(_calcId).then(response => {
|
|
|
form.value = response.data;
|
|
|
open.value = true;
|
|
|
- title.value = "修改能源统计";
|
|
|
+ title.value = "数据填报";
|
|
|
});
|
|
|
}
|
|
|
|
|
|
/** 提交按钮 */
|
|
|
function submitForm() {
|
|
|
- proxy.$refs["calcRef"].validate(valid => {
|
|
|
+ proxy.$refs["rzMonthRef"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (form.value.calcId != null) {
|
|
|
- updateCalc(form.value).then(response => {
|
|
|
+ updateRzMonth(form.value).then(response => {
|
|
|
proxy.$modal.msgSuccess("修改成功");
|
|
|
open.value = false;
|
|
|
getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addCalc(form.value).then(response => {
|
|
|
+ addRzMonth(form.value).then(response => {
|
|
|
proxy.$modal.msgSuccess("新增成功");
|
|
|
open.value = false;
|
|
|
getList();
|
|
@@ -263,7 +409,7 @@ function handleDelete(row) {
|
|
|
|
|
|
/** 导出按钮操作 */
|
|
|
function handleExport() {
|
|
|
- proxy.download('ws/calc/export/rz', {
|
|
|
+ proxy.download('ws/rzMonth/export', {
|
|
|
...queryParams.value
|
|
|
}, `染整线能耗统计(${month.value}).xlsx`)
|
|
|
}
|