Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

yuan

14 小时以前 b21afc26b596a5a7cb77b36cd96f6e0df91637eb

 src/views/collaborativeApproval/rulesRegulationsManagement/index.vue

@@ -144,7 +144,7 @@
          <el-descriptions-item label="分类">{{ getCategoryText(currentRegulationDetail.category) }}</el-descriptions-item>
          <el-descriptions-item label="版本">{{ currentRegulationDetail.version }}</el-descriptions-item>
          <el-descriptions-item label="发布人">{{ currentRegulationDetail.createUserName }}</el-descriptions-item>
          <el-descriptions-item label="发布时间">{{ currentRegulationDetail.createTime }}</el-descriptions-item>
          <el-descriptions-item label="发布时间">{{ formatDate(currentRegulationDetail.createTime) }}</el-descriptions-item>
        </el-descriptions>
        <div class="mt-20">
          <h4>制度内容</h4>
@@ -169,7 +169,13 @@
                         width="100" />
        <el-table-column prop="updateTime"
                         label="更新时间"
                         width="180" />
                         width="180" >
          <template #default="scope">
            <el-text>
              {{scope.row.updateTime?dayjs(scope.row.updateTime).format("YYYY-MM-DD"):"--"}}
            </el-text>
          </template>
        </el-table-column>
        <el-table-column prop="createUserName"
                         label="更新人"
                         width="120" />
@@ -228,6 +234,7 @@
    addReadingStatus,
    updateReadingStatus,
  } from "@/api/collaborativeApproval/sealManagement.js";
  import dayjs from "dayjs";
  const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
  import {
    listRuleFiles,
@@ -235,6 +242,10 @@
    addRuleFile,
  } from "@/api/collaborativeApproval/rulesRegulationsManagementFile.js";
  import PIMTable from "@/components/PIMTable/PIMTable.vue";
  import { parseDate } from "@/utils/ruoyi";

  // 日期回显格式化（YYYY-MM-DD）
  const formatDate = value => parseDate(value) || "-";

  // 响应式数据
  const operationType = ref("add");
@@ -309,7 +320,7 @@
    },
    { label: "版本", prop: "version", width: 120 },
    { label: "发布人", prop: "createUserName", width: 120 },
    { label: "发布时间", prop: "createTime", width: 180 },
    { label: "发布时间", prop: "createTime", width: 180,dataType: "date" },
    {
      label: "状态",
      prop: "status",
@@ -451,7 +462,7 @@
  const viewVersionHistory = row => {
    showVersionHistoryDialog.value = true;
    const params = {
      category: row.category,
      title: row.title,
    };
    listRuleManagement(page, params).then(res => {
      if (res.code == 200) {