相关修改

CRM/customer/create.js

@@ -144,13 +144,13 @@ Page({
     this.setData({
       selectMode: options.selectMode === 'true'
     });
-    
+
     // 检查是否是从线索详情页面跳转过来的
     if (options.clueId && options.clueInfo) {
       try {
         const clueInfo = JSON.parse(decodeURIComponent(options.clueInfo));
         let form = this.data.form;
-        
+
         // 填充线索信息到表单
         form = form.map(v => {
           switch (v.valueName) {
@@ -175,7 +175,7 @@ Page({
             case "sat_orderclueid":
               // 禁用选择线索字段
               v.disabled = true;
-              v.value = [clueInfo.name,[clueInfo.sat_orderclueid]] || '';
+              v.value = [clueInfo.name, [clueInfo.sat_orderclueid]] || '';
               break;
             case "ext_no":
               v.value = clueInfo.ext_no || '';
@@ -198,14 +198,14 @@ Page({
           }
           return v
         });
-        
+
         this.setData({
           "content.sat_orderclueid": [options.clueId, [options.clueId]],
           form
         });
-        
+
         this.selectComponent("#Form").confirm()
-        
+
         // 设置页面标题为转化客户
         wx.setNavigationBarTitle({
           title: '转化客户'
@@ -334,6 +334,7 @@ Page({
             }
           });
         } else if (content.sa_customersid == 0) {
+          getCurrentPages().find(v => v.__route__ == 'CRM/lead/detail').selectComponent("#FollowRecord").getList("", true)
           // 非选择模式，跳转到客户详情
           wx.redirectTo({
             url: '/CRM/customer/detail?id=' + res.data,

CRM/lead/detail.js

@@ -378,7 +378,7 @@ Page({
       // 禁用与当前线索负责人姓名相同的选项
       const disabled = detail.leadername === team.name;
       return {
-        name: team.name,
+        name: team.name + ' ' + team.phonenumber,
         subname: '在手 待跟进、跟进中 线索数量：' + team.ordercluecount,
         disabled: disabled,
         data: team

CRM/lead/detail.wxml

@@ -12,11 +12,7 @@
     </view>
     <view class="row">
       <view class="exp">负责人：{{detail.leadername || '--'}}</view>
-      <view class="exp">状态：{{detail.status || '--'}}</view>
-    </view>
-    <view class="row">
-      <view class="exp full-width">省市县：{{(detail.province || '--') + '-' + (detail.city || '--') + '-' + (detail.county
-        || '--')}}</view>
+      <view class="exp">省市县：{{(detail.province || '--') + (detail.city || '--') + (detail.county || '--')}}</view>
     </view>
     <view class="row">
       <view class="exp full-width">地址：{{detail.address || '--'}}</view>
@@ -43,26 +39,10 @@
 </van-dialog>
 
 <!-- 分配确认弹窗 -->
-<van-dialog
-  show="{{ showAssignConfirm }}"
-  title="确认分配"
-  message="确定要将此线索分配给所选负责人吗？"
-  show-cancel-button
-  bind:confirm="confirmAssign"
-  bind:cancel="cancelAssign"
-  confirm-button-color="#385CDF"
-/>
+<van-dialog show="{{ showAssignConfirm }}" title="确认分配" message="确定要将此线索分配给所选负责人吗？" show-cancel-button bind:confirm="confirmAssign" bind:cancel="cancelAssign" confirm-button-color="#385CDF" />
 
 <!-- 撤回确认弹窗 -->
-<van-dialog
-  show="{{ showWithdrawConfirm }}"
-  title="确认撤回"
-  message="确定要将此线索撤回给团队负责人吗？"
-  show-cancel-button
-  bind:confirm="confirmWithdraw"
-  bind:cancel="cancelWithdraw"
-  confirm-button-color="#385CDF"
-/>
+<van-dialog show="{{ showWithdrawConfirm }}" title="确认撤回" message="确定要将此线索撤回给团队负责人吗？" show-cancel-button bind:confirm="confirmWithdraw" bind:cancel="cancelWithdraw" confirm-button-color="#385CDF" />
 
 <wxs module="set">
   module.exports = {

CRM/lead/index.wxml

@@ -17,10 +17,7 @@
           </view>
           <view class="row">
             <view class="exp">负责人：{{item.leadername || '--'}}</view>
-            <view class="exp">状态：{{item.status || '--'}}</view>
-          </view>
-          <view class="row">
-            <view class="exp full-width">省市县：{{(item.province || '--') + '-' + (item.city || '--') + '-' + (item.county || '--')}}</view>
+            <view class="exp">省市县：{{(item.province || '--') + (item.city || '--') + (item.county || '--')}}</view>
           </view>
           <view class="row">
             <view class="exp full-width">地址：{{item.address || '--'}}</view>

CRM/lead/modules/followRecord/create.js

@@ -43,10 +43,10 @@ Page({
         error: false,
         errMsg: "",
         type: "radio",
-        value: "跟进",
+        value: "继续跟进",
         radioList: [{
-            id: "跟进",
-            name: "跟进"
+            id: "继续跟进",
+            name: "继续跟进"
           },
           {
             id: "预约到店",
@@ -57,12 +57,8 @@ Page({
             name: "互加微信"
           },
           {
-            id: "成交",
-            name: "成交"
-          },
-          {
-            id: "转化客户",
-            name: "转化客户"
+            id: "转化",
+            name: "转化"
           },
           {
             id: "无效",

CRM/lead/modules/followRecord/index.wxml

@@ -12,7 +12,9 @@
     <view wx:for="{{list}}" wx:key="index" class="follow-item">
       <view class="follow-header">
         <view class="follow-title">
-          {{item.rowindex || index + 1}}. {{item.createdate || '--'}}, 由经销商端 <text class="bold-text">{{item.createby || '--'}}</text> {{item.logtype || '转化'}}, 跟进方式: <text class="bold-text">{{item.followupmode || '--'}}</text>, 跟进内容:
+          {{item.rowindex || index + 1}}. {{item.createdate || '--'}}, 由经销商端 <text class="bold-text">{{item.createby || '--'}}</text> {{item.logtype || '转化'}}, <block wx:if="{{item.followupmode}}">
+            跟进方式: <text class="bold-text">{{item.followupmode || '--'}}</text>,
+          </block>跟进内容:
         </view>
       </view>
       <view class="follow-content">{{item.content || '--'}}</view>
@@ -20,4 +22,4 @@
   </view>
 </view>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/remitVoucher/detail.js

@@ -26,7 +26,7 @@ Page({
 			model: "#remitVoucher"
 		}, {
 			label: "附件",
-			icon: "icon-tabfujian1",3223
+			icon: "icon-tabfujian1",
 			model: "#Yl_Attachment"
 		}]
 	},

project.private.config.json

@@ -24,12 +24,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "CRM/lead/detail",
+          "pathName": "CRM/lead/detail",
+          "query": "id=422",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "CRM/order/detail",
           "pathName": "CRM/order/detail",
           "query": "id=2271628",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "CRM/lead/detail",