zhaoxiaohai 3 лет назад
Родитель
Сommit
993f68bda2
2 измененных файлов с 25 добавлено и 40 удалено
  1. 8 8
      packageA/saleClue/addClue.js
  2. 17 32
      packageA/saleClue/detail.js

+ 8 - 8
packageA/saleClue/addClue.js

@@ -138,6 +138,7 @@ Page({
                 },
                 query: "&radio=true",
                 placeholder: "选择市场活动",
+                valueName: "campaign_name",
                 checking: "base",
                 required: false
             }, {
@@ -225,14 +226,12 @@ Page({
             ...this.data.content,
             ...this.selectComponent("#Form").submit()
         };
-        if (content.campaign_name && content.campaign_name.length > 1) {
-            content.sat_campaignid = content.campaign_name[1][0]
-        }
-        if (content.region.length > 0) {
-            content.city = content.region[1]
-            content.county = content.region[2]
-            content.province = content.region[0]
-        }
+        content.sat_campaignid = content.campaign_name[1][0] || 0;
+        content.city = content.region[1] || "";
+        content.county = content.region[2] || "";
+        content.province = content.region[0] || "";
+        delete(content.region)
+        delete(content.campaign_name)
         _Http.basic({
             "id": "20221205162402",
             content
@@ -250,6 +249,7 @@ Page({
                         v.getDetail();
                     } else if (v.__route__ == 'packageA/saleClue/index') {
                         v.getList(true);
+
                     } else if (['packageA/setclient/detail', 'packageA/publicCustomer/detail'].includes(v.__route__)) {
                         v.selectComponent("#Clue").getList(this.data.content.sa_customersid, true)
                     }

+ 17 - 32
packageA/saleClue/detail.js

@@ -14,16 +14,20 @@ Page({
             icon: "icon-tabxiangxixinxi1"
         }, {
             label: "跟进记录",
-            icon: "icon-tabgenjinjilu"
+            icon: "icon-tabgenjinjilu",
+            model: "#follow"
         }, {
             label: "操作",
-            icon: "icon-tabcaozuojilu1"
+            icon: "icon-tabcaozuojilu1",
+            model: "#Record"
         }, {
             label: "跟进动态",
-            icon: "icon-tabgenjinjilu"
+            icon: "icon-tabgenjinjilu",
+            model: "#Trace"
         }, {
             label: "任务",
-            icon: "icon-tabrenwu"
+            icon: "icon-tabrenwu",
+            model: "#Work"
         }],
         tabbarList: [],
     },
@@ -266,38 +270,19 @@ Page({
     },
     //局部数据更新 tabs
     partialRenewal(init = false) {
-        let id = this.data.detail.sat_orderclueid;
-        let model = '';
-        let name = this.data.tabsList[this.data.tabsActive].label;
-        switch (name) {
-            case "任务":
-                model = "#Work"
-                break;
-            case "跟进记录":
-                model = "#follow"
-                break;
-            case "操作":
-                model = "#Record"
-                break;
-            case "跟进动态":
-                model = "#Trace"
-                break;
-        };
+        let model = this.data.tabsList[this.data.tabsActive].model;
         if (model) {
-            // 确定好模块ID total = null 是第一次加载 加载数据
-            // init是新增或修改需要清数据
-            let Component = this.selectComponent(model);
-            const {
-                total,
-                pageNumber,
-                pageTotal
-            } = Component.data.content;
+            let Component = this.selectComponent(model),
+                {
+                    total,
+                    pageNumber,
+                    pageTotal
+                } = Component.data.content,
+                id = this.data.sat_orderclueid;
             if (total == null || init) {
                 Component.getList(id, init);
-            } else if (pageNumber <= pageTotal) {
+            } else if (pageNumber < pageTotal) {
                 Component.getList(id, false);
-            } else {
-                //用来判断 在搜索页面修改,与tabs选项不一致 但是切换到该选项 重置数据
             }
         }
     },