根据文档进行优化
This commit is contained in:
@@ -1193,11 +1193,11 @@
|
||||
return regex.test(filename);
|
||||
};
|
||||
const beforeUpload: UploadProps['beforeUpload'] = (file) => {
|
||||
const filename = file.name;
|
||||
if (!isValidFileName(filename)) {
|
||||
message.error('文件名不符合规则');
|
||||
return Upload.LIST_IGNORE; // 阻止文件上传
|
||||
}
|
||||
// const filename = file.name;
|
||||
// if (!isValidFileName(filename)) {
|
||||
// message.error('文件名不符合规则');
|
||||
// return Upload.LIST_IGNORE; // 阻止文件上传
|
||||
// }
|
||||
return false;
|
||||
};
|
||||
const handleChange = (info: UploadChangeParam) => {
|
||||
@@ -1284,14 +1284,16 @@
|
||||
NsMessage.warn('请选择因子');
|
||||
return;
|
||||
} else {
|
||||
if (newTableData.value.emissionFactorUnits === carbonEmission.value) {
|
||||
if (newTableData.value[0].emissionFactorUnits === carbonEmission.value) {
|
||||
newTableData.value = setFactorRef.value?.nsTableRef.tableState.selectedRows;
|
||||
selectedRowKeysEdit.value = setFactorRef.value?.nsTableRef.tableState.selectedRowKeys;
|
||||
editFormState.value.emissionFactors = newTableData.value[0].emissionFactors;
|
||||
editFormState.value.factorId = selectedRowKeysEdit.value[0];
|
||||
openVisible.value = false;
|
||||
} else {
|
||||
NsMessage.warn('因子值单位不统一,请重新选择!');
|
||||
NsMessage.warn(
|
||||
'因子值单位与当前因子值单位(' + carbonEmission.value + ')不统一,请重新选择!',
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@@ -39,11 +39,7 @@
|
||||
placeholder="请输入报告名称" />
|
||||
</a-form-item>
|
||||
<a-form-item ref="name" label="报告年度" name="reportYear">
|
||||
<a-date-picker
|
||||
v-model:value="formState.reportYear"
|
||||
@openChange="openChange"
|
||||
picker="year"
|
||||
valueFormat="YYYY" />
|
||||
<a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
|
||||
</a-form-item>
|
||||
<a-form-item ref="name" label="适用标准" name="genericStandard">
|
||||
<a-input
|
||||
@@ -64,7 +60,6 @@
|
||||
<a-form-item ref="name" label="报告范围" name="reportScope">
|
||||
<a-range-picker
|
||||
v-model:value="formState.reportScope"
|
||||
:defaultPickerValue="defaultPickerValue"
|
||||
picker="month"
|
||||
:disabledDate="disabledDate"
|
||||
valueFormat="YYYY-MM" />
|
||||
@@ -111,20 +106,22 @@
|
||||
const selectChange = (value) => {
|
||||
formState.value.reportScope = '';
|
||||
};
|
||||
const defaultPickerValue = ref([
|
||||
dayjs('2020'), // 默认开始日期
|
||||
dayjs('2020'), // 默认结束日期
|
||||
]);
|
||||
const openChange = (status) => {
|
||||
if (status === false) {
|
||||
if (formState.value.reportYear) {
|
||||
defaultPickerValue.value = [
|
||||
dayjs(formState.value.reportYear),
|
||||
dayjs(formState.value.reportYear),
|
||||
];
|
||||
}
|
||||
}
|
||||
};
|
||||
// const defaultPickerValue = ref([]);
|
||||
// const open = ref(false);
|
||||
// const openChange = (status) => {
|
||||
// debugger;
|
||||
// open.value = status;
|
||||
// if (formState.value.reportYear) {
|
||||
// defaultPickerValue.value = [
|
||||
// dayjs(formState.value.reportYear),
|
||||
// dayjs(formState.value.reportYear),
|
||||
// ];
|
||||
// open.value = false;
|
||||
// nextTick(() => {
|
||||
// open.value = status; // 重新打开日期选择框
|
||||
// });
|
||||
// }
|
||||
// };
|
||||
// 定义form表单的必填
|
||||
const rules: Record<string, Rule[]> = {
|
||||
reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
|
||||
|
Reference in New Issue
Block a user