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

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

@@ -289,6 +289,24 @@ export default {
       const jsonStr = JSON.stringify(json)
       this.qrcodeStr = jsonStr
     },
+    handleShowRecordQr(ROW) {
+      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
+      };
+      const jsonStr = JSON.stringify(json);
+      this.qrcodeStr = jsonStr;
+    },
     handleEdit(FIRE_POINT_ID) {
       this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
       this.$parent.activeName = 'Edit'

src/views/safetyenvironmental/inspection/components/list.vue

@@ -471,7 +471,7 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/safetyenvironmental/hide',
+          '/safetyenvironmental/V2/hide',
           {
             INSPECTION_ID: id,
             hide: '1'