调整

packageA/work/add.js

@@ -232,8 +232,12 @@ Page({
             ...this.selectComponent("#Form").submit()
         };
         content.leaderuserid = content.principal[1][0];
-        let userids = content.member.length ? content.member[1] : "";
         delete(content.principal)
+        console.log(content.member)
+        content.team = {
+            "userids": content.member.length ? content.member[1] : [],
+            "justuserids": 1
+        }
         delete(content.member)
         _Http.basic({
             "id": 20221211112101,
@@ -247,17 +251,15 @@ Page({
                 title: res.msg == '成功' ? "保存成功" : res.msg,
                 icon: "none"
             });
-            _Http.basic({
+            /* _Http.basic({
                 "id": 20220930103601,
                 "content": {
                     "ownertable": "sys_task",
                     "ownerid": res.data.sys_taskid,
-                    "userids": userids,
-                    "justuserids": 1
                 }
             }, false).then(e => {
                 console.log("设置团队", e)
-            })
+            }) */
             if (res.msg == '成功') setTimeout(() => {
                 getCurrentPages().forEach(v => {
                     if (v.__route__ == 'packageA/work/index') {
@@ -288,6 +290,7 @@ Page({
                     wx.navigateBack();
                     page.getDetail();
                 } else {
+                    page.getTags && page.getTags();
                     let p = page.selectComponent("#Work");
                     if (p) p.getList(0, true);
                     wx.navigateBack();

packageA/work/detail.js

@@ -176,10 +176,11 @@ Page({
             let tabbarList = [{
                 icon: "icon-genjin",
                 label: "跟进"
-            }, {
+            }];
+            if (res.data.status != '已完成') tabbarList.push({
                 icon: "icon-dibu-chengjiao",
                 label: "完成"
-            }];
+            })
             try {
                 let isLeader = res.data.createuserid == wx.getStorageSync('userMsg').userid;
                 if (isLeader) {
@@ -387,8 +388,8 @@ Page({
         }
     },
     onUnload() {
-        let page = getCurrentPages().find(v => v.__route__ == 'packageA/work/index')
-        if (page) {
+        let page = getCurrentPages()[getCurrentPages().length - 2]
+        if (page.__route__ == 'packageA/work/index') {
             let content = JSON.parse(JSON.stringify(page.data.content));
             content.pageSize = (content.pageNumber - 1) * content.pageSize;
             content.pageNumber = 1;
@@ -402,6 +403,9 @@ Page({
                     "content.total": res.total
                 })
             })
+        } else {
+            page.getTags && page.getTags()
+            page.partialRenewal && page.partialRenewal(true)
         }
     }
 })

pages/tabbar/message/details.js

@@ -1,117 +1,118 @@
 const _Http = getApp().globalData.http;
 Page({
-	data: {
-		appid: wx.getStorageSync('appid'),
-		detailsData: {}
-	},
-	onLoad(options) {
-		const item = JSON.parse(options.item)
-		if (item.isread == 0) _Http.basic({
-			"classname": "system.message.Message",
-			"method": "readMessage",
-			"content": {
-				"messageid": item.messageid
-			}
-		})
-		//判断具体消息归属
-		switch (item.objectname) {
-			case "sa_customers":
-				//客户
-				item.name = '';
-				this.saCustomer(item.objectid);
-				break;
-			case "sat_orderclue":
-				item.name = '';
-				this.satOrderclue(item.objectid);
-				//线索
-				break;
-			case "sa_order":
-				item.name = '';
-				this.saOrder(item.objectid)
-				// sa_order
-				break;
-		}
-		//修改跳转页面
-		if (item.path) {
-			let arr = item.path.split("/");
-			arr[arr.length - 1] = 'detail';
-			item.path = arr.join("/");
-		}
-		this.setData({
-			detailsData: item,
-			auth: JSON.stringify(wx.getStorageSync('auth')),
-			userMsg: JSON.stringify(wx.getStorageSync('userMsg')),
-			site: JSON.stringify(wx.getStorageSync('siteP'))
-		})
-	},
-	saOrder(sa_orderid) {
-		_Http.basic({
-			"id": 20221108151302,
-			"content": {
-				nocache: true,
-				sa_orderid
-			}
-		}).then(res => {
-			console.log("订单", res)
-			if (res.msg != '成功') return wx.showToast({
-				title: res.data,
-				icon: "none"
-			});
-			let path = '';
-			switch (res.data.type) {
-				case '工具借用单':
-					path = '/packageA/borrow/detail'
-					break;
-				case '借用归还单':
-					path = '/packageA/toolBill/detail'
-					break;
-				default:
-					path = '/packageA/orderForm/detail'
-					break;
-			}
-			this.setData({
-				"detailsData.name": res.data.type,
-				"detailsData.path": path
-			})
-		});
-	},
-	satOrderclue(sat_orderclueid) {
-		_Http.basic({
-			"classname": "saletool.orderclue.web.orderclue",
-			"method": "selectDetail",
-			"version": 1,
-			"content": {
-				"nocache": true,
-				sat_orderclueid
-			},
-		}).then(res => {
-			console.log("线索详情", res)
-			if (res.msg != '成功') return wx.showToast({
-				title: res.data,
-				icon: "none"
-			});
-			this.setData({
-				"detailsData.name": res.data.isprivate ? '销售线索' : '公海线索',
-				"detailsData.path": res.data.isprivate ? '/packageA/saleClue/detail' : '/packageA/publicClue/detail',
-			})
-		});
-	},
-	saCustomer(sa_customersid) {
-		_Http.basic({
-			"id": 20221012164302,
-			"content": {
-				sa_customersid
-			},
-		}).then(res => {
-			console.log("客户详情", res)
-			if (res.msg != '成功') return wx.showToast({
-				title: res.data,
-				icon: "none"
-			});
-			this.setData({
-				"detailsData.name": res.data.ispublic ? '公海客户' : '我的客户',
-				"detailsData.path": res.data.ispublic ? '/packageA/publicCustomer/detail' : '/packageA/setclient/detail',
-			})
-		});
-	}
+    data: {
+        appid: wx.getStorageSync('appid'),
+        detailsData: {}
+    },
+    onLoad(options) {
+        const item = JSON.parse(options.item)
+        if (item.isread == 0) _Http.basic({
+            "classname": "system.message.Message",
+            "method": "readMessage",
+            "content": {
+                "messageid": item.messageid
+            }
+        })
+        //判断具体消息归属
+        switch (item.objectname) {
+            case "sa_customers":
+                //客户
+                item.name = '';
+                this.saCustomer(item.objectid);
+                break;
+            case "sat_orderclue":
+                item.name = '';
+                this.satOrderclue(item.objectid);
+                //线索
+                break;
+            case "sa_order":
+                item.name = '';
+                this.saOrder(item.objectid)
+                // sa_order
+                break;
+        }
+        //修改跳转页面
+        if (item.path) {
+            let arr = item.path.split("/");
+            arr[arr.length - 1] = 'detail';
+            item.path = arr.join("/");
+        }
+        this.setData({
+            detailsData: item,
+            auth: JSON.stringify(wx.getStorageSync('auth')),
+            userMsg: JSON.stringify(wx.getStorageSync('userMsg')),
+            site: JSON.stringify(wx.getStorageSync('siteP'))
+        })
+        console.log("消息详情", item)
+    },
+    saOrder(sa_orderid) {
+        _Http.basic({
+            "id": 20221108151302,
+            "content": {
+                nocache: true,
+                sa_orderid
+            }
+        }).then(res => {
+            console.log("订单", res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            });
+            let path = '';
+            switch (res.data.type) {
+                case '工具借用单':
+                    path = '/packageA/borrow/detail'
+                    break;
+                case '借用归还单':
+                    path = '/packageA/toolBill/detail'
+                    break;
+                default:
+                    path = '/packageA/orderForm/detail'
+                    break;
+            }
+            this.setData({
+                "detailsData.name": res.data.type,
+                "detailsData.path": path
+            })
+        });
+    },
+    satOrderclue(sat_orderclueid) {
+        _Http.basic({
+            "classname": "saletool.orderclue.web.orderclue",
+            "method": "selectDetail",
+            "version": 1,
+            "content": {
+                "nocache": true,
+                sat_orderclueid
+            },
+        }).then(res => {
+            console.log("线索详情", res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            });
+            this.setData({
+                "detailsData.name": res.data.isprivate ? '销售线索' : '公海线索',
+                "detailsData.path": res.data.isprivate ? '/packageA/saleClue/detail' : '/packageA/publicClue/detail',
+            })
+        });
+    },
+    saCustomer(sa_customersid) {
+        _Http.basic({
+            "id": 20221012164302,
+            "content": {
+                sa_customersid
+            },
+        }).then(res => {
+            console.log("客户详情", res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            });
+            this.setData({
+                "detailsData.name": res.data.ispublic ? '公海客户' : '我的客户',
+                "detailsData.path": res.data.ispublic ? '/packageA/publicCustomer/detail' : '/packageA/setclient/detail',
+            })
+        });
+    }
 })

pages/tabbar/message/index.js

@@ -53,6 +53,7 @@ Page({
             })
             const authComparison = wx.getStorageSync('authComparison');
             res.data = res.data.map(v => {
+                // if (["sa_project_authorization"].includes(v.objectname)) v.objectname = 'sa_project'
                 let data = authComparison.find(s => (s.objectname || "") == v.objectname);
                 if (data) {
                     switch (data.objectname) {

utils/work/apps.js

@@ -8,7 +8,8 @@ function getapps() {
     }, {
         name: "任务",
         path: "/packageA/work/index",
-        icon: "work-a-woderenwuzhongxin"
+        icon: "work-a-woderenwuzhongxin",
+        objectname: "sys_task"
     }, {
         name: "通讯录",
         path: "/packageA/contacts/index",