From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/polling/point.vue | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/h5/pages/polling/point.vue b/h5/pages/polling/point.vue
index 4711fbc..1288d07 100644
--- a/h5/pages/polling/point.vue
+++ b/h5/pages/polling/point.vue
@@ -31,7 +31,7 @@
<video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
- <view class="desc">{{ info.dealInfo }}</view>
+ <view v-if="info.dealInfo" class="desc">{{ info.dealInfo }}</view>
<view class="line line_s">
<view class="la">宸℃浜猴細</view>
<view class="val">{{ info.realname }}</view>
@@ -78,11 +78,12 @@
</view>
</view>
- <view class="label">澶勭悊璇存槑</view>
- <textarea v-model="handleParam.dealInfo" placeholder="璇峰～鍐欏鐞嗚鏄�" placeholder-class="placeholder9" />
+ <view class="label" style="margin-bottom: 10rpx;">澶勭悊璇存槑</view>
+ <textarea v-model="handleParam.dealInfo" :maxlength="-1" placeholder="璇峰～鍐欏鐞嗚鏄�"
+ placeholder-class="placeholder9" />
</view>
</view>
- <view class="sub_btn" @click="onSubmit">纭宸℃</view>
+ <view v-if="info.status == 0" class="sub_btn" @click="onSubmit">纭宸℃</view>
<!-- -->
<u-popup :show="showUpload" @close="showUpload = false" closeOnClickOverlay>
<view class="sel_upload_wrap">
@@ -149,34 +150,38 @@
fileList,
id
} = this
- if (handleParam.dealStatus == 1) {
- return uni.showModal({
- title: '娓╅Θ鎻愮ず',
- content: '宸℃缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟锛�',
- success: function(res) {
- if (res.confirm) {
- patrolData({
- ...handleParam,
- multifileList: fileList,
- id,
- }).then(res => {
- this.showToast('鎿嶄綔鎴愬姛')
- uni.navigateBack()
- })
+ patrolData({
+ ...handleParam,
+ multifileList: fileList,
+ id,
+ }).then(res => {
+ if (handleParam.dealStatus == 1) {
+ return uni.showModal({
+ title: '娓╅Θ鎻愮ず',
+ content: '宸℃缁撴灉寮傚父锛屾槸鍚﹀墠寰�鎻愪氦宸ュ崟锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.showToast('鎿嶄綔鎴愬姛')
+ setTimeout(() => {
+ uni.redirectTo({
+ url: '/pages/workOrder/edit'
+ })
+ }, 300)
+ }else{
+ this.showToast('鎿嶄綔鎴愬姛')
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 300)
+ }
}
- }
- });
- } else {
- patrolData({
- ...handleParam,
- multifileList: fileList,
- id,
- }).then(res => {
+ });
+ } else {
this.showToast('鎿嶄綔鎴愬姛')
- uni.navigateBack()
- })
- }
-
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 300)
+ }
+ })
},
getDetail() {
const {
@@ -360,10 +365,11 @@
}
.sub_btn {
- position: fixed;
- bottom: 68rpx;
- left: 40rpx;
+ // position: fixed;
+ // bottom: 68rpx;
+ // left: 40rpx;
width: 670rpx;
+ margin-top: 60rpx;
height: 88rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
@@ -417,7 +423,7 @@
textarea {
box-sizing: border-box;
width: 690rpx;
- min-height: 200rpx;
+ min-height: 140rpx;
background-color: #f7f7f7;
font-size: 28rpx;
color: #333333;
--
Gitblit v1.9.3