Merge branch '蓝色' into 黄色

# Conflicts:
#	salesPanel/index/index.js

packageA/contacts/detail.js

@@ -308,7 +308,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.detail.sys_phonebookid;
-
+            if(model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/contract/detail.js

@@ -578,6 +578,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_contractid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {
@@ -772,7 +773,7 @@ Page({
                 break;
             case "跟进":
                 wx.navigateTo({
-                    url: `/packageA/setclient/modules/trace/add/index?ownertable=sa_contract&ownerid=${data.sa_contractid}}&resource=合同`,
+                    url: `/packageA/setclient/modules/trace/add/index?ownertable=sa_contract&ownerid=${data.sa_contractid}&resource=合同`,
                 })
                 break;
             case "作废":

packageA/finishforecast/detail.js

@@ -340,6 +340,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_salesforecastbillid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/invoiceforecast/detail.js

@@ -212,6 +212,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_salesforecastbillid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/offers/detail.js

@@ -345,6 +345,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_quotedpriceid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {
@@ -493,7 +494,7 @@ Page({
                 break;
             case "跟进":
                 wx.navigateTo({
-                    url: `/packageA/setclient/modules/trace/add/index?ownertable=sa_quotedprice&ownerid=${data.sa_quotedpriceid}}&resource=报价单`,
+                    url: `/packageA/setclient/modules/trace/add/index?ownertable=sa_quotedprice&ownerid=${data.sa_quotedpriceid}&resource=报价单`,
                 })
                 break;
             case "复制":

packageA/project/detail.js

@@ -670,6 +670,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_projectid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/publicClue/modules/follow/insert.js

@@ -145,7 +145,9 @@ Page({
             time.pop()
             form[0].value = date[0];
             form[1].value = time.join(":");
-            form[2].value = data.followupmode;
+            form[2].value = [data.contactsName,data.dataextend.contactsid]
+            console.log(" form[2].value", form[2].value)
+            form[3].value = data.followupmode;
             this.setData({
                 list: this.data.list.map(v => {
                     v.value = data[v.key]
@@ -200,6 +202,16 @@ Page({
             if (ownertable == 'temporary') {
                 this.selectComponent("#Yl_files").handleFiles(res.data)
             } else {
+                _Http.basic({
+                    "classname": "system.attachment.Attachment",
+                    "method": "createFileLink",
+                    "content": {
+                        ownertable: "sat_orderclue",
+                        ownerid: this.data.content.sat_orderclueid,
+                        usetype: 'default',
+                        attachmentids
+                    }
+                })
                 if (res.data.length) data.attinfos = res.data;
                 this.changeItem(data)
                 setTimeout(() => {

packageA/publicCustomer/detail.js

@@ -450,6 +450,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = model == "#Clue" ? this.data.detail.sa_customersid : this.data.detail.sys_enterpriseid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/saleAdmin/detail.js

@@ -59,13 +59,15 @@ Page({
             label: "联系人",
             icon: "icon-tablianxiren",
             model: "#Contacts"
-        }, {
+        }]
+        if (appAuth.isdatafollowup) tabsList.push({
             label: "跟进动态",
             icon: "icon-tabgenjinjilu"
-        }, {
+        })
+        tabsList.push({
             label: "操作",
             icon: "icon-tabcaozuojilu1"
-        }]
+        })
         if (appAuth.istask) tabsList.push({
             label: "任务",
             icon: "icon-tabrenwu",

packageA/saleClue/detail.js

@@ -353,6 +353,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sat_orderclueid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/salesForecasting/detail.js

@@ -307,6 +307,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_salesforecastbillid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/setclient/detail.js

@@ -696,6 +696,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = model == "#Clue" ? this.data.detail.sa_customersid : this.data.detail.sys_enterpriseid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

packageA/setclient/modules/trace/add/index.js

@@ -99,6 +99,16 @@ Page({
                 this.selectComponent("#Yl_files").handleFiles(res.data)
             } else {
                 if (res.data.length) data.attinfos = res.data;
+                _Http.basic({
+                    "classname": "system.attachment.Attachment",
+                    "method": "createFileLink",
+                    "content": {
+                      ownertable: this.data.ownertable,
+                      ownerid: this.data.ownerid,
+                      usetype: 'default',
+                      attachmentids
+                    }
+                  })
                 this.changeItem(data)
                 setTimeout(() => {
                     wx.navigateBack()

pages/trace/insert.js

@@ -134,7 +134,7 @@ Page({
         errMsg: "",
         type: "route",
         url: "/packageA/select/project/select",
-        value: item.sa_project.length ? [item.sa_project.map(v => v.name), item.dataextend.sa_projectids] : [],
+        value: item.sa_project.length ? [item.sa_project.map(v => v.projectname), item.dataextend.sa_projectids] : "",
         params: {
           "id": "2025042409074702",
           "content": {
@@ -235,6 +235,17 @@ Page({
         this.selectComponent("#Yl_files").handleFiles(res.data)
       } else {
         if (res.data.length) data.attinfos = res.data;
+
+        _Http.basic({
+          "classname": "system.attachment.Attachment",
+          "method": "createFileLink",
+          "content": {
+            ownertable: this.data.parems.ownertable,
+            ownerid: this.data.parems.ownerid,
+            usetype: 'default',
+            attachmentids
+          }
+        })
         this.changeItem(data)
         setTimeout(() => {
           wx.navigateBack()

portrayal/details/client.js

@@ -74,6 +74,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_customersid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

portrayal/details/contacts.js

@@ -66,6 +66,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sys_phonebookid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

portrayal/details/project.js

@@ -91,6 +91,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.sa_projectid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {

portrayal/details/sales.js

@@ -81,6 +81,7 @@ Page({
                     pageTotal
                 } = Component.data.content,
                 id = this.data.hrid;
+            if (model == "#Files") init = true;
             if (total == null || init) {
                 Component.getList(id, init);
             } else if (pageNumber <= pageTotal) {