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

src/views/accident/records/components/addOrEdit.vue

@@ -33,6 +33,8 @@
           type="datetime"
           placeholder="选择事故发生时间"
           style="width: 100%;"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
         />
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="直接经济损失（万元）" prop="directLoss">
@@ -92,6 +94,8 @@
           type="datetime"
           placeholder="请选择报出日期"
           style="width: 100%;"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
         />
       </el-form-item>
     </el-form>
@@ -118,6 +122,7 @@
 <script>
 import { requestFN } from '../../../../utils/request'
 import { upload } from '@/utils/upload'
+import formatDate from '@/utils/dateformat'
 
 export default {
   data() {
@@ -166,7 +171,7 @@ export default {
         incidentDate: [{ required: true, message: '事故发生时间不能为空', trigger: 'blur' }],
         directLoss: [{ required: true, message: '直接经济损失（万元）不能为空', trigger: 'blur' }],
         injured: [{ required: true, message: '受伤人数不能为空', trigger: 'blur' }],
-        seriouslyInjured: [{ required: true, message: '隐患类型不能为空', trigger: 'blur' }],
+        seriouslyInjured: [{ required: true, message: '重伤人数不能为空', trigger: 'blur' }],
         cause: [{ required: true, message: '事故起因不能为空', trigger: 'blur' }],
         summary: [{ required: true, message: '事故概述不能为空', trigger: 'blur' }],
         fileList: [{ required: true, message: '事故照片不能为空', trigger: 'blur' }],
@@ -339,6 +344,10 @@ export default {
         if (!valid) {
           return false
         }
+
+        this.infoForm.incidentDate = formatDate(this.infoForm.incidentDate, 'YYYY-MM-DD HH:mm:ss')
+        this.infoForm.reportDate = formatDate(this.infoForm.reportDate, 'YYYY-MM-DD HH:mm:ss')
+
         const params = {
           ...this.infoForm,
           photos: this.infoForm.fileList[0].remotePathName

src/views/firefighting/points/components/list.vue

@@ -272,14 +272,22 @@ export default {
       this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
     },
     handleShowRecordQr(ROW) {
-      this.dialogRecordFormShow = true
+      this.dialogFormShow = true
+      // 确保qrInfo绑定了需要显示的数据字段
+      this.qrInfo = {
+        FIRE_REGION_NAME: ROW.FIRE_REGION_NAME, // 消防区域
+        FIRE_POINT_NAME: ROW.FIRE_POINT_NAME, // 消防点位
+        DEPARTMENT_NAME: ROW.DEPARTMENT_NAME, // 负责部门
+        USERNAME: ROW.USERNAME // 负责人
+      }
       const json = {
         MANAGER_TYPE: 'checkRecordManager',
         USER_ID: ROW.USER_ID,
         DEPARTMENT_ID: ROW.DEPARTMENT_ID,
         FIRE_POINT_ID: ROW.FIRE_POINT_ID
       }
-      this.recordQrcodeStr = JSON.stringify(json)
+      const jsonStr = JSON.stringify(json)
+      this.qrcodeStr = jsonStr
     },
     handleShowRecordQr(ROW) {
       this.dialogFormShow = true;