yangyuxuan vor 1 Woche
Ursprung
Commit
529b0e7e0c

+ 2 - 6
src/types/components.d.ts

@@ -13,7 +13,6 @@ declare module 'vue' {
     Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
     BuildCode: typeof import('./../components/BuildCode/index.vue')['default']
     Chart: typeof import('./../components/Chart/index.vue')['default']
-    ChunkUpload: typeof import('./../components/ChunkUpload/index.vue')['default']
     CompanyMap: typeof import('./../components/Map/company-map.vue')['default']
     Contact: typeof import('./../components/Contact/index.vue')['default']
     ContactSelect: typeof import('./../components/ContactSelect/index.vue')['default']
@@ -27,7 +26,6 @@ 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']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -57,6 +55,8 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -66,10 +66,8 @@ declare module 'vue' {
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
@@ -82,8 +80,6 @@ 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']

+ 3 - 1
src/views/comprehensiveGuarantee/MaterialReserveManagement/TransferRecord.vue

@@ -33,7 +33,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div id="transferOrder" style="display: none; width: 850px">
+    <div id="transferOrder" style="display: none; width: 850px;">
       <div v-for="(record, index) in selectedRecords" :key="index" class="print-page">
         <h1 style="display: flex; justify-content: center">行政事业单位资产调拨单</h1>
         <div style="display: flex; margin-top: -10px; margin-left: 20px;  font-size:13px">
@@ -321,6 +321,8 @@ const exportTableData = () => {
     display: block !important;
   }
   .print-page {
+    height: 100vh;
+    overflow: hidden;
     page-break-after: always; /* 每个表格后强制分页 */
   }
   .print-page:last-child {

+ 14 - 18
src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersAdd.vue

@@ -54,7 +54,7 @@
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="应建人防地下室面积:" prop="yjdxsmj">
-                <el-input v-model="formData.yjdxsmj" placeholder="请输入应建人防地下室面积" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.yjdxsmj" placeholder="请输入应建人防地下室面积" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
@@ -296,23 +296,19 @@ const router = useRouter();
 
 // 提交表单
 const submitForm = async () => {
-  try {
-    await form.value.validate();
-    // formData.value.kgsj = parseTime(formData.value.kgsj);
-    // formData.value.jgsj = parseTime(formData.value.jgsj);
-    const payload = {
-      projects: [formData.value]
-    };
-    const response = await addairRaid(payload);
-    if (response.code === 200) {
-      ElMessage.success('提交成功');
-      closeDialog();
-      emits('refresh');
-    } else {
-      ElMessage.error(response.msg || '提交失败,请稍后再试');
-    }
-  } catch (error) {
-    ElMessage.error('表单验证失败,请检查输入');
+  await form.value.validate();
+  // formData.value.kgsj = parseTime(formData.value.kgsj);
+  // formData.value.jgsj = parseTime(formData.value.jgsj);
+  const payload = {
+    projects: [formData.value]
+  };
+  const response = await addairRaid(payload);
+  if (response.code === 200) {
+    ElMessage.success('提交成功');
+    closeDialog();
+    emits('refresh');
+  } else {
+    ElMessage.error(response.msg || '提交失败,请稍后再试');
   }
 };
 </script>

+ 1 - 1
src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersEdit.vue

@@ -54,7 +54,7 @@
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="应建人防地下室面积:" prop="yjdxsmj">
-                <el-input v-model="formData.yjdxsmj" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.yjdxsmj" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">