Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_泽淇实业' into dev_pro_河南鹤壁_泽淇实业

yuan

2 天以前 ae5cdfbb2fc7d8581b18360658f5837d690222e8

 src/views/basicData/parameterMaintenance/index.vue

@@ -50,7 +50,7 @@
                      prop="paramCode">
          <el-input v-model="formData.paramCode"
                    disabled
                    placeholder="保存后自动生成" />
                    placeholder="自动生成" />
        </el-form-item>
        <el-form-item label="参数名称"
                      prop="paramName">
@@ -82,14 +82,6 @@
                       value="2" />
          </el-select>
        </el-form-item> -->
        <el-form-item label="创建时间"
                      prop="createTime">
          <el-date-picker v-model="formData.createTime"
                          type="date"
                          placeholder="选择日期"
                          value-format="YYYY-MM-DD"
                          style="width: 100%" />
        </el-form-item>
        <el-form-item label="单位"
                      prop="unit">
          <el-input v-model="formData.unit"
@@ -231,6 +223,7 @@
  import { deptTreeSelect } from "@/api/system/user.js";
  import PIMTable from "@/components/PIMTable/PIMTable.vue";
  import { ElMessage, ElMessageBox } from "element-plus";
  import { parseTime } from "@/utils/ruoyi";

  const tableColumn = ref([
    {
@@ -301,6 +294,10 @@
    {
      label: "创建时间",
      prop: "createTime",
      formatData: val => {
        if (!val) return "";
        return parseTime(val, "{y}-{m}-{d} {h}:{i}:{s}");
      },
    },
    {
      label: "操作",
@@ -349,7 +346,6 @@
    remark: "",
    isRequired: 0,
    paramFormat: "",
    createTime: "",
  });
  const rules = reactive({
    paramName: [{ required: true, message: "请输入参数名称", trigger: "blur" }],
@@ -528,7 +524,6 @@
    formData.unit = "";
    formData.remark = "";
    formData.isRequired = 0;
    formData.createTime = new Date().toISOString().split("T")[0];
    dialogVisible.value = true;
  };