Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

昨天 df1406d0f571972d033dffd6a93fb4b94febeb56

 src/views/basicInformation/mould/coal.vue

@@ -6,7 +6,8 @@
            width="500"
            :close-on-click-modal="false"
            :before-close="handleClose"
        >            <el-form
    >
      <el-form
                ref="formRef"
                style="max-width: 600px; margin: 0 auto"
                :model="formData"
@@ -18,13 +19,15 @@
                        v-model="formData.coal"
                        placeholder="请输入煤种名称"
                    />
                </el-form-item>                <el-form-item label="维护人姓名" prop="maintainerId">
        </el-form-item>
        <el-form-item label="维护人姓名" prop="maintainerId">
                    <el-input
                        :value="userStore.name || ''"
                        placeholder="维护人姓名"
                        disabled
                    />
                </el-form-item>                <el-form-item label="维护日期" prop="maintenanceDate">
        </el-form-item>
        <el-form-item label="维护日期" prop="maintenanceDate">
                    <el-input
                        :value="getCurrentDate()"
                        placeholder="维护日期"
@@ -54,7 +57,8 @@
const props = defineProps({
    beforeClose: {
        type: Function,
        default: () => {}
    default: () => {
    }
    },
    form: {
        type: Object,
@@ -168,6 +172,7 @@
    { min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur" },
  ],
});

// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();