Browse Source

修改BUG

seimin 11 months ago
parent
commit
8dd87b481d

+ 0 - 2
components/IncidentAttachment.vue

@@ -8,7 +8,6 @@
8
         <image class="repairImg" :src="img.previewUrl" mode="aspectFill" v-for="(img, i) in pageData.repairImgList" :key="i" @click="previewImg(i)"></image>
8
         <image class="repairImg" :src="img.previewUrl" mode="aspectFill" v-for="(img, i) in pageData.repairImgList" :key="i" @click="previewImg(i)"></image>
9
       </view>
9
       </view>
10
       <view class="audio" v-if="incidentData.callID">
10
       <view class="audio" v-if="incidentData.callID">
11
-        <!-- <sy-audio isCountDown src='https://m801.music.126.net/20240418145806/654da83af722660e0fd769b4751127f0/jdyyaac/obj/w5rDlsOJwrLDjj7CmsOj/22271469539/935c/9115/d211/9dba43d41e350fbea95efe39cf5d7e07.m4a' audioTitle="" subheading=""></sy-audio> -->
12
         <sy-audio ref="audio" isCountDown :src='pageData.audioSrc' audioTitle="" subheading=""></sy-audio>
11
         <sy-audio ref="audio" isCountDown :src='pageData.audioSrc' audioTitle="" subheading=""></sy-audio>
13
       </view>
12
       </view>
14
     </view>
13
     </view>
@@ -105,7 +104,6 @@
105
           }else{
104
           }else{
106
             pageData.audioSrc = '';
105
             pageData.audioSrc = '';
107
           }
106
           }
108
-          pageData.audioSrc = 'https://webfs.tx.kugou.com/202404242004/4b0f4005ec22ee383a68b94258697ccd/v2/eb95a90ba7c513810d694d548b924a29/G347/M01/D0/C3/O5UEAGUDY0aAC4eQADXnW-VR_t4017.mp3'
109
         }else{
107
         }else{
110
           uni.showToast({
108
           uni.showToast({
111
             icon: 'none',
109
             icon: 'none',

+ 12 - 1
pages/handler/handler.vue

@@ -131,7 +131,7 @@
131
       </template>
131
       </template>
132
     </scroll-view>
132
     </scroll-view>
133
     <view class="foot_common_btns">
133
     <view class="foot_common_btns">
134
-      <button @click="goBack" type="default" class="cancelButton btn">返回</button>
134
+      <button @click="goBackOrToList" type="default" class="cancelButton btn">{{dataInfo.isSummaryNext ? '上一步' : '返回'}}</button>
135
       <button @click="submit" type="default" class="primaryButton btn">{{dataInfo.tabActiveValue === 'doing' && isInSummaryOrder ? '下一步' : '提交'}}</button>
135
       <button @click="submit" type="default" class="primaryButton btn">{{dataInfo.tabActiveValue === 'doing' && isInSummaryOrder ? '下一步' : '提交'}}</button>
136
     </view>
136
     </view>
137
     <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
137
     <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
@@ -207,6 +207,17 @@
207
     return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
207
     return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
208
   })
208
   })
209
   
209
   
210
+  // 上一步或者返回列表
211
+  function goBackOrToList(){
212
+    if(dataInfo.isSummaryNext){
213
+      goBack();
214
+    }else{
215
+      uni.reLaunch({
216
+        url: '/pages/incidentList/incidentList'
217
+      })
218
+    }
219
+  }
220
+  
210
   // 上传处理图片成功
221
   // 上传处理图片成功
211
   function handlerImgSuccess(e){
222
   function handlerImgSuccess(e){
212
     dataInfo.handlerImgList.forEach(v => {
223
     dataInfo.handlerImgList.forEach(v => {

+ 7 - 7
pages/incidentList/incidentList.vue

@@ -26,8 +26,9 @@
26
             <text class="name ellipsis">延期处理:{{currentLogOverTime(data.currentLog)}}</text>
26
             <text class="name ellipsis">延期处理:{{currentLogOverTime(data.currentLog)}}</text>
27
           </view>
27
           </view>
28
           <view class="body_item_content_p">
28
           <view class="body_item_content_p">
29
-            <text class="name"><template v-if="data.assigneeName">处理人:{{data.assigneeName}}</template></text>
30
-            <text class="name"><template v-if="data.candidateGroupsName">处理组:{{data.candidateGroupsName}}</template></text>
29
+            <text class="name" v-if="data.assigneeName">处理人:{{data.assigneeName}}</text>
30
+            <text class="name" v-else-if="data.candidateGroupsName">处理组:{{data.candidateGroupsName}}</text>
31
+            <text class="name" v-else></text>
31
             <view class="icon_all" @click.stop="attachmentClick(data)">
32
             <view class="icon_all" @click.stop="attachmentClick(data)">
32
               <uni-icons type="mic-filled" class="mic-filled" :size="22" color="#949494" v-if="data.callID"></uni-icons>
33
               <uni-icons type="mic-filled" class="mic-filled" :size="22" color="#949494" v-if="data.callID"></uni-icons>
33
               <uni-icons type="image-filled" class="image-filled" :size="22" color="#949494" v-if="data.reqAttachment"></uni-icons>
34
               <uni-icons type="image-filled" class="image-filled" :size="22" color="#949494" v-if="data.reqAttachment"></uni-icons>
@@ -287,7 +288,6 @@
287
       uni.stopPullDownRefresh();
288
       uni.stopPullDownRefresh();
288
       if(res.status == 200){
289
       if(res.status == 200){
289
         let list = res.list || [];
290
         let list = res.list || [];
290
-        list = list.map(v => ({...v, ...{callID:123}}))//模拟
291
         if(list.length){
291
         if(list.length){
292
           dataInfo.hasMore = true;
292
           dataInfo.hasMore = true;
293
           dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
293
           dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
@@ -363,7 +363,7 @@
363
 
363
 
364
 <style lang="scss" scoped>
364
 <style lang="scss" scoped>
365
 page{
365
 page{
366
-  height: calc(100vh - 50px);
366
+  height: calc(100vh - var(--window-bottom));
367
 }
367
 }
368
 .incidentList{
368
 .incidentList{
369
   display: flex;
369
   display: flex;
@@ -400,7 +400,7 @@ page{
400
     }
400
     }
401
   }
401
   }
402
   .body{
402
   .body{
403
-    margin-bottom: 50px;
403
+    margin-bottom: var(--window-bottom);
404
     margin-top: 88rpx;
404
     margin-top: 88rpx;
405
     border-top: 6rpx solid #EBEBEB;
405
     border-top: 6rpx solid #EBEBEB;
406
     .body_item{
406
     .body_item{
@@ -461,10 +461,10 @@ page{
461
   }
461
   }
462
   .zanwu{
462
   .zanwu{
463
     box-sizing: border-box;
463
     box-sizing: border-box;
464
-    margin-bottom: 50px;
464
+    margin-bottom: var(--window-bottom);
465
     margin-top: 88rpx;
465
     margin-top: 88rpx;
466
     border-top: 6rpx solid #EBEBEB;
466
     border-top: 6rpx solid #EBEBEB;
467
-    height: calc(100vh - 50px - 88rpx);
467
+    height: calc(100vh - var(--window-bottom) - 88rpx);
468
     display: flex;
468
     display: flex;
469
     justify-content: center;
469
     justify-content: center;
470
     background-color: #F7F7F7;
470
     background-color: #F7F7F7;

+ 2 - 2
pages/my/my.vue

@@ -146,7 +146,7 @@
146
 
146
 
147
 <style lang="scss" scoped>
147
 <style lang="scss" scoped>
148
 page{
148
 page{
149
-  height: calc(100vh - 50px);
149
+  height: calc(100vh - var(--window-bottom));
150
   background-color: #EBEBEB;
150
   background-color: #EBEBEB;
151
 }
151
 }
152
 .mine{
152
 .mine{
@@ -163,7 +163,7 @@ page{
163
   .body{
163
   .body{
164
     width: 714rpx;
164
     width: 714rpx;
165
     height: 100%;
165
     height: 100%;
166
-    margin: 16rpx auto 50px auto;
166
+    margin: 16rpx auto var(--window-bottom) auto;
167
     box-sizing: border-box;
167
     box-sizing: border-box;
168
     border-radius: 8rpx;
168
     border-radius: 8rpx;
169
     .top{
169
     .top{