提报

pages/submission/details.js

@@ -47,7 +47,7 @@ Page({
                 list = [];
             if (submitedit.length) {
                 for (let i = 0; i < submitedit.length; i++) {
-                    (submitedit[i].status == '未提报') ? this.delete_submitdetailed(submitedit[i].sat_submiteditid): list.push(submitedit[i]);
+                    (submitedit[i].status == '未提报' && submitedit[i].content == '') ? this.delete_submitdetailed(submitedit[i].sat_submiteditid): list.push(submitedit[i]);
                 };
                 res.data.submitedit = list;
             };
@@ -121,6 +121,9 @@ Page({
         if (this.data.submiteditData.sat_submiteditmodelid) return this.setData({
             startRecord: true
         })
+        this.setData({
+            content: ""
+        })
         _Http.basic({
             "classname": "saletool.submitedit.submitedit",
             "method": "insertorupdate",
@@ -130,7 +133,6 @@ Page({
                 "sat_submiteditid": 0
             }
         }).then(res => {
-            console.log("asdasd", res)
             if (res.msg != '成功') return wx.showToast({
                 title: res.data,
                 icon: "none"
@@ -139,7 +141,6 @@ Page({
                 startRecord: true,
                 submiteditData: res.data
             })
-            console.log(this.data.submiteditData)
         })
     },
     /* 隐藏新建 */
@@ -148,7 +149,6 @@ Page({
             startRecord: false
         })
     },
-
     /* 提交明细 */
     submit() {
         if (!this.data.content && this.data.detailsData.istextrequired == 1) return wx.showToast({
@@ -205,8 +205,11 @@ Page({
                     title: '提交成功',
                 });
                 res.data.status = '已提报';
+                let submitedit = this.data.detailsData.submitedit;
+                let i = submitedit.findIndex(v => v.sat_submiteditid == res.data.sat_submiteditid);
+                i == -1 ? submitedit.push(res.data) : submitedit[i] = res.data;
                 this.setData({
-                    "detailsData.submitedit": this.data.detailsData.submitedit.concat([res.data]),
+                    "detailsData.submitedit": submitedit,
                     submiteditData: [],
                     startRecord: false,
                     done: this.data.oneToOne == 'true' ? true : '',
@@ -230,6 +233,15 @@ Page({
         })
     },
 
+    reedit() {
+        this.setData({
+            CheckTheRecord: false,
+            submiteditData: this.data.recordL,
+            startRecord: true,
+            content: this.data.recordL.content
+        })
+    },
+
     recordClose() {
         this.setData({
             recordL: {},

pages/submission/details.scss

@@ -31,6 +31,7 @@
 
 /* 历史 */
 .history {
+    position: relative;
     width: 690rpx;
     padding: 30rpx;
     padding-top: 28rpx;
@@ -43,7 +44,8 @@
     font-size: 28rpx;
 
 
-    .line-2 {
+    .line-1 {
+        max-width: 550rpx;
         color: #333333;
         line-height: 44rpx;
     }
@@ -55,6 +57,21 @@
         color: #999999;
         margin-top: 20rpx;
     }
+
+    .back {
+        position: absolute;
+        width: 64rpx;
+        height: 36rpx;
+        border-radius: 4rpx;
+        border: 1rpx solid #FF3B30;
+        font-size: 20rpx;
+        font-family: PingFangSC-Regular-, PingFangSC-Regular;
+        color: #FF3B30;
+        text-align: center;
+        line-height: 36rpx;
+        top: 30rpx;
+        right: 30rpx;
+    }
 }
 
 /* 文本域 */

pages/submission/details.wxml

@@ -9,11 +9,14 @@
 <view class="box" style="background: none;">
     <view class="title multi-line">提报记录</view>
     <navigator class="history" url="#" wx:for="{{detailsData.submitedit}}" data-item="{{item}}" bindtap="seeHistory">
-        <view class="line-2">{{item.content}}</view>
+        <view class="line-1">
+            {{item.content}}
+        </view>
         <view class="data">
             <text>提交时间:{{item.createdate}}</text>
             <text>附件数量:{{item.attinfos.length}}</text>
         </view>
+        <view wx:if="{{item.status=='新建'}}" class="back">退回</view>
     </navigator>
 </view>
 <My_empty wx:if="{{!detailsData.submitedit.length}}" />
@@ -46,8 +49,14 @@
         </view>
         <view class="title multi-line" wx:if="{{recordL.attinfos.length}}">提报附件<text>已上传{{recordL.attinfos.length}}个</text></view>
         <My_accessory list='{{recordL.attinfos}}' />
+        <view style="height: 600px; width: 50rpx;background: red;"></view>
+        <view class="footer" style="margin-left: -30rpx;">
+            <van-button round custom-class='button' bindtap="reedit">重新编辑</van-button>
+        </view>
+        <view style="height: 160rpx;" />
     </view>
 </van-popup>
+
 <!-- 底部按钮 -->
 <view class="footer" wx:if="{{!done}}">
     <van-button round custom-class='button' bindtap="establish">开始提报</van-button>

pages/submission/index.scss

@@ -51,13 +51,21 @@ page {
             align-items: center;
 
             .base {
-                width: 80rpx;
-                height: 40rpx;
+                width: 80rpx !important;
+                height: 40rpx !important;
                 border-radius: 20rpx;
                 padding: 0 !important;
                 font-size: 20rpx;
                 font-family: PingFang SC-Regular, PingFang SC;
                 color: #999999;
+                background-color: #EEEEEE;
+            }
+
+            .unread {
+                background-color: #FFE3E1 !important;
+                border: none !important;
+                color: #FF3B30 !important;
+                font-size: 20rpx;
             }
         }
     }

pages/submission/index.wxml

@@ -39,7 +39,8 @@
                 <view>已提报：{{item.submitcount}}</view>
             </view>
             <view class="but">
-                <van-button custom-class='read-but base'>{{item.isRead==1?'已':'未'}}读</van-button>
+                <van-button wx:if="{{item.isRead==1}}" custom-class='base'>已读</van-button>
+                <van-button wx:else custom-class='base unread'>未读</van-button>
             </view>
         </view>
     </navigator>