处理小程序上事件上报禅道上的bug

pages/work2/work2.wxml

@@ -81,7 +81,7 @@
             <text lines="1" class="text_3-0"  bind:tap="onData">安检巡查</text>
           </view>
           <view style="display: flex; justify-items: center;">
-            <image src="/images/work2/12345.png" class="image_13-21" bind:tap="onHotlineCompletion"></image>
+            <image src="/images/work2/12345.png" class="image_13-21" style="margin-left: 25px;" bind:tap="onHotlineCompletion"></image>
             <text lines="1" class="text_4-0">热线接办</text>
           </view>
           </view>

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js

@@ -577,10 +577,6 @@ formatTimestamp(timestamp) {
       return
     }
     if (this.data.tabVal === '1') {
-      if (!this.data.fmData.content) {
-        this.showToast('需求描述不能为空')
-        return
-      }
       if (!this.data.fmData.content) {
         this.showToast('需求描述不能为空')
         return
@@ -611,8 +607,14 @@ formatTimestamp(timestamp) {
       }
     } else {
       if (!this.data.fmData.content) {
+        if(this.data.fmData.voiceList.length<=0){
             this.showToast('事件描述不能为空')
             return
+        }else{
+            this.setData({
+                'fmData.content': "语音事件",
+              })
+        }
       }
       if (!this.data.fmData.happenTime) {
         this.showToast('发生时间不能为空')

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml

@@ -192,61 +192,61 @@
           </view>
       </view>
 
-      <view class="card" wx:if="{{tabVal === '0' || tabVal === '2'}}">
-        <view class="title" style="margin-bottom: 0;">处理进展</view>
+      <view class="card" wx:if="{{(tabVal === '0' || tabVal === '2') && processData.length > 0}}">
+        <view class="title1" style="margin-bottom: 0;">处理进展</view>
         <wux-steps wx:if="{{processData.length > 0}}" style="margin-top: 50rpx" direction="vertical" :current="0">
             <wux-step wx:for="{{processData}}" wx:key="index" icon="none">
-                <view slot="title">
+                <view slot="title" class="step-container">
                     <view class="step-title" wx:if="{{item.agencyId}}">【指派】</view>
                     <view class="step-title" wx:if="{{!item.timeLimit}}">【完成并回复】</view>
                     <view class="step-title" wx:if="{{!item.agencyId && item.timeLimit}}">【{{ item.processName }}】
                     </view>
+                    <view class="step-time">{{item.formattedTime}}</view>
                 </view>
                 <view slot="content">
-                    <view class="step-time">{{item.formattedTime}}</view>
                     <view wx:if="{{item.type === 'event'}}">
                         <view wx:if="{{item.agencyId}}">
                             <view class="card_content">
-                                <view class="label">指派人：</view>
-                                <view class="value">
+                                <view class="label1">指派人：</view>
+                                <view class="value1">
                                     {{ item.departmentName }}
                                 </view>
                             </view>
                             <view class="card_content">
-                                <view class="label">指派部门：</view>
-                                <view class="value">
+                                <view class="label1">指派部门：</view>
+                                <view class="value1">
                                     {{ item.agencyName }}
                                 </view>
                             </view>
                             <view class="card_content">
-                                <view class="label">转办意见：</view>
-                                <view class="value">
+                                <view class="label1">转办意见：</view>
+                                <view class="value1">
                                     {{ item.publicReply }}
                                 </view>
                             </view>
                             <view class="card_content">
-                                <view class="label">办结时限：</view>
-                                <view class="value">
+                                <view class="label1">办结时限：</view>
+                                <view class="value1">
                                     {{ item.timeLimit }}
                                 </view>
                             </view>
                         </view>
                         <view wx:else>
                             <view class="card_content">
-                                <view class="label">回复人：</view>
-                                <view class="value">
+                                <view class="label1">回复人：</view>
+                                <view class="value1">
                                     {{ item.departmentName }}
                                 </view>
                             </view>
                             <view class="card_content">
-                                <view class="label">回复内容：</view>
-                                <view class="value">
+                                <view class="label1">回复内容：</view>
+                                <view class="value1">
                                     {{ item.publicReply }}
                                 </view>
                             </view>
                             <view class="card_content" wx:if="{{item.timeLimit}}">
-                                <view class="label">办结时限：</view>
-                                <view class="value">
+                                <view class="label1">办结时限：</view>
+                                <view class="value1">
                                     {{ item.timeLimit }}
                                 </view>
                             </view>

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss

@@ -585,11 +585,11 @@ background: rgb(175, 1, 1);
   display: flex;
   align-items: center;
   color: #999;
-  font-size: 28rpx;
+  font-size: 25rpx;
   font-weight: 300;
 }
 .radio-group radio + radio {
-  margin-left: 20rpx;
+  margin-left: 5rpx;
 }
 
 .radio-group-small {
@@ -1054,7 +1054,7 @@ background: rgb(175, 1, 1);
     padding: 30rpx;
     margin-top: 20rpx;
 }
-.card .title {
+.card .title1 {
     font-size: 34rpx;
     font-weight: bold;
     color: #333333;
@@ -1064,7 +1064,7 @@ background: rgb(175, 1, 1);
     margin-bottom: 39rpx;
     position: relative;
 }
-.card .title:before {
+.card .title1:before {
     content: '';
     display: block;
     width: 10rpx;
@@ -1077,27 +1077,37 @@ background: rgb(175, 1, 1);
 .step-title {
     font-size: 32rpx;
     font-weight: 500;
-    color: #333333;
+    color: #fcfcfc;
     margin-left: -.5em;
+    background-color: #3A80E7;
 }
 
 .step-time {
     font-size: 26rpx;
     font-weight: 400;
     color: #999999;
-    margin: 20rpx 0 30rpx;
+    margin-left: 30rpx;
+    
 }
 
 .card_content {
     display: flex;
     font-weight: 400;
     color: #999999;
+    margin-top: 20rpx;
 }
-.label {
+.label1 {
     white-space: nowrap;
     font-size: 30rpx;
-    margin-bottom: 22rpx;
+    /* margin-bottom: 22rpx; */
 }
-.value {
+.value1 {
     color: #333;
 }
+
+.step-container {
+    display: flex;
+    flex-direction: row;
+    align-items: center; /* 垂直居中对齐 */
+    margin-top: 35rpx;
+}

subpages/myTroubleshootDemand/pages/event/event.js

@@ -23,8 +23,8 @@ Page({
         categoryIds:'',
 
         currentDate: new Date().getTime(),
-        minDate: new Date(2024, 0, 1).getTime(),
-        maxDate: new Date().getTime(),
+        minDate: new Date(2020, 0, 1).getTime(),
+        maxDate: new Date(2030, 12, 31).getTime(),
 
         form: {
             operationType: "0", //处理方式[0:已回复 5、指派  6、完成并回复]
@@ -34,7 +34,9 @@ Page({
             deptId: "", //指派部门
             deptName: "",
             categoryList: [],
-            files: [] //附件
+            files: [], //附件
+            sendMsg: 1,           // 这个存储选中值（整数1或0）
+            sendMsgArray: ['1']   // 默认选中，值为数组['1']
         },
 
         categoryTreeData:[]
@@ -184,7 +186,7 @@ Page({
         }
         agencyGridDepttree(params).then(res => {
             this.setData({
-                orgOptions: this.deleteChildren(res.data.subAgencyList, 'subAgencyList')
+                orgOptions: this.deleteChildren([res.data], 'subAgencyList')
             })
         })
     },
@@ -243,7 +245,18 @@ Page({
     },
     onClose2() {
         this.setData({visible2: false})
-        console.log('onClose2')
+        
+    },
+    onChange2(e) {
+        let data = e.detail
+
+        let params = data.selectedOptions[data.selectedOptions.length - 1]
+        this.setData({
+            "form.deptId": params.agencyId,
+            "form.deptName": params.agencyName,
+            "form.orgType": params.level
+        })
+        this.setData({orgName: data.selectedOptions.map(item => item.agencyName).join('/')})
     },
     onConfirm2(e) {
         let data = e.detail
@@ -359,11 +372,12 @@ Page({
           }
 
         
+          
         let params = {
             ...this.data.form,
             files: this.data.fileList,
             icEventId: this.data.id,
-            status: "processing",
+            status: this.data.tabVal==="6"?"closed_case":"processing",
             // timeLimit: this.data.value1 && this.data.value1.length ? this.data.value1[0] : ""
         }
         icEventOldReply(params).then(res => {
@@ -389,4 +403,12 @@ Page({
     })
   },
 
+  sendMsgChange(e) {
+    const selected = e.detail.length > 0; // 判断复选框是否选中
+        this.setData({
+            'form.sendMsg': selected ? 1 : 0, // 如果选中则值为1，否则为0
+            'form.sendMsgArray': selected ? ['1'] : [] // 更新sendMsgArray
+        });
+  },
+
 })

subpages/myTroubleshootDemand/pages/event/event.json

@@ -5,6 +5,8 @@
         "van-calendar": "@vant/weapp/calendar/index",
         "van-uploader": "@vant/weapp/uploader/index",
         "van-picker": "@vant/weapp/picker/index",
+        "van-checkbox": "@vant/weapp/checkbox/index",
+        "van-checkbox-group": "@vant/weapp/checkbox-group/index",
         "wux-date-picker": "../../../../components/dist/date-picker/index"
 
     },

subpages/myTroubleshootDemand/pages/event/event.wxml

@@ -57,7 +57,7 @@
                     <view class="field-text">附件</view>
                   </view>
                   <view>
-                    <van-uploader file-list="{{ fileList }}" accept="image/*, .pdf, .doc, .docx" bind:delete="deleteFile" max-count="4" bind:after-read="afterRead" />
+                    <van-uploader file-list="{{ fileList }}" bind:delete="deleteFile" max-count="4" bind:after-read="afterRead" />
                   </view>
             </view>
 
@@ -72,6 +72,16 @@
                 </view>
             </view>
 
+            <view class="item" wx:if="{{tabVal == 5}}">
+                  <view>
+                    <van-checkbox-group bind:change="sendMsgChange" value="{{ form.sendMsgArray }}">
+                        <view class="flex">
+                            <van-checkbox name="1">短信通知部门负责人</van-checkbox>
+                        </view>
+                    </van-checkbox-group>
+                  </view>
+            </view>
+
         </view>
     </view>
     </view>
@@ -102,31 +112,16 @@
             options="{{ orgOptions }}"
             bind:close="onClose2"
             bind:finish="onConfirm2"
+            bind:change="onChange2"
             field-names="{{orgField}}"
     />
 </van-popup>
 
-<!-- <van-calendar
-        show="{{ showDate }}"
-        bind:close="onCloseDate"
-        bind:confirm="onConfirmDate"
-/> -->
-<!-- <van-popup show="{{ showDate }}" close-icon="close" position="bottom" custom-style="height: 50%" bind:close="closePopup" round>
-    <van-datetime-picker
-      type="datetime"
-      value="{{ currentDate }}"
-      min-date="{{ minDate }}"
-      max-date="{{ maxDate }}"
-      bind:input="onInput"
-      bind:confirm="onConfirmDate"
-      bind:cancel="onCloseDate"
-    />
-</van-popup> -->
 <wux-date-picker
     visible="{{ showDate }}"
     controlled
     mode="datetime"
-    value="{{ form.timeLimit }}"
+    value="{{currentDate}}"
     lang="zh_CN"
     minDate="{{minDate}}"
     maxDate="{{maxDate}}"

subpages/myTroubleshootDemand/pages/index/index.js

@@ -29,6 +29,7 @@ Page({
             inspRecordId:options.inspRecordId,
             createdBy:app.globalData.user.id
         })
+        this.getMyWaitTroubleshootDemandList()
     },
 
     /**

subpages/myTroubleshootDemand/pages/index/index.wxml

@@ -9,6 +9,7 @@
                                 <text class="{{item.type == 'event'?'blue_small':item.type == 'chengguan'?'green_small':'red_small'}}">{{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}}</text>
                                 {{item.name}} {{item.mobile}}
                             </view>
+                            <text class="gray_small">{{item.status == 'processing'?'处理中':'已完成'}}</text>
                         </view>
                         <view style="margin-top: 10rpx;">
                             <text class="card_content" maxLines="{{2}}" overflow="ellipsis">{{item.content}}</text>   
@@ -31,6 +32,7 @@
                                 <text class="{{item.type == 'event'?'blue_small':item.type == 'chengguan'?'green_small':'red_small'}}">{{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}}</text>
                                 {{item.name}} {{item.mobile}}
                             </view>
+                            <text class="gray_small">{{item.status == 'processing'?'处理中':'已完成'}}</text>
                         </view>
                         <view style="margin-top: 10rpx;">
                             <text class="card_content" maxLines="{{2}}" overflow="ellipsis">{{item.content}}</text>   

subpages/myTroubleshootDemand/pages/index/index.wxss

@@ -45,6 +45,12 @@ page {
     background-color: #eef4fd;
     color: #5cc789;
 }
+
+.gray_small{
+    background-color: #a4a8ad;
+    color: #fdfdfd;
+    font-size: 25rpx;
+}
   .content{
       width: 100%;
       padding:0 20rpx ;
@@ -67,7 +73,11 @@ page {
       overflow: hidden;
       box-sizing: border-box;
       color: #333;
+      position: relative; /* 为了使用伪元素 */
+      margin-bottom: 20rpx;
   }
+
+
   .content .card .title{
       display: flex;
       justify-content: space-between;