样式修改

subpages/InspectionReport/pages/InspectionReport/InspectionReport.js

@@ -130,7 +130,8 @@ Page({
       reviewTime:`${this.data.reviewTime} ${hours}:${minutes}:${seconds}`,
       hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] ,
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
-      remark: ''
+      remark: '',
+      address:this.data.addressContent
     }).then(
       res => {
         if(res.code == 0){
@@ -157,6 +158,7 @@ Page({
     }).then(({
       data
     }) => {
+      console.log(data)
       this.setData({
         companyList: data.list,
       });

subpages/safetyinspection/pages/safetyinspection/safetyinspection.js

@@ -1,9 +1,8 @@
-
 // subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
 import { $wuxActionSheet } from '../../../../components/dist/index'
 const App = getApp()
 import {
-  showRecord,addRecord,inspectionStaff
+  showRecord,addRecord,inspectionStaff,securityCheckk
 } from "../../../../utils/api"
 
 const config = require('../../../../utils/config')
@@ -50,6 +49,7 @@ Page({
 
     this.showRecordData()
     this.toOinspectionStaff()
+    this.securityCheckk()
   },
 
   /**
@@ -91,6 +91,19 @@ Page({
    */
   onShareAppMessage() {
   },
+  securityCheckk(){
+    securityCheckk({
+      pageNo: this.data.pageNo,
+      pageSize: this.data.pageSize,
+    }).then(({
+      data
+    }) => {
+      console.log(data)
+      this.setData({
+        companyList: data.list,
+      });
+    });
+  },
   onChange(event) {
     console.log(event.detail);
     this.data.checkboxOptions.forEach((item,index)=>{
@@ -173,7 +186,17 @@ Page({
     this.setData({ showPopup: true }); // 点击按钮显示弹出层
   },
   onClose() {
-    this.setData({ showPopup: false }); // 关闭弹出层
+    let names = []
+    this.data.arr.forEach(item=>{
+      if(this.data.selectedOptions.findIndex(itemC=>itemC === item.staffId) != -1){
+        names.push(item.name)
+      }
+    })
+    this.setData({
+      showPopup: false,
+      selectedNames: names,
+      checkPersonsIdList:this.data.selectedOptions
+    }); // 关闭弹出层
   },
   onChange1(event) {
     console.log(event)
@@ -276,7 +299,8 @@ handelClickSave(){
     reviewTime:`${this.data.reviewTime} ${hours}:${minutes}:${seconds}`,
     hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList),
     attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
-    remark:this.data.remark
+    remark:this.data.remark,
+    address:""
   }
 console.log(this.data.checkboxOptions.concat(this.data.addHiddenDangeList))
 addRecord(form).then(res => {

subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml

@@ -151,12 +151,11 @@
       <text class="btn_text">提交</text>
     </view>
   </view>
-<van-popup show="{{ showPopup }}" closeable close-icon="close" position="bottom" custom-style="height: 50%" bind:close="onClose">
+<van-popup show="{{ showPopup }}" closeable close-icon="close" position="bottom" custom-style="height: 50%" bind:close="onClose" round>
   <view class="popup-content">
     <van-checkbox-group value="{{selectedOptions}}" bind:change="onChange1">
-      <van-checkbox name="{{item.staffId}}" data-value="{{item.value}}" wx:for="{{arr}}">{{item.name}}</van-checkbox>
+      <van-checkbox name="{{item.staffId}}"custom-class="checkbox"  data-value="{{item.value}}" wx:for="{{arr}}">{{item.name}}</van-checkbox>
     </van-checkbox-group>
-    <button bindtap="confirmSelection">确定</button>
   </view>
 </van-popup>
 <wux-actionsheet id="wux-actionsheet" />

subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss

@@ -431,4 +431,12 @@ margin-bottom: 20rpx;
   text-align: left;
   white-space: nowrap;
   line-height: 42rpx;
+}
+.popup-content{
+  margin: 20rpx;
+  display: flex;
+ 
+}
+.checkbox{
+  margin: 40rpx;
 }