taskid:099 remark:"commit"

This commit is contained in:
fks-xuxinyue
2024-07-19 15:13:46 +08:00
parent ecdcd900d3
commit 9bd82ebbee
6 changed files with 560 additions and 44 deletions

View File

@@ -5,7 +5,7 @@
</div>
<!-- 填报页 -->
<div v-if="fillInPage">
<fillIn />
</div>
<!-- 新增报告弹窗 -->
<a-drawer
@@ -22,24 +22,23 @@
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-item ref="name" label="报告名称" name="energyType">
<a-input v-model:value="formState.energyType" placeholder="请输入报告名称" />
<a-form-item ref="name" label="报告名称" name="reportName">
<a-input v-model:value="formState.reportName" placeholder="请输入报告名称" />
</a-form-item>
<a-form-item ref="name" label="报告年度" name="energyType">
<a-date-picker v-model:value="value5" picker="year" />
<a-form-item ref="name" label="报告年度" name="reportYear">
<a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
</a-form-item>
<a-form-item ref="name" label="适用标准" name="energyType">
<a-input v-model:value="formState.energyType" placeholder="请输入适用标准" />
<a-form-item ref="name" label="适用标准" name="genericStandard">
<a-input v-model:value="formState.genericStandard" placeholder="请输入适用标准" />
</a-form-item>
<a-form-item label="报告周期" name="emissionType" :required="isRequired">
<a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
<a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.id">
{{ item.cnValue }}
</a-select-option>
<a-form-item label="报告周期" name="reportPeriod">
<a-select v-model:value="formState.reportPeriod" placeholder="请选择排放类型">
<a-select-option value="1">年度</a-select-option>
<a-select-option value="2">月度</a-select-option>
</a-select>
</a-form-item>
<a-form-item ref="name" label="适用标准" name="energyType">
<a-range-picker v-model:value="value4" picker="month" />
<a-form-item ref="name" label="报告范围" name="reportScope">
<a-range-picker v-model:value="formState.reportScope" picker="month" valueFormat="YYYY-MM" />
</a-form-item>
</a-form>
<template #footer>
@@ -50,9 +49,10 @@
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { ref,toRaw } from 'vue';
import { http } from '/nerv-lib/util/http';
import { carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
import { carbonInventoryCheck } from '/@/api/carbonEmissionFactorLibrary';
import fillIn from './fillInPage/index.vue';
defineOptions({ name: 'CarbonInventoryCheck' });
const orgId = ref('');
const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -61,8 +61,8 @@
return http.post(api, params);
};
// 判断展示哪个页面
const isMainPage = ref(false);
const fillInPage = ref(true);
const isMainPage = ref(true);
const fillInPage = ref(false);
// 新增相关数据
const visible = ref(false);
const formState = ref({})
@@ -71,8 +71,11 @@
const wrapperCol = { span: 19 };
// 定义form表单的必填
const rules: Record<string, Rule[]> = {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }]
reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
reportYear: [{ required: true, message: '请选择报告年度', trigger: 'change' }],
genericStandard: [{ required: true, message: '请输入适用标准', trigger: 'change' }],
reportPeriod: [{ required: true, message: '请选择排放类型', trigger: 'change' }],
reportScope: [{ required: true, message: '请选择报告范围', trigger: 'change' }],
};
// 关闭新增抽屉
const onClose = () => {
@@ -80,10 +83,30 @@
formState.value = {}
formRef.value.resetFields();
};
// 点击确定提交
const onSubmit = () => {
formRef.value
.validate()
.then(() => {
console.log('values', formState, toRaw(formState));
formState.value.enterpriseOrgId = orgId.value
formState.value.startTime = formState.value.reportScope[0]
formState.value.endTime = formState.value.reportScope[1]
fetch(carbonInventoryCheck.createOrUpdate,formState.value).then((res) => {
visible.value = false
mainRef.value?.nsTableRef.reload();
});
})
.catch(error => {
console.log('error', error);
});
};
// 表格相关数据
const data = ref([]);
const mainRef = ref();
const tableConfig = ref({
title: '数据库',
api: carbonEmissionFactorLibrary.getTableList,
api: carbonInventoryCheck.carbonInventoryList,
params: {
orgId
},
@@ -106,27 +129,27 @@
},
{
title: '企业名称',
dataIndex: 'emissionSources',
dataIndex: 'enterpriseName',
},
{
title: '报告名称',
dataIndex: 'emissionTypeColumn',
dataIndex: 'reportName',
},
{
title: '报告年度',
dataIndex: 'emissionGas',
dataIndex: 'reportYear',
},
{
title: '适用标准',
dataIndex: 'emissionProcess',
dataIndex: 'genericStandard',
},
{
title: '更新人',
dataIndex: 'emissionFactors',
dataIndex: 'updateUser',
},
{
title: '更新时间',
dataIndex: 'emissionFactorUnits',
dataIndex: 'updateTime',
},
],
columnActions: {
@@ -137,6 +160,10 @@
name: 'userEdit',
handle: (record: any) => {
visible.value = true
fetch(carbonInventoryCheck.findById,{id:record.id}).then((res) => {
formState.value = res.data
formState.value.reportScope = [res.data.startTime,res.data.endTime]
});
},
},
{
@@ -156,17 +183,17 @@
{
label: '删除',
name: 'userDelete',
dynamicParams: { ids: 'id[]' },
dynamicParams: { id: 'id' },
confirm: true,
isReload: true,
api: carbonEmissionFactorLibrary.del,
api: carbonInventoryCheck.delete,
},
],
},
formConfig: {
schemas: [
{
field: 'emissionSources',
field: 'reportName',
label: '报告名称',
component: 'NsInput',
componentProps: {
@@ -175,13 +202,14 @@
},
},
{
field: 'createTime1',
label: '采购日期',
field: 'reportYear',
label: '报告年度',
component: 'NsRangePicker',
fieldMap: ['purchaseBeginDate', 'purchaseEndDate'],
fieldMap: ['startYear', 'endYear'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
valueFormat: 'YYYY',
placeholder: ['报告年度', '报告年度'],
picker:"year"
},
},
],