zhaoxiaohai hace 2 años
padre
commit
64d12424fb

+ 2 - 1
packageA/forecast/detail.js

@@ -76,10 +76,11 @@ Page({
                 title: res.data,
                 icon: "none"
             })
+            const list = res.data.filter(v => v.sa_projectid != 0);
             this.setData({
                 'content.pageNumber': res.pageNumber + 1,
                 'content.pageTotal': res.pageTotal,
-                list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+                list: res.pageNumber == 1 ? list : this.data.list.concat(list),
                 total: res.total
             })
         })

+ 23 - 59
packageA/forecast/index.js

@@ -2,10 +2,6 @@ const _Http = getApp().globalData.http,
     getHeight = require("../../utils/getRheRemainingHeight");
 
 Page({
-
-    /**
-     * 页面的初始数据
-     */
     data: {
         listHeight: null,
         list: [],
@@ -18,10 +14,6 @@ Page({
             }
         }
     },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
     onLoad(options) {
         this.getList()
     },
@@ -50,73 +42,45 @@ Page({
         })
     },
     toDetail(e) {
-        let id = e.currentTarget.dataset.item.sa_salesforecastmodelid;
+        const {
+            item
+        } = e.currentTarget.dataset;
         _Http.basic({
             "id": 20220916134103,
             "version": 1,
             "content": {
-                "sa_salesforecastmodelid": id,
+                "sa_salesforecastmodelid": item.sa_salesforecastmodelid,
                 "sa_salesforecastbillid": 0,
-                "sa_projectids": []
+                "sa_projectids": [0]
             }
         }).then(res => {
             if (res.msg != '成功') return wx.showToast({
                 title: res.data,
                 icon: "none"
             })
-            wx.navigateTo({
-                url: `./detail?id=${res.data[0].sa_salesforecastbillid}&mId=${id}&my=true`,
-            })
+            if (item.baseonproject == 1) {
+                wx.navigateTo({
+                    url: `./detail?id=${res.data[0].sa_salesforecastbillid}&mId=${item.sa_salesforecastmodelid}&my=true`,
+                })
+            } else {
+                const data = {
+                    sa_salesforecastbillid: res.data[0].sa_salesforecastbillid,
+                    projectname: item.title,
+                    projectnum: item.billnum,
+                    sa_projectid: 0,
+                    address: "",
+                    sa_salesforecastmodelid: item.sa_salesforecastmodelid
+                }
+                wx.navigateTo({
+                    url: './reportForms?item=' + JSON.stringify(data) + '&isEdit=true',
+                })
+            }
         })
     },
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
     onReady() {
         getHeight.getHeight('#placeholder', this).then(res => this.setData({
             listHeight: res
         }));
     },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+    onShareAppMessage() {}
 })

+ 18 - 4
packageA/forecast/record.js

@@ -30,13 +30,27 @@ Page({
     },
     /* 去详情 */
     toDetail(e) {
-        console.log(e)
         const {
             item
         } = e.currentTarget.dataset;
-        wx.navigateTo({
-            url: './detail?id=' + item.sa_salesforecastbillid,
-        })
+        if (item.baseonproject == 1) {
+            wx.navigateTo({
+                url: './detail?id=' + item.sa_salesforecastbillid,
+            })
+        } else {
+            const data = {
+                sa_salesforecastbillid: item.sa_salesforecastbillid,
+                projectname: item.title,
+                projectnum: item.billnum,
+                sa_projectid: 0,
+                address: "",
+                sa_salesforecastmodelid: this.data.content.sa_salesforecastmodelid
+            }
+            wx.navigateTo({
+                url: './reportForms?item=' + JSON.stringify(data) + '&isEdit=false',
+            })
+        }
+
     },
     /* 开始搜索 */
     startSearch({

+ 36 - 17
packageA/forecast/reportForms.js

@@ -7,7 +7,6 @@ Page({
         disabled: false,
         loading: false
     },
-
     onLoad(options) {
         this.setData({
             sourceData: JSON.parse(options.item),
@@ -38,36 +37,55 @@ Page({
             this.setData({
                 loading: false
             })
-            wx.showToast({
+            if (res.msg != '成功') return wx.showToast({
                 title: res.data,
                 icon: "none"
+            });
+            this.setData({
+                disabled: true
             })
+            this.randerData()
+            setTimeout(() => {
+                wx.navigateBack({
+                    delta: 0,
+                })
+            }, 500)
+            wx.showToast({
+                title: '保存成功',
+                icon: "none"
+            });
         })
     },
+    randerData() {
+        let pages = getCurrentPages();
+        pages[pages.length - 2].getList(true);
+    },
     /* 获取列表 */
     getList() {
-        _Http.basic({
+        let parem = {
             "id": 20220906154703,
             "version": 1,
             "content": {
                 "nocheca": true,
                 "sa_salesforecastbillid": this.data.sourceData.sa_salesforecastbillid,
                 'pageSize': 9999,
-                "where": {
-                    "condition": ""
-                }
+                "where": {}
             }
-        }).then(res => {
-            console.log("详情列表", res)
+        };
+        if (this.data.sourceData.sa_projectid != 0) parem.content.where = {
+            "sa_projectid": this.data.sourceData.sa_projectid
+        }
+        _Http.basic(parem).then(res => {
+            console.log(321321321,res)
             if (res.msg != '成功') return wx.showToast({
-                title: res.data,
+                title: res.msg,
                 icon: "none"
             })
             for (let i = 0; i < res.data.length; i++) {
-                res.data[i].complete = true
+                res.data[i].complete = true;
             }
             this.setData({
-                list: res.data
+                list: res.data.filter(v => v.itemclassname)
             });
         })
     },
@@ -163,13 +181,14 @@ Page({
                             icon: "none"
                         })
                         that.isDisabled();
+                        that.randerData()
                     } else {
                         _Http.basic({
                             "id": 20220906155103,
                             "version": 1,
                             "content": {
                                 "sa_salesforecastid": item.sa_salesforecastid,
-                                "sa_projectid": item.sa_projectid,
+                                "sa_projectid": 0,
                                 "sa_salesforecastbillid": item.sa_salesforecastbillid
                             }
                         }).then(res => {
@@ -177,14 +196,15 @@ Page({
                                 title: res.data,
                                 icon: "none"
                             });
-                            wx.showToast({
-                                title: '删除成功',
-                                icon: "none"
-                            })
                             that.setData({
                                 list: that.data.list.filter(v => v.itemclassnum != item.itemclassnum)
                             })
                             that.isDisabled();
+                            that.randerData()
+                            wx.showToast({
+                                title: '删除成功',
+                                icon: "none"
+                            })
                         })
                     }
                 }
@@ -193,7 +213,6 @@ Page({
     },
     /* 判断是否禁用保存按钮 */
     isDisabled() {
-        console.log(123)
         let count = 0;
         this.data.list.forEach(v => v.complete ? count += 1 : '')
         this.setData({

+ 1 - 0
packageA/forecast/reportForms.wxml

@@ -9,6 +9,7 @@
     <text>产品类别</text>
     <text>共{{list.length}}个</text>
 </view>
+<My_empty wx:if="{{list.length==0}}" />
 <view class="item" wx:for="{{list}}" wx:key="item.itemclassnum">
     <view class="title">
         <view>{{item.itemclassname}}</view>