提报

pages/submission/details.js

@@ -1,136 +1,139 @@
 const _Http = getApp().globalData.http;
-
 Page({
-
     /**
      * 页面的初始数据
      */
     data: {
+        sat_submiteditmodelid: 0,
         detailsData: {}, //详情数据
-        butText: "", //底部按钮文本
+
+        startRecord: false,
+        submiteditData: {}, //新建明细
         content: "", //提交内容
-        loading: false, //按钮加载状态
-        recordL: {}, //记录
         isCommit: false, //是否提交
+
+
+        CheckTheRecord: false, //查看记录
+        recordL: {}, //记录详情
+
+        done: false, //!是否还可提交明细
+
+        loading: false, //按钮加载状态
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        let detailsData = JSON.parse(options.item);
         this.setData({
-            detailsData,
-            butText: options.type
+            sat_submiteditmodelid: options.id
         })
-        /* 详情计数 */
-        if (options.type == '开始提报') {
-            this.select_submitdetailed();
-        } else if (options.type == '保存') {
-            _Http.basic({
-                "classname": "saletool.submitedit.submitedit",
-                "method": "insertorupdate",
-                "content": {
-                    "sat_submiteditmodelid": detailsData.sat_submiteditmodelid,
-                    "content": "",
-                    "sat_submiteditid": "0"
-                }
-            }).then(res => {
-                console.log("新增", res)
-            })
-        } else if (options.type == 'false') {
-            /* 查看记录 */
-            this.setData({
-                recordL: JSON.parse(options.record)
-            })
-        }
-        console.log("是否一事一报", detailsData.oneToOne)
-    },
-    /* 查询详情 */
-    select_submitdetailed() {
+
+        //查询详情
         _Http.basic({
             "classname": "saletool.submitedit.submitedit",
             "method": "select_submitdetailed",
             "content": {
-                "sat_submiteditmodelid": this.data.detailsData.sat_submiteditmodelid
+                "sat_submiteditmodelid": options.id
             }
         }).then(res => {
-            console.log("提报详情", res)
+            console.log()
+            let submitedit = res.data[0].submitedit,
+                list = [];
+            for (let i = 0; i < submitedit.length; i++) {
+                (submitedit[i].status == '未提报') ? this.delete_submitdetailed(submitedit[i].sat_submiteditid): list.push(submitedit[i]);
+            };
+            res.data[0].submitedit = list;
             this.setData({
-                'detailsData.submitedit': res.data[0].submitedit
+                detailsData: res.data[0],
+                done: res.data[0].submitedit.length == 1 && options.oneToOne
             })
         });
     },
-    /* 文本域输入 */
-    textareaInput(e) {
-        this.setData({
-            content: e.detail.value.trim()
+
+
+
+
+    /* 创建明显 */
+    establish() {
+        _Http.basic({
+            "classname": "saletool.submitedit.submitedit",
+            "method": "insertorupdate",
+            "content": {
+                "sat_submiteditmodelid": this.data.sat_submiteditmodelid,
+                "content": "",
+                "sat_submiteditid": 0
+            }
+        }).then(res => {
+            console.log("新增", res)
+            this.setData({
+                submiteditData: res.data[0]
+            })
         })
     },
+
     /* 去详情 */
     toDetails() {
-        if (this.data.butText == '开始提报') {
-            wx.navigateTo({
-                url: './details?type=保存&item=' + JSON.stringify(this.data.detailsData),
-            })
-        } else {
-            if (this.data.isCommit) return wx.showToast({
-                title: '请勿重新提交',
-                icon: "none"
-            })
-            if (!this.data.content) return wx.showToast({
-                title: '您还未输入提报内容',
-                icon: "none"
+        if (this.data.isCommit) return wx.showToast({
+            title: '请勿重新提交',
+            icon: "none"
+        })
+        if (!this.data.content) return wx.showToast({
+            title: '您还未输入提报内容',
+            icon: "none"
+        })
+        if (this.data.loading) return wx.showToast({
+            title: '正在提交中，请勿重新提交',
+            icon: "none"
+        })
+        this.setData({
+            loading: true
+        })
+        _Http.basic({
+            "classname": "saletool.submitedit.submitedit",
+            "method": "sub_submitdetailed",
+            "content": {
+                "sat_submiteditmodelid": this.data.detailsData.sat_submiteditmodelid,
+                "content": this.data.content,
+                "sat_submiteditid": 0
+            }
+        }).then(res => {
+            this.setData({
+                loading: false
             })
-            if (this.data.loading) return wx.showToast({
-                title: '正在提交中，请勿重新提交',
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
                 icon: "none"
-            })
+            });
             this.setData({
-                loading: true
+                isCommit: true
             })
-            _Http.basic({
-                "classname": "saletool.submitedit.submitedit",
-                "method": "sub_submitdetailed",
-                "content": {
-                    "sat_submiteditmodelid": this.data.detailsData.sat_submiteditmodelid,
-                    "content": this.data.content,
-                    "sat_submiteditid": 0
-                }
-            }).then(res => {
-                this.setData({
-                    loading: false
-                })
-                if (res.msg != '成功') return wx.showToast({
-                    title: res.data,
-                    icon: "none"
-                });
-                this.setData({
-                    isCommit: true
+            let pages = getCurrentPages();
+            let prevPage = pages[pages.length - 2];
+            if (prevPage.data.butText == '开始提报') prevPage.select_submitdetailed();
+            wx.showToast({
+                title: '提交成功',
+                icon: "success"
+            });
+            setTimeout(() => {
+                wx.navigateBack({
+                    delta: 0,
                 })
-                let pages = getCurrentPages();
-                let prevPage = pages[pages.length - 2];
-                if (prevPage.data.butText == '开始提报') prevPage.select_submitdetailed();
-                wx.showToast({
-                    title: '提交成功',
-                    icon: "success"
-                });
-                setTimeout(() => {
-                    wx.navigateBack({
-                        delta: 0,
-                    })
-                }, 300)
-            })
-        }
+            }, 300)
+        })
     },
     /* 查看提报记录 */
     seeHistory(e) {
         const {
             item
         } = e.currentTarget.dataset;
-        wx.navigateTo({
-            url: `./details?type=false&item=${JSON.stringify(this.data.detailsData)}&record=${JSON.stringify(item)}`,
+        this.setData({
+            recordL: item
         })
+
+        /*    wx.navigateTo({
+               url: `./details?type=false&item=${JSON.stringify(this.data.detailsData)}&record=${JSON.stringify(item)}`,
+           }) */
     },
     /**
      * 生命周期函数--监听页面初次渲染完成
@@ -152,6 +155,12 @@ Page({
 
     },
 
+    /* 文本域输入 */
+    textareaInput(e) {
+        this.setData({
+            content: e.detail.value
+        })
+    },
     /**
      * 生命周期函数--监听页面卸载
      */
@@ -159,6 +168,19 @@ Page({
 
     },
 
+    /* 删除未提报数据 */
+    delete_submitdetailed(id) {
+        _Http.basic({
+            "classname": "saletool.submitedit.submitedit",
+            "method": "delete_submitdetailed",
+            "content": {
+                "sat_submiteditid": id
+            }
+        }).then(res => {
+            if (res.data != "成功") return this.delete_submitdetailed(id);
+        })
+    },
+
     /**
      * 页面相关事件处理函数--监听用户下拉动作
      */

pages/submission/details.scss

@@ -61,13 +61,13 @@
 .textarea {
     width: 690rpx;
     height: 160rpx;
-    background-color: #ffffff;
     border-radius: 16rpx;
     font-size: 24rpx !important;
     overflow: hidden;
     margin: 20rpx auto 30rpx;
     padding: 20rpx;
     box-sizing: border-box;
+    border: 1rpx solid rgb(180, 180, 180);
 }
 
 .footer {
@@ -96,10 +96,11 @@
     line-height: 90rpx;
     text-align: center;
     color: var(--assist);
-    background-color: #ffffff;
+    border: 1rpx solid var(--assist);
     margin-top: 30rpx;
     font-size: 24rpx;
     font-family: PingFang SC-Regular, PingFang SC;
+    border-radius: 16rpx;
 
     .iconfont {
         margin-right: 5rpx;

pages/submission/details.wxml

@@ -6,41 +6,45 @@
     <My_accessory />
 </view>
 <!-- 提报记录 -->
-<block wx:if="{{butText=='开始提报'}}">
-    <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="data">
-                <text>提交时间:{{item.createdate}}</text>
-                <text>附件数量:1</text>
-            </view>
-        </navigator>
-    </view>
-    <My_empty wx:if="{{!detailsData.submitedit.length}}" />
-</block>
-<!-- 开始提报 -->
-<view class="box" wx:elif="{{butText=='保存'}}" style="background: none;">
-    <view class="title multi-line">提报内容</view>
-    <textarea class="textarea" placeholder="请输入提报内容" bindinput="textareaInput" />
-    <view class="title multi-line">提报附件<text>已上传2个</text></view>
-    <My_accessory butType="删除" />
-    <My_upload>
-        <navigator class="uploadStyle" url="#">
-            <text class="iconfont icon-a-tuiguangsucaishangchuan1" />
-            上传附件
-        </navigator>
-    </My_upload>
+<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="data">
+            <text>提交时间:{{item.createdate}}</text>
+            <text>附件数量:1</text>
+        </view>
+    </navigator>
 </view>
+<My_empty wx:if="{{!detailsData.submitedit.length}}" />
 <!-- 提报详情 -->
-<view class="box" wx:elif="{{butText=='false'}}" style="background: none;">
-    <view class="title multi-line">提报内容</view>
-    <view class="history" style="margin-bottom: 30rpx;">
-        {{recordL.content}}
+<van-popup show="{{ startRecord }}" custom-style="height:75vh;" closeable position="bottom" round bind:close="onClose">
+    <view class="box">
+        <view class="title multi-line">提报内容</view>
+        <textarea class="textarea" placeholder="请输入提报内容" bindinput="textareaInput" />
+        <view class="title multi-line">提报附件<text>已上传2个</text></view>
+        <My_accessory butType="删除" />
+        <My_upload>
+            <navigator class="uploadStyle" url="#">
+                <text class="iconfont icon-a-tuiguangsucaishangchuan1" />
+                上传附件
+            </navigator>
+        </My_upload>
     </view>
-    <view class="title multi-line">提报附件<text>已上传2个</text></view>
-    <My_accessory />
-</view>
-<view class="footer" wx:if="{{butText!='false'}}">
-    <van-button round custom-class='button' loading='{{loading}}' disabled="{{butText=='保存'&&content==''||loading}}" bindtap="toDetails">{{butText}}</van-button>
+</van-popup>
+
+<!-- 提报详情 -->
+<van-popup show="{{ CheckTheRecord }}" custom-style="height:75vh;" closeable position="bottom" round bind:close="onClose">
+    <view class="box">
+        <view class="title multi-line">提报内容</view>
+        <view class="history" style="margin-bottom: 30rpx;">
+            {{recordL.content}}
+        </view>
+        <view class="title multi-line">提报附件<text>已上传2个</text></view>
+        <My_accessory />
+    </view>
+</van-popup>
+<!-- 底部按钮 -->
+<view class="footer" wx:if="{{!done}}">
+    <van-button round custom-class='button' bindtap="establish">开始提报</van-button>
 </view>

pages/submission/index.js

@@ -27,10 +27,6 @@ Page({
             }
         ],
         option2: [{
-                text: '默认排序',
-                value: '默认排序'
-            },
-            {
                 text: '按日期升序',
                 value: '按日期升序'
             },
@@ -40,7 +36,7 @@ Page({
             },
         ],
         value1: '所有日期',
-        value2: '默认排序',
+        value2: '按日期升序',
         "content": {
             "onceonly": 1,
             pageNumber: 1,
@@ -66,6 +62,7 @@ Page({
         if (this.data.content.pageNumber > this.data.content.pageTotal) return;
         let content = JSON.parse(JSON.stringify(this.data.content));
         if (content.where.begdate == "" && content.where.enddate == "") delete content.where;
+        if (this.data.sort != "") content.sort = this.data.sort;
         _Http.basic({
             "classname": "saletool.submitedit.submitedit",
             "method": this.data.activeIndex == 2 ? "select_historylist" : "select_submitlist",
@@ -85,7 +82,8 @@ Page({
                 list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),
                 ['content.pageNumber']: res.pageNumber + 1,
                 ['content.pageTotal']: res.pageTotal,
-                total: res.total
+                total: res.total,
+                sort: res.sort
             })
         })
     },
@@ -119,8 +117,10 @@ Page({
         detail
     }) {
         this.setData({
-            value2: detail
+            value2: detail,
+            "sort[0].reversed": detail == '按日期降序' ? 1 : 0
         })
+        this.getList(true)
     },
     /* 关闭时间范围选择 */
     timeRangeClose() {
@@ -171,9 +171,8 @@ Page({
         const {
             item
         } = e.currentTarget.dataset;
-        item.oneToOne = this.data.activeIndex === 0;
         wx.navigateTo({
-            url: './details?type=开始提报&item=' + JSON.stringify(item),
+            url: `./details?type=开始提报&id=${item.sat_submiteditmodelid}&oneToOne=${this.data.activeIndex === 0}`,
         })
     },
     /**

pages/submission/index.wxml

@@ -18,10 +18,10 @@
         <view class="state">
             <view class="explian">
                 <view>有效期：{{item.begdate}} ~ {{item.enddate}}</view>
-                <view>已提报：2</view>
+                <view>已提报：{{item.submitcount}}</view>
             </view>
             <view class="but">
-                <van-button custom-class='read-but base'>未读</van-button>
+                <van-button custom-class='read-but base'>{{item.isRead==1?'已':'未'}}读</van-button>
             </view>
         </view>
     </navigator>