feat: 安全环保检查下,被检查人签字/申辩静态页面开发中

components/list/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-if="list.length > 0">
 		<view class="list">
-			<u-list @scrolltolower="selfScrollToLower" :height="height" style="box-sizing: border-box;">
+			<u-list @scrolltolower="selfScrollToLower" style="box-sizing: border-box;">
 				<u-list-item v-for="(item, index) in list" :key="index" style="border-bottom: none; padding: 0rpx;">
 					<view class="item">
 						<slot :item="item" :index="index" />
@@ -20,11 +20,6 @@ export default {
 			type: Array,
 			required: true,
 		},
-		height: {
-			type: String,
-			requierd: false,
-			default: '100%'
-		}
 	},
 
 	data() {

hiddenManageSubPackages/pages/delay_review/index.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/hidden_acceptance/index.vue

@@ -8,7 +8,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/hidden_confirm/index.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/hidden_neglect/index.vue

@@ -8,7 +8,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/hidden_record/index.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/hidden_rectification/index.vue

@@ -6,7 +6,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

hiddenManageSubPackages/pages/special_disposal_review/index.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<view class="u-line-1">{{ item.HIDDENDESCR || "暂无" }}</view>

pages.json

@@ -374,6 +374,18 @@
 						"navigationBarTitleText": "检查人确认"
 					}
 				},
+				{
+					"path": "pages/inspected/list",
+					"style": {
+						"navigationBarTitleText": "被检查人签字/申辩"
+					}
+				},
+				{
+					"path": "pages/inspected/detail",
+					"style": {
+						"navigationBarTitleText": "被检查人签字/申辩"
+					}
+				},
 				{
 					"path": "pages/inspector-archives/list",
 					"style": {

pages/safety_environmental_inspection/index.vue

@@ -30,16 +30,22 @@ export default {
           vector: '1',
           NUM: 0
         },
+        {
+          title: '被检查人签字/申辩',
+          url: '/safetyEnvirSubPackages/pages/inspected/list',
+          vector: '2',
+          NUM: 100
+        },
         {
           title: '隐患指派及验收',
           url: '/safetyEnvirSubPackages/pages/inspector-archives/list',
-          vector: '2',
+          vector: '3',
           NUM: 0
         },
         {
           title: '申辩记录',
           url: '/safetyEnvirSubPackages/pages/defense-record/list',
-          vector: '3',
+          vector: '4',
           NUM: 0
         }
       ]

safetyEnvirSubPackages/api/index.js

@@ -1,76 +1,111 @@
 import { post, upload, uploads } from "../../utils/request";
 
 /** 获取监管端的部门的人员 */
-export const getDeptUser = (params) => post("/AppUser/listAllManageAndCorp", {loading: false, ...params});
+export const getDeptUser = (params) =>
+	post("/AppUser/listAllManageAndCorp", { loading: false, ...params });
 
 /** 获取隐患级别 */
-export const getHiddenLevel = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a'});
+export const getHiddenLevel = () =>
+	post("/app/dictionaries/listSelectTree", {
+		loading: false,
+		DICTIONARIES_ID: "5e7cf8620ba54ad89719d0be62133c7a",
+	});
 
 /** 获取隐患部位 */
-export const getHiddenRegion = (params) => post("/app/hiddenRegion/gerRegionList", {loading: false, ...params});
+export const getHiddenRegion = (params) =>
+	post("/app/hiddenRegion/gerRegionList", { loading: false, ...params });
 
 /** 获取隐患类型 */
-export const getHiddenType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'});
+export const getHiddenType = () =>
+	post("/app/dictionaries/listSelectTree", {
+		loading: false,
+		DICTIONARIES_ID: "3babc15144444bdc8d763d0af2bdfff6",
+	});
 
 /** 获取被检查部门 */
-export const getInspectedDepartment = (params) => post("/app/corpDepartment/listTreeCorpDept", {loading: false, ...params});
+export const getInspectedDepartment = (params) =>
+	post("/app/corpDepartment/listTreeCorpDept", { loading: false, ...params });
 
 /** 获取检查部门 */
-export const getInspectionDepartment = (params) => post("/app/corpDepartment/listTreeManageAndCorp", {loading: false, ...params});
+export const getInspectionDepartment = (params) =>
+	post("/app/corpDepartment/listTreeManageAndCorp", {
+		loading: false,
+		...params,
+	});
 
 /** 获取检查类型 */
-export const getInspectionType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe'});
+export const getInspectionType = () =>
+	post("/app/dictionaries/listSelectTree", {
+		loading: false,
+		DICTIONARIES_ID: "60e6481d96e44a5390ff5c347c4d1ffe",
+	});
 
 /** 获取检查人员 */
-export const getInspectors = (params) => post("/AppUser/listAllManageAndCorp", {loading: false, ...params});
+export const getInspectors = (params) =>
+	post("/AppUser/listAllManageAndCorp", { loading: false, ...params });
 
 /** 安全环保检查明细信息 */
-export const getSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params);
+export const getSafetyenvironmentalGoEdit = (params) =>
+	post("/app/safetyenvironmental/goEdit", params);
 
 /** 上传图片 */
-export const setImgFilesAdd = (params) => uploads("/app/imgfiles/uploadFile", params);
+export const setImgFilesAdd = (params) =>
+	uploads("/app/imgfiles/uploadFile", params);
 
 /** 新增安全环保检查 */
-export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add", params);
+export const setSafetyenvironmentalAdd = (params) =>
+	post("/app/safetyenvironmental/add", params);
 
 /** 安全环保检查检查人确认 */
-export const setSafetyenvironmentalVerify = (params) => upload("/app/safetyenvironmentalinspector/verify", params);
+export const setSafetyenvironmentalVerify = (params) =>
+	upload("/app/safetyenvironmentalinspector/verify", params);
 
 /** 新增安全环保检查 - plus */
-export const setSafetyenvironmentalAdd_plus = (params) => upload("/app/safetyenvironmental/add", params);
+export const setSafetyenvironmentalAdd_plus = (params) =>
+	upload("/app/safetyenvironmental/add", params);
 
 /** 修改安全环保检查 */
-export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit", params);
+export const setSafetyenvironmentalEdit = (params) =>
+	post("/app/safetyenvironmental/edit", params);
 
 /** 获取安全环保检查列表(隐患指派及验收) */
-export const getSafetyenvironmentalCheckList = (params) => post("/app/safetyenvironmental/checkList", params);
+export const getSafetyenvironmentalCheckList = (params) =>
+	post("/app/safetyenvironmental/checkList", params);
 
 /** 修改安全环保检查 */
-export const setSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params);
+export const setSafetyenvironmentalGoEdit = (params) =>
+	post("/app/safetyenvironmental/goEdit", params);
 
 /** 申辩 */
-export const setSafetyenvironmentalExplain = (params) => post("/app/safetyenvironmental/explain", params);
+export const setSafetyenvironmentalExplain = (params) =>
+	post("/app/safetyenvironmental/explain", params);
 
 /** 设置安全环境流程 */
-export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/showFlowChart", params);
+export const setSafetyenvironmentalFlow = (params) =>
+	post("/app/safetyenvironmental/showFlowChart", params);
 
 /** 修改安全环保检查 - plus */
-export const setSafetyenvironmentalEdit_plus = (params) => upload("/app/safetyenvironmental/edit", params);
+export const setSafetyenvironmentalEdit_plus = (params) =>
+	upload("/app/safetyenvironmental/edit", params);
 
 /** 获取安全环保检查验收隐患列表 */
-export const getListForSafetyEnvironmental = (params) => post("/app/hidden/listForSafetyEnvironmental", params);
+export const getListForSafetyEnvironmental = (params) =>
+	post("/app/hidden/listForSafetyEnvironmental", params);
 
 /** 上传视频 */
 export const setVideoAdd = (params) => upload("/app/imgfiles/add", params);
 
 /** 获取安全环保检查列表 */
-export const getSafetyenvironmentalList = (params) => post("/app/safetyenvironmental/list", params);
+export const getSafetyenvironmentalList = (params) =>
+	post("/app/safetyenvironmental/list", params);
 
 /** 获取安全环保检查列表 */
-export const getpleadList = (params) => post("/app/safetyenvironmental/pleadList", params);
+export const getpleadList = (params) =>
+	post("/app/safetyenvironmental/pleadList", params);
 
 /** 获取安全环保检查申辩流程列表 */
-export const getSafetyenvironmentalExplain = (params) => post("/app/safetyenvironmental/getExplain", params);
+export const getSafetyenvironmentalExplain = (params) =>
+	post("/app/safetyenvironmental/getExplain", params);
 
 /** 隐患详情 */
 export const getHiddenGoEdit = (params) => post("/app/hidden/goEdit", params);
@@ -79,4 +114,11 @@ export const getHiddenGoEdit = (params) => post("/app/hidden/goEdit", params);
 export const setFinalCheck = (params) => post("/app/hidden/finalcheck", params);
 
 /** 安全环保检查检查人确认列表 */
-export const getSafetyenvironmentalinspectorList = (params) => post("/app/safetyenvironmentalinspector/list", params);
+export const getSafetyenvironmentalinspectorList = (params) =>
+	post("/app/safetyenvironmentalinspector/list", params);
+
+/** 获取被检查人签字/申辩列表 */
+export const getInspectedList = (params) =>
+	post(
+		`/app/safetyenvironmentalexplain/list?showCount=${params.showCount}&currentPage=${params.currentPage}`
+	);

safetyEnvirSubPackages/pages/defense-record/list.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<text>被检查单位：{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>

safetyEnvirSubPackages/pages/initiate/list.vue

@@ -20,7 +20,7 @@
 		<!-- 筛选器 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<text>被检查单位：{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>
@@ -229,7 +229,7 @@ export default {
 		/**
 		 * 滚动加载数据
 		 */
-		scrolltolower() {
+		 scrollToLower() {
 			this.currentPage++;
 			if (this.totalPage >= this.currentPage) this.getData();
 		},

safetyEnvirSubPackages/pages/inspected/detail.vue

@@ -0,0 +1,35 @@
+<template>
+  <view class="content">
+    <view class="card">
+      <u-cell-group :border="false">
+        <u-cell>
+          <view slot="title" class="title required">检查标题：</view>
+          <view slot="value">
+            <view>{{form.INSPECTION_SUBJECT}}现场检查记录</view>
+          </view>
+        </u-cell>
+        <u-cell>
+          <view slot="title" class="title required">被检查单位：</view>
+					<view>{{ form.INSPECTED_DEPARTMENT_NAMES }}</view>
+        </u-cell>
+      </u-cell-group>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        /** 现场检查记录 */
+        INSPECTION_SUBJECT: '',
+        /** 被检查单位 */
+        INSPECTED_DEPARTMENT_NAMES: '',
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>

safetyEnvirSubPackages/pages/inspected/list.vue

@@ -0,0 +1,142 @@
+<template>
+  <view>
+    <!-- 吸顶搜索框 start -->
+    <key-word-search-input :inputSearchValue="searchForm.HIDDENDESCR" @search="resetList" is-has-filter
+      @showPicker="showPicker" />
+    <!-- 吸顶搜索框 end -->
+
+    <!-- 筛选器 start -->
+    <u-picker :show="show" :columns="columns" keyName="name" @cancel="show = false" @confirm="confirmPicker" />
+    <!-- 筛选器 end -->
+
+    <!-- 列表渲染 start -->
+    <list :list="list" @scrollToLower="scrollToLower">
+      <template #default="{ item }">
+        <view class="flex-between main-title">
+          <text>{{ item.INSPECTION_SUBJECT }}现场安全检查记录</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>
+            检查状态：{{ translate(item.INSPECTION_STATUS) }}
+          </text>
+          <text>检查类型：{{ item.INSPECTION_TYPE_NAME }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>检查人：{{ item.INSPECTION_USER_NAME }}</text>
+          <text>检查发起人：{{ item.INSPECTION_ORIGINATOR_NAME }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>被检查人：{{ item.INSPECTED_SITEUSER_NAME }}</text>
+        </view>
+        <view class="flex-between main-title">
+          <text>检查时间：{{ item.INSPECTION_TIME_START }} 至 {{ item.INSPECTION_TIME_END }}</text>
+        </view>
+        <view class="flex-end">
+          <!-- v-if="item.INSPECTION_STATUS === '2'" -->
+          <view>
+            <u-button type="primary" text="确认" size="mini" shape="circle" @click="goToDetail(item.INSPECTION_ID)" />
+          </view>
+        </view>
+      </template>
+    </list>
+  </view>
+</template>
+
+<script>
+import { getInspectedList } from "../../api";
+import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue";
+import List from "@/components/list/list.vue";
+import { initiateList } from "../../../Mock/safetyEnvirData";
+
+export default {
+  components: { keyWordSearchInput, List },
+
+  data() {
+    return {
+      show: false,
+      columns: [
+        [
+          { id: "", name: "请选择" },
+          { id: "0", name: "待检查人核实" },
+          { id: "1", name: "检查人核实中" },
+          { id: "2", name: "待被检查人确认" },
+          { id: "3", name: "已归档" },
+          { id: "4", name: "指派中" },
+          { id: "5", name: "指派完成" },
+          { id: "6", name: "待验收" },
+          { id: "7", name: "已验收" },
+          { id: "-1", name: "检查人核实打回" },
+          { id: "-2", name: "被检查人申辩" },
+        ],
+      ],
+      searchForm: {
+        HIDDENDESCR: "",
+      },
+      pageSize: 10,
+      currentPage: 1,
+      totalPage: 0,
+      list: [],
+    }
+  },
+
+  onShow() {
+    this.resetList();
+  },
+
+  methods: {
+    async getData() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      // TODO: 目前因后端资源接口未完成,故注释接口数据接入逻辑
+      // let resData = await getInspectedList({
+      //   showCount: this.pageSize,
+      //   currentPage: this.currentPage,
+      // });
+      // this.list = [...this.list, ...resData.varList];
+      // this.totalPage = resData.page.totalPage;
+
+      // 虚拟 mock 数据渲染
+      setTimeout(() => {
+        this.list = initiateList;
+        this.totalPage = initiateList.length;
+        uni.hideLoading();
+      }, 400);
+    },
+    resetList() {
+      this.pageSize = 10;
+      this.currentPage = 1;
+      this.list = [];
+      this.getData();
+    },
+    showPicker() {
+      this.show = true;
+    },
+    /**
+     * 申辩处理按钮事件
+     */
+    goToDetail(INSPECTION_ID) {
+      uni.$u.route({
+        url: "/safetyEnvirSubPackages/pages/inspected/detail",
+        params: {
+          INSPECTION_ID,
+        },
+      });
+    },
+    translate(id) {
+      for (var i = 0; i < this.columns.length; i++) {
+        if (this.columns[i].id == id) return this.columns[i].name
+      }
+    },
+    /**
+     * 滚动加载数据
+     */
+    scrollToLower() {
+      this.currentPage++;
+      if (this.totalPage >= this.currentPage) this.getData();
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss"></style>

safetyEnvirSubPackages/pages/inspector-archives/list.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<text>被检查单位：{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>

safetyEnvirSubPackages/pages/inspector-confirms/list.vue

@@ -9,7 +9,7 @@
 		<!-- 吸顶搜索框 end -->
 
 		<!-- 列表渲染 start -->
-		<list :list="list" @scroll-to-lower="scrollToLower">
+		<list :list="list" @scrollToLower="scrollToLower">
 			<template #default="{ item }">
 				<view class="flex-between main-title">
 					<text>被检查单位：{{ item.INSPECTED_CORPINFO_ID_NAME }}</text>