From 792f528a16f342f76f970803cd1e04be94a72572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 16 May 2024 14:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E8=B7=B3=E8=BD=AC+=E5=AE=89?=
 =?UTF-8?q?=E6=A3=80=E5=B7=A1=E6=9F=A5-=E5=B7=A1=E6=9F=A5=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReport/InspectionReport.js      | 29 +++++++++++++++----
 .../InspectionReport/InspectionReport.wxml    | 10 +++----
 .../InspectionReport/InspectionReport.wxss    | 11 +++++++
 .../securityCheck/pages/securityCheck.wxml    |  2 +-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index 07849e8..d93557d 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -131,10 +131,21 @@ Page({
       hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] ,
       attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})),
       remark: ''
-    }).then(({
-      data
-    }) => {
-      console.log('data', data)
+    }).then(
+      res => {
+        if(res.code == 0){
+          wx.showToast({
+            title: '新增成功',
+            duration:2000,
+            success:function(){
+                setTimeout(()=>{
+                  wx.navigateBack({
+                      delta: 1
+                  })
+                },2000)
+            }
+          })
+        }
     });
 
   },
@@ -242,8 +253,16 @@ Page({
     }); // 点击按钮显示弹出层
   },
   onClose() {
+    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
+      showPopup: false,
+      selectedNames: names,
+      checkPersonsIdList:this.data.selectedOptions
     }); // 关闭弹出层
   },
   onChange1(event) {
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index 70de87b..f0f8545 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -61,8 +61,7 @@
 
   <view class="pitfall">
     <view class="prosecutors">
-      <view>
-        <text class="prosecutors_req">*</text>
+      <view class="requirement">
         <text class="prosecutors_pre">整改要求</text>
       </view>
     </view>
@@ -139,12 +138,11 @@
   </view>
 </view>
 <wux-actionsheet id="wux-actionsheet" />
-<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}}" wx:for="{{arr}}">{{item.name}}</van-checkbox>
+    <van-checkbox-group value="{{selectedOptions}}"  bind:change="onChange1">
+      <van-checkbox name="{{item.staffId}}"  custom-class="checkbox"  wx:for="{{arr}}">{{item.name}}</van-checkbox>
     </van-checkbox-group>
-    <button bindtap="confirmSelection">确定</button>
   </view>
 </van-popup>
 
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
index 499b5ae..fc6e03f 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
@@ -698,4 +698,15 @@ margin-bottom: 20rpx;
   text-align: left;
   white-space: nowrap;
   line-height: 42rpx;
+}
+.requirement{
+  padding-left:20rpx ;
+}
+.popup-content{
+  margin: 20rpx;
+  display: flex;
+ 
+}
+.checkbox{
+  margin: 40rpx;
 }
\ No newline at end of file
diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml
index 2f826b0..d1afb16 100644
--- a/subpages/securityCheck/pages/securityCheck.wxml
+++ b/subpages/securityCheck/pages/securityCheck.wxml
@@ -42,7 +42,7 @@
         </view>
     </view>
       <movable-area class="movable-area">
-        <movable-view class="movable-view" bind:tap="handleTap" direction="all" x="250" y="300">
+        <movable-view class="movable-view"  direction="all" x="250" y="300">
           <image src="../../../images/xuncha.png" class="image-wrapper" catchtouchend="handleTap"></image>
         </movable-view>
       </movable-area>