From 22ddbc7373abeb233209b888d953a294f1a82aa5 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 3 Mar 2023 17:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weapp/package/troubleshooting/index.wxml | 40 +++++++++++++++---------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/weapp/package/troubleshooting/index.wxml b/weapp/package/troubleshooting/index.wxml
index 6444ae6..27dd5fa 100644
--- a/weapp/package/troubleshooting/index.wxml
+++ b/weapp/package/troubleshooting/index.wxml
@@ -11,33 +11,34 @@
     </view>
     <view>
         <van-dropdown-menu>
-            <van-dropdown-item title="{{ '结构物' }}" bind:close="search">
-                <view style="max-height:60%">
+            <van-dropdown-item title="{{ '结构物' }}" bind:close="onDropDownClose">
+                <view style="max-height:888rpx">
                     <van-checkbox-group value="{{ structResult }}" bind:change="onStructChange">
                         <van-cell-group>
-                            <van-cell wx:for="{{ structList }}" wx:key="index" title="复选框 {{ item }}" value-class="value-class" clickable data-index="{{ index }}" bind:click="structToggle">
-                                <van-checkbox catch:tap="noop" class="checkboxes-struct-{{ index }}" name="{{ item }}" />
+                            <van-cell wx:for="{{ structList }}" wx:key="index" title="{{ item.name }}" value-class="value-class" clickable data-id="{{ item.id }}" data-index="{{index}}" bind:click="structToggle">
+                                <van-checkbox catch:tap="noop" class="checkboxes-struct-{{ index }}" name="{{ item.id }}" />
                             </van-cell>
                         </van-cell-group>
                     </van-checkbox-group>
                 </view>
             </van-dropdown-item>
-            <van-dropdown-item title="{{ '点位' }}" bind:close="search">
-                <view style="max-height:60%">
-                    <van-checkbox-group value="{{ pointResult }}" bind:change="onPointChange">
+            <van-dropdown-item title="{{ '点位' }}" bind:close="onDropDownClose">
+                <view style="max-height:888rpx">
+                    <!-- <van-checkbox-group value="{{ pointResult }}" bind:change="onPointChange"> -->
                         <van-cell-group>
-                            <van-cell wx:for="{{ pointList }}" wx:key="index" title="复选框 {{ item }}" value-class="value-class" clickable data-index="{{ index }}" bind:click="pointToggle">
-                                <van-checkbox catch:tap="noop" class="checkboxes-point-{{ index }}" name="{{ item }}" />
+                            <van-cell wx:for="{{ pointList }}" wx:key="index" title="{{ item.name }}" value-class="value-class" clickable data-index="{{ index }}" 
+                            data-id="{{ item.id }}" bind:click="pointToggle">
+                                <van-checkbox catch:tap="noop" class="checkboxes-point-{{ item.id }}" name="{{ item.id }}" value="{{item.selected}}"/>
                             </van-cell>
                         </van-cell-group>
-                    </van-checkbox-group>
+                    <!-- </van-checkbox-group> -->
                 </view>
             </van-dropdown-item>
-            <van-dropdown-item title="{{ '时间' }}" bind:close="search">
+            <van-dropdown-item title="{{ '时间' }}" bind:close="onDropDownClose">
                 <view style="max-height:60%; display:flex" class="time-option">
-                    <van-datetime-picker type="datetime" show-toolbar="{{false}}" type="date" value="{{ startTime }}" bind:input="onStartTimeChange" />
+                    <van-datetime-picker type="datetime" show-toolbar="{{false}}" type="date" value="{{ startTime }}" bind:input="onStartTimeChange" min-date="{{1640966400000}}"/>
                     <view style="display:flex; align-items:center">至</view>
-                    <van-datetime-picker type="datetime" show-toolbar="{{false}}" type="date" value="{{ endTime }}" bind:input="onEndTimeChange" />
+                    <van-datetime-picker type="datetime" show-toolbar="{{false}}" type="date" value="{{ endTime }}" bind:input="onEndTimeChange" min-date="{{1640966400000}}"/>
                 </view>
             </van-dropdown-item>
         </van-dropdown-menu>
@@ -47,7 +48,7 @@
             <view wx:for="{{dataList}}">
                 <view class="mission-card-title">
                     <span>{{item.PatrolRecord.points.project.name}}</span>
-                    <van-button type="info" round bind:tap="toShootingForm" data-shootingid="{{item.id}}">
+                    <van-button wx:if="{{powerCheckDetail || currentTab == 0}}" type="info" round bind:tap="toShootingForm" data-shootingid="{{item.id}}">
                         {{
                             currentTab == 0?
                           item.state == 1 ?'制定计划':
@@ -65,11 +66,22 @@
                                item.state == 6 ?'验收通过':'驳回重修'
                         }}
                     </van-button>
+                    <span wx:elif="{{!powerCheckDetail}}">
+                        {{
+                        item.state == 1 ?'制定计划':
+                           item.state == 2 ?'计划已提交待审批':
+                            item.state == 3 ?'计划审批驳回':
+                             item.state == 4 ?'计划审批通过待维修':
+                              item.state == 5 ?'维修完成待验收':
+                               item.state == 6 ?'验收通过':'驳回重修'
+                        }}
+                    </span>
                 </view>
                 <van-field value="{{item.PatrolRecord.points.itemData.name}}" label="点位名称" readonly border="{{ false }}" />
                 <van-field value="{{item.PatrolRecord.points.itemData.name}}" label="异常等级" readonly border="{{ false }}" />
                 <van-field value="{{ item.createTime}}" label="任务下发时间" readonly border="{{ false }}" />
             </view>
+            <view style="height:128rpx"/>
         </van-cell-group>
         <!-- 暂无数据 -->
         <view wx:if="{{!dataList.length}}">