vue2-client 1.22.37 → 1.22.39

package/src/base-client/components/common/XInspectionDetailDrawer/components/DeviceStatus.vue

@@ -101,7 +101,7 @@
                 :ref="el => registerFig(el)"
               />
             </div>
-            <!-- 隐患照片 -->
+            <!-- 隐患照片 -->
             <div class="hazard-photos-section" v-if="device.hazardPhotos && device.hazardPhotos.length > 0">
               <div class="section-title">隐患照片</div>
               <!-- 隐患照片使用FileImageGroup -->

package/src/base-client/components/common/XInspectionDetailDrawer/demo.vue

@@ -48,7 +48,12 @@ export default {
         this.$message.warning('请输入有效的安检 ID')
         return
       }
-      this.$refs.detailDrawer.init({ id })
+      this.$refs.detailDrawer.init({
+        historyListParams: {
+          f_content: '合规'
+        },
+        f_userinfo_id: 96448
+      })
     },
     handleRefresh () {
       this.$message.success('详情已刷新')

package/src/base-client/components/common/XInspectionDetailDrawer/index.vue

@@ -426,7 +426,11 @@ export default {
         this.showHistoryPanel = !params?.id && !!params?.f_userinfo_id
 
         if (params.f_userinfo_id) {
-          const historyList = await inspectionService.getHistoryList(params.f_userinfo_id)
+          const historyListParams = {
+            ...(params.historyListParams ?? {}),
+            f_userinfo_id: params.f_userinfo_id
+          }
+          const historyList = await inspectionService.getHistoryList(historyListParams)
           if (historyList && historyList.length > 0) {
             this.inspectionData.historyList = historyList
             if (!params.id) {
@@ -463,9 +467,9 @@ export default {
       }
       console.warn('datra', data)
       this.formFigInstances = []
-      //遍历隐患明细,获取隐患处理后照片
+      // 遍历隐患明细,获取隐患处理后照片
       for (let i = 0; i < data.hazardList.length; i++) {
-        let  param = { defectId:data.hazardList[i].id }
+        const  param = { defectId:data.hazardList[i].id }
         const res = await runLogic('getDefectDetailList', param,'af-safecheck')
         data.hazardList[i].handleimages=res[0].handleimages
       }

package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionDetailApi.js

@@ -14,8 +14,8 @@ export const getInspectionFullDetail = async (paperId) => {
   }
   throw new Error('API返回数据格式不正确')
 }
-export const fetchHistoryList = async (userinfoId) => {
-  return post('api/af-safecheck/logic/getSafecheckHistoryList', { f_userinfo_id: userinfoId })
+export const fetchHistoryList = async (params) => {
+  return post('api/af-safecheck/logic/getSafecheckHistoryList', params)
 }
 
 export const approveInspection = async (params) => {

package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionService.js

@@ -34,8 +34,8 @@ class InspectionService {
     return getInspectionFullDetail(id)
   }
 
-  async getHistoryList (userInfoId) {
-    const list = await fetchHistoryList(userInfoId)
+  async getHistoryList (params) {
+    const list = await fetchHistoryList(params)
     return this.formatHistoryList(list)
   }