修改bug

src/layout/components/Navbar.vue

@@ -99,7 +99,7 @@ const appStore = useAppStore();
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
 const noticeStore = storeToRefs(useNoticeStore());
-const newNotice = ref(<number>0);
+const newNotice = ref(<number>2);
 const showLogo = computed(() => settingsStore.sidebarLogo);
 const isCollapse = computed(() => !appStore.sidebar.opened);
 const nickName = computed(() => userStore.nickname);

src/types/components.d.ts

@@ -27,6 +27,8 @@ declare module 'vue' {
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -41,7 +43,9 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -51,6 +55,7 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -58,6 +63,8 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -72,6 +79,8 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/comprehensiveGuarantee/MaterialReserveManagement/addInbound.vue

@@ -21,18 +21,18 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="运单号：" prop="transport_order_number">
-            <el-input v-model="form.transport_order_number" placeholder="请输入运单号" style="width: 468px" />
-          </el-form-item>
-
-          <el-form-item label="捐赠人联系电话：" prop="donator_phone">
+          <el-form-item v-if="form.is_donation === 'Y'" label="捐赠人联系电话：" prop="donator_phone">
             <el-input v-model="form.donator_phone" placeholder="请输入捐赠人联系电话" style="width: 468px" />
           </el-form-item>
 
-          <el-form-item label="捐赠人姓名：" prop="donator_name">
+          <el-form-item v-if="form.is_donation === 'Y'" label="捐赠人姓名：" prop="donator_name">
             <el-input v-model="form.donator_name" placeholder="请输入捐赠人姓名" style="width: 468px" />
           </el-form-item>
 
+          <el-form-item label="运单号：" prop="transport_order_number">
+            <el-input v-model="form.transport_order_number" placeholder="请输入运单号" style="width: 468px" />
+          </el-form-item>
+
           <el-form-item label="审核人：" prop="reviewer">
             <el-input v-model="form.reviewer" placeholder="请输入审核人" style="width: 468px" />
           </el-form-item>

src/views/dataManagement/index.vue

@@ -92,7 +92,7 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   },
   {
     id: 2,
@@ -104,7 +104,7 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   },
   {
     id: 3,
@@ -116,14 +116,14 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   }
 ]);
 
 const total = ref(30); // 总条目数
 const pageSize = ref(10); // 每页显示条目数
 
-const dataUpdateTime = ref('2023/12/12 12:13');
+const dataUpdateTime = ref('2023-12-12 12:13');
 const dataSourceUnit = ref('茂名市应急管理局');
 
 const handleExcelUpload = (event) => {

src/views/informationissue/informationApplication.vue

@@ -91,7 +91,7 @@
                   v-model="formData.examine_user"
                   :fetch-suggestions="querySearch"
                   placeholder="请输入审核人姓名"
-                  style="width: 478px !important; margin-left: 20px"
+                  style="width: 460px !important; margin-left: 20px"
                   @select="handleSelect"
                 >
                   <template #default="{ item }">