zhaoxiaohai пре 3 година
родитељ
комит
e877f4069e

+ 1 - 1
packageA/setclient/addAndEditor.js

@@ -95,7 +95,7 @@ Page({
             placeholder: "客户类型",
             valueName: "type",
             checking: "base",
-            required: false
+            required: true
         }, {
             label: "客户级别",
             error: false,

+ 33 - 37
packageA/setclient/modules/financing/add/index.js

@@ -111,45 +111,41 @@ Page({
             });
             setTimeout(() => {
                 getCurrentPages().forEach(v => {
-                    switch (v.__route__) {
+                    if (v.__route__ == 'packageA/setclient/modules/financing/detail/index') {
                         //详情界面更新数据
-                        case 'packageA/setclient/modules/financing/detail/index':
-                            v.getDetail();
-                            break;
-                            //列表页更新数据
-                        case 'packageA/setclient/detail':
-                            let page = v.selectComponent("#Financing"),
-                                list = res.data.isdefault == 0 ? page.data.list : page.data.list.map(v => {
-                                    v.isdefault = 0;
-                                    return v
-                                }),
-                                index = list.findIndex(value => value.sys_enterprise_financeid == res.data.sys_enterprise_financeid);
-                            if (index != -1) {
-                                //列表中存在说明是编辑,返回上一级页面并更新数据
-                                list[index] = res.data;
-                                page.setData({
-                                    list
-                                });
-                                wx.navigateBack();
-                            } else {
-                                //列表中不存在说明是新增,返回上一级页面更新数据 并进入详情
-                                list.push(res.data);
-                                page.setData({
-                                    list,
-                                    "content.total": page.data.content.total + 1
-                                });
-                                wx.redirectTo({
-                                    url: '/packageA/setclient/modules/financing/detail/index?sys_enterprise_financeid=' + res.data.sys_enterprise_financeid
-                                })
-                            };
-                            /* if (res.data.isdefault == 1) setTimeout(() => {
-                                page.selectComponent("#List").queryDefault()
-                            }, 300) */
-                            break;
-                        case 'packageA/setclient/modules/financing/search/index':
-                            v.getList(true);
+                        v.getDetail();
+                    } else if (['packageA/setclient/detail', 'packageA/publicCustomer/detail'].includes(v.__route__)) {
+                        //列表页更新数据
+                        let page = v.selectComponent("#Financing"),
+                            list = res.data.isdefault == 0 ? page.data.list : page.data.list.map(v => {
+                                v.isdefault = 0;
+                                return v
+                            }),
+                            index = list.findIndex(value => value.sys_enterprise_financeid == res.data.sys_enterprise_financeid);
+                        if (index != -1) {
+                            //列表中存在说明是编辑,返回上一级页面并更新数据
+                            list[index] = res.data;
+                            page.setData({
+                                list
+                            });
                             wx.navigateBack();
-                            break;
+                        } else {
+                            //列表中不存在说明是新增,返回上一级页面更新数据 并进入详情
+                            list.push(res.data);
+                            page.setData({
+                                list,
+                                "content.total": page.data.content.total + 1
+                            });
+                            wx.redirectTo({
+                                url: '/packageA/setclient/modules/financing/detail/index?sys_enterprise_financeid=' + res.data.sys_enterprise_financeid
+                            })
+                        };
+                        /* if (res.data.isdefault == 1) setTimeout(() => {
+                            page.selectComponent("#List").queryDefault()
+                        }, 300) */
+                    } else if (v.__route__ == 'packageA/setclient/modules/financing/search/index') {
+                        v.getList(true);
+                        wx.navigateBack();
                     }
                 });
             }, 300)

+ 1 - 1
packageA/setclient/modules/offers/index.js

@@ -44,7 +44,7 @@ Component({
             const {
                 enterprisename,
                 sys_enterpriseid
-            } = getCurrentPages().find(v => v.__route__ == 'packageA/setclient/detail').data.detail;
+            } = getCurrentPages().find(v => ['packageA/setclient/detail', 'packageA/publicCustomer/detail'].includes(v.__route__)).data.detail;
             wx.navigateTo({
                 url: `/packageA/offers/addSetclientOffer?data=${JSON.stringify({
                     sys_enterpriseid:[enterprisename,[sys_enterpriseid]]