Merge remote-tracking branch 'origin/dev' into dev

src/views/comprehensiveGuarantee/materialReserves/materialsDeclaration.vue

@@ -7,7 +7,7 @@
         </el-col>
       </el-row>
       <!-- 表格组件 -->
-      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%" :max-height="600">
+      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%">
         <el-table-column label="序号" align="center" width="55" fixed="left">
           <template #default="scope">
             {{ (queryParams.page - 1) * queryParams.pageSize + scope.$index + 1 }}

src/views/comprehensiveGuarantee/materialReserves/materialsDistribution.vue

@@ -9,7 +9,7 @@
       </el-row>
       <h3>申报列表</h3>
       <!-- 表格组件 -->
-      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%" :max-height="400">
+      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%">
         <el-table-column label="序号" align="center" width="55" fixed="left">
           <template #default="scope">
             {{ (queryParams.page - 1) * queryParams.pageSize + scope.$index + 1 }}

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersAdd.vue

@@ -59,7 +59,7 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="实建人防地下室面积：" prop="sjdxsmj">
-                <el-input v-model="formData.sjdxsmj" placeholder="请输入实建人防地下室面积" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.sjdxsmj" placeholder="请输入实建人防地下室面积" style="width: 468px !important" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -127,7 +127,7 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="掩蔽人数：" prop="ybrs">
-                <el-input v-model="formData.ybrs" placeholder="请输入掩蔽人数" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.ybrs" placeholder="请输入掩蔽人数" style="width: 468px !important" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -222,8 +222,8 @@ const formData = ref({
   cd_operation: '',
   yjdxsmj: '',
   sjdxsmj: '',
-  cd_time: '',
-  add_time: '',
+  // cd_time: '',
+  // add_time: '',
   jldw: '',
   lnglat: [],
   jsdwdm: '',
@@ -254,7 +254,7 @@ const rules = ref({
   yjrfdxsmj: [{ required: true, message: '应建人防地下室面积不能为空', trigger: 'blur' }],
   sjrfdxsmj: [{ required: true, message: '实建人防地下室面积不能为空', trigger: 'blur' }],
   cs_time: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
-  add_time: [{ required: true, message: '新增时间不能为空', trigger: 'blur' }],
+  // add_time: [{ required: true, message: '新增时间不能为空', trigger: 'blur' }],
   jldw: [{ required: true, message: '监理单位不能为空', trigger: 'blur' }],
   jsdwdm: [{ required: true, message: '建设单位统一社会信用代码不能为空', trigger: 'blur' }],
   kgsj: [{ required: true, message: '开工时间不能为空', trigger: 'blur' }],

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersEdit.vue

@@ -59,7 +59,7 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="实建人防地下室面积：" prop="sjdxsmj">
-                <el-input v-model="formData.sjdxsmj" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.sjdxsmj" style="width: 468px !important" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -127,7 +127,7 @@
             </el-col>
             <el-col :span="10">
               <el-form-item label="掩蔽人数：" prop="ybrs">
-                <el-input v-model="formData.ybrs" style="width: 468px !important" />
+                <el-input type="number" v-model="formData.ybrs" style="width: 468px !important" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/comprehensiveGuarantee/reliefResourceManagement/hydraulicEngineeringAdd.vue

@@ -126,7 +126,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="纬度：" prop="latitude">
+              <el-form-item label="纬度：" prop="weidu">
                 <el-input v-model="formData.weidu" placeholder="请输入纬度" style="width: 468px !important" />
               </el-form-item>
             </el-col>
@@ -209,7 +209,7 @@ const rules = ref({
   jssj: [{ required: true, message: '建设时间不能为空', trigger: 'blur' }],
   jdgljg: [{ required: true, message: '监督管理机关不能为空', trigger: 'blur' }],
   jingdu: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
+  weidu: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
 });
 
 const form = ref(null); // 定义 form 变量

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueStationEdit.vue

@@ -86,6 +86,7 @@
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import { getStation, uploadStation } from '@/api/comprehensiveGuarantee/reliefResourceManagement/rescueStation';
+import { deepClone } from '@/utils';
 
 const emits = defineEmits(['close']);
 const props = defineProps<{
@@ -153,8 +154,13 @@ const fetchUnitData = async () => {
   formData.value = temp;
 };
 const submitForm = async () => {
+  const temp = deepClone(formData.value);
+  temp.kfsj = temp.kfsj[0] + '-' + temp.kfsj[1];
+  const payload = {
+    stations: [temp]
+  };
   // 假设表单已经通过验证
-  const response = await uploadStation(props.eventId, formData.value);
+  const response = await uploadStation(props.eventId, payload);
   if (response.code === 200) {
     ElMessage.success('提交成功');
     closeDialog();

src/views/comprehensiveGuarantee/reliefResourceManagement/shelter.vue

@@ -11,7 +11,7 @@
         </el-col>
       </el-row>
       <!-- 表格组件 -->
-      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%" :max-height="400">
+      <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%">
         <el-table-column label="序号" align="center" width="55" fixed="left">
           <template #default="scope">
             {{ (queryParams.page - 1) * queryParams.pageSize + scope.$index + 1 }}

src/views/dataFilling/fillingAdd.vue

@@ -177,6 +177,7 @@ const rules = {
   user_ids: [{ required: true, message: '请选择填报人', trigger: 'blur' }],
 }
 const handleSaveTemporarily = async (statuCode) => {
+  await formRef.value.validateField(['table_name', 'end_time'])
   if (!!form.value.creator_phone) {
     const phoneRegex = /^1[3-9]\d{9}$/;
     if(!phoneRegex.test(form.value.creator_phone)) {

src/views/dataFilling/tableDetails.vue

@@ -91,7 +91,7 @@
     <hot-table v-if="showTable" ref="wrapper" :data="hotData" :settings="hotSettings" />
   </div>
   <informantSelect v-model="isShowSelect" :tree-data="treeData" :default-check-data="reportInfo.user_ids" @confirm="handleContactSelectData" />
-  <el-dialog v-if="popUp" v-model="reportInfo.user_filling_status" @close="handleDialogClose">
+  <el-dialog v-if="popUp" v-model="reportInfo.user_filling_status" title="完成情况" @close="handleDialogClose">
     <el-table :data="reportInfo.user_filling_status">
       <el-table-column label="序号" align="center" type="index" width="50px" />
       <el-table-column label="姓名" align="center" prop="name" />