修复bug

packageA/finishforecast/detail.js

@@ -41,52 +41,56 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            admin: options.admin ? options.admin == 'true' : false,
             sa_salesforecastbillid: options.id
         })
         this.getDetail();
         this.getTags();
         this.partialRenewal();
 
-        if (this.data.admin) _Http.basic({
-            "id": 20230620102004,
-            "content": {}
-        }).then(res => {
-            console.log("获取下级部门和下级人员", res)
-            if (res.msg != '成功') return wx.showToast({
-                title: res.data,
-                icon: "none"
+        if (options.admin == 'true') {
+            this.setData({
+                admin: true
             })
-            let data = {
-                label: "查询范围",
-                showName: "name", //显示字段
-                valueKey: "active", //返回Key
-                value: "id", //选中值
-                list: res.data.hr.map(v => {
-                    v.id = v.userid;
-                    v.type = '人员'
-                    delete(v.rowindex)
-                    delete(v.userid)
-                    return v
+            _Http.basic({
+                "id": 20230620102004,
+                "content": {}
+            }).then(res => {
+                console.log("获取下级部门和下级人员", res)
+                if (res.msg != '成功') return wx.showToast({
+                    title: res.data,
+                    icon: "none"
                 })
-            };
-            const mflat = (v, prefix) => {
-                v.subdep.forEach(s => mflat(s, v.depname));
-                v.name = v.depname;
-                v.type = '部门';
-                v.id = v.departmentid;
-                delete(v.depname)
-                delete(v.departmentid)
-                delete(v.parentid)
-                delete(v.rowindex)
-                delete(v.subdep)
-                data.list.unshift(v)
-            };
-            res.data.dep.forEach(v => mflat(v))
-            this.setData({
-                "filtratelist[0]": data
+                let data = {
+                    label: "查询范围",
+                    showName: "name", //显示字段
+                    valueKey: "active", //返回Key
+                    value: "id", //选中值
+                    list: res.data.hr.map(v => {
+                        v.id = v.userid;
+                        v.type = '人员'
+                        delete(v.rowindex)
+                        delete(v.userid)
+                        return v
+                    })
+                };
+                const mflat = (v, prefix) => {
+                    v.subdep.forEach(s => mflat(s, v.depname));
+                    v.name = v.depname;
+                    v.type = '部门';
+                    v.id = v.departmentid;
+                    delete(v.depname)
+                    delete(v.departmentid)
+                    delete(v.parentid)
+                    delete(v.rowindex)
+                    delete(v.subdep)
+                    data.list.unshift(v)
+                };
+                res.data.dep.forEach(v => mflat(v))
+                this.setData({
+                    "filtratelist[0]": data
+                });
             });
-        });
+        }
     },
     /* 切换 */
     onChange(e) {
@@ -152,10 +156,12 @@ Page({
                 icon: "none"
             });
             res.data.projectamount = CNY(res.data.projectamount)
+            console.log(this.data.sa_salesforecastbillid, res.data.projectamount)
             this.setData({
                 detail: res.data,
                 'content.title': res.data.title
             });
+            console.log(this.data.admin)
             if (this.data.admin) this.getRests();
         })
     },
@@ -317,8 +323,8 @@ Page({
         this.partialRenewal();
     },
     onUnload() {
-        const page = getCurrentPages().find(v => v.__route__ == 'packageA/finishforecast/index' || v.__route__ == 'packageA/finishforecast/admin');
-        if (!page) return;
+        let page = getCurrentPages()[getCurrentPages().length - 2];
+        if (page.getRests) return page.getRests();
         let content = JSON.parse(JSON.stringify(page.data.content));
         content.pageSize = (content.pageNumber - 1) * content.pageSize;
         content.pageNumber = 1;
@@ -327,6 +333,10 @@ Page({
             content
         }).then(res => {
             console.log("更新预测", res);
+            res.data = res.data.map(v => {
+                v.showAmount = CNY(v.projectamount)
+                return v
+            })
             if (res.msg == '成功') page.setData({
                 list: res.data,
                 "content.total": res.total

packageA/finishforecast/modules/project/index.js

@@ -192,7 +192,7 @@ Component({
         }) {
             let that = this,
                 project = this.data.project;
-                console.log(list)
+            console.log(list)
             wx.showModal({
                 title: '提示',
                 content: `是否确认添加${list.length}件产品`,
@@ -233,7 +233,7 @@ Component({
         },
         /* 更新金额 */
         updateAmount() {
-            const page = getCurrentPages().find(v => v.__route__ == 'packageA/finishforecast/detail');
+            const page = getCurrentPages()[getCurrentPages().length - 1];
             if (page) page.getDetail();
             this.getList(this.data.sa_salesforecastbillid, true, true)
         },