代码格式化与部分细节优化

2025-09-17 10:56:39 +08:00 · 2024-04-11 20:26:00 +08:00 · 2024-04-11 20:26:00 +08:00 · a90b8d114a
commit a90b8d114a
parent 9100dc1225
3 changed files with 162 additions and 170 deletions
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
@ -24,7 +24,7 @@
          <a-descriptions-item label="创建时间">{{ detail.createTime }}</a-descriptions-item>
          <a-descriptions-item label="创建人">{{ detail.createUserName }}</a-descriptions-item>
          <a-descriptions-item label="营业执照">
-            <FilePreview :default-file-list="detail.businessLicense" />
+            <FilePreview :file-list="detail.businessLicense" />
          </a-descriptions-item>
        </a-descriptions>
      </div>
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
@ -9,7 +9,7 @@
 -->
 <template>
  <a-card style="margin-bottom: 15px" size="small">
-    <a-descriptions :title="noticeDetail.title" :columns="4" size="small">
+    <a-descriptions :title="noticeDetail.title" :column="4" size="small">
      <template #extra>
        <a-button v-if="!noticeDetail.publishFlag" type="primary" size="small" @click="onEdit">编辑</a-button>
      </template>
@ -28,7 +28,7 @@
          <a class="file-item" v-for="item in noticeDetail.attachment" :key="item.fileId" @click="onPrevFile(item)">{{ item.fileName }}</a>
        </div>
      </a-descriptions-item>
-      <a-descriptions-item label="可见范围" :span="2">
+      <a-descriptions-item label="可见范围">
        <template v-if="noticeDetail.allVisibleFlag">全部可见</template>
        <div class="visible-list">
          <div class="visible-item" v-for="item in noticeDetail.visibleRangeList" :key="item.dataId">
@ -59,86 +59,86 @@
 </template>

 <script setup>
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeFormDrawer from './components/notice-form-drawer.vue';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeFormDrawer from './components/notice-form-drawer.vue';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';

-const route = useRoute();
+  const route = useRoute();

-const props = defineProps({
-  newsType: {
-    type: Number,
-  },
-});
+  const props = defineProps({
+    newsType: {
+      type: Number,
+    },
+  });

-const activeKey = ref(1);
+  const activeKey = ref(1);

-const noticeDetail = ref({});
-const noticeViewRecordList = ref();
+  const noticeDetail = ref({});
+  const noticeViewRecordList = ref();

-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
-    noticeViewRecordList.value.onSearch();
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+      noticeViewRecordList.value.onSearch();
+    }
+  });
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
+      noticeDetail.value = result.data;
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
  }
-});

-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
-    noticeDetail.value = result.data;
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
  }
-}

-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
+  // 预览附件
+  const filePreviewRef = ref();
+  function onPrevFile(fileItem) {
+    filePreviewRef.value.showPreview(fileItem);
+  }
 </script>

 <style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
  }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
+    }
  }
-}
-.content-html {
-  img {
-    max-width: 100%;
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
  }
-}
 </style>
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
@ -27,127 +27,119 @@
      <!--endprint-->
    </div>
    <a-divider />
-    <div>附件：<file-preview :fileList="noticeDetail.attachment" /></div>
+    <div>
+      附件：
+      <file-preview v-if="!$lodash.isEmpty(noticeDetail.attachment)" :fileList="noticeDetail.attachment" />
+      <span v-else>无</span>
+    </div>
  </a-card>

  <a-card title="记录" size="small" class="smart-margin-top10">
    <NoticeViewRecordList ref="noticeViewRecordList" :noticeId="route.query.noticeId" />
  </a-card>
-
-  <!-- 预览附件 -->
-  <FilePreviewModal ref="filePreviewRef" />
 </template>

 <script setup>
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import FilePreview from '/@/components/support/file-preview/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreview from '/@/components/support/file-preview/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';

-const route = useRoute();
+  const route = useRoute();

-const activeKey = ref(1);
+  const noticeDetail = ref({});

-const noticeDetail = ref({});
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+    }
+  });

-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
+  const noticeViewRecordList = ref();
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.view(route.query.noticeId);
+      noticeDetail.value = result.data;
+
+      noticeViewRecordList.value.onSearch();
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
  }
-});

-const noticeViewRecordList = ref();
-
-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.view(route.query.noticeId);
-    noticeDetail.value = result.data;
-
-    noticeViewRecordList.value.onSearch();
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
  }
-}

-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
-
-// 打印
-function print() {
-  let bdhtml = window.document.body.innerHTML;
-  let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
-  let eprnstr = '<!--endprint-->';
-  let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
-  prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
-  let newWin = window.open(''); //新打开一个空窗口
-  newWin.document.body.innerHTML = prnhtml;
-  newWin.document.close(); //在IE浏览器中使用必须添加这一句
-  newWin.focus(); //在IE浏览器中使用必须添加这一句
-  newWin.print(); //打印
-  newWin.close(); //关闭窗口
-}
+  // 打印
+  function print() {
+    let bdhtml = window.document.body.innerHTML;
+    let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
+    let eprnstr = '<!--endprint-->';
+    let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
+    prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
+    let newWin = window.open(''); //新打开一个空窗口
+    newWin.document.body.innerHTML = prnhtml;
+    newWin.document.close(); //在IE浏览器中使用必须添加这一句
+    newWin.focus(); //在IE浏览器中使用必须添加这一句
+    newWin.print(); //打印
+    newWin.close(); //关闭窗口
+  }
 </script>

 <style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
  }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
-  }
-}
-.content-header {
-  .content-header-title {
-    margin: 10px 0px;
-    font-size: 18px;
-    font-weight: bold;
-    text-align: center;
-  }
-  .content-header-info {
-    margin: 10px 0px;
-    font-size: 14px;
-    color: #888;
-    text-align: center;
-    span {
-      margin: 0 10px;
-      cursor: pointer;
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
    }
  }
-}
-.content-html {
-  img {
-    max-width: 100%;
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-header {
+    .content-header-title {
+      margin: 10px 0px;
+      font-size: 18px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .content-header-info {
+      margin: 10px 0px;
+      font-size: 14px;
+      color: #888;
+      text-align: center;
+      span {
+        margin: 0 10px;
+        cursor: pointer;
+      }
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
  }
-}
 </style>