查重高亮显示基础修改

packageA/opponent/add.js

@@ -185,7 +185,13 @@ Page({
             }])
             this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
             })
         }
     },
@@ -216,7 +222,13 @@ Page({
             }])
             this.setData({
                 repetitionShow: true,
-                repetitionList: query.data,
+                repetitionList: query.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
                 isSubmit: true
             })
         } else {

packageA/opponent/add.wxml

@@ -16,8 +16,8 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
-        <view class="exp">{{language['创建人']||'创建人'}}:{{item.createby||" --"}}</view>
-        <view class="exp">{{language['品牌名称']||'品牌名称'}}:{{language[item.brandName]||item.brandName||" --"}}</view>
+        <view class="enterprise_title" style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['createby'] ? 'red' : '#666666'}}">{{language['创建人']||'创建人'}}:{{item.createby||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['brandName'] ? 'red' : '#666666'}}">{{language['品牌名称']||'品牌名称'}}:{{language[item.brandName]||item.brandName||" --"}}</view>
     </navigator>
 </van-popup>

packageA/opponent/detail.js

@@ -85,7 +85,13 @@ Page({
                         icon: "none"
                     });
                     this.setData({
-                        repetitionList: res.data,
+                        repetitionList: res.data.map(v => {
+                            v.chars = v.chars.reduce((acc, item) => ({
+                                ...acc,
+                                ...item
+                            }), {});
+                            return v
+                        }),
                         repetitionShow: true
                     })
                 })

packageA/opponent/detail.wxml

@@ -46,8 +46,8 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
-        <view class="exp">{{language['创建人']||'创建人'}}:{{item.createby||" --"}}</view>
-        <view class="exp">{{language['品牌名称']||'品牌名称'}}:{{language[item.brandName]||item.brandName||" --"}}</view>
+        <view class="enterprise_title" style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['createby'] ? 'red' : '#666666'}}">{{language['创建人']||'创建人'}}:{{item.createby||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['brandName'] ? 'red' : '#666666'}}">{{language['品牌名称']||'品牌名称'}}:{{language[item.brandName]||item.brandName||" --"}}</view>
     </navigator>
 </van-popup>

packageA/project/addAndEdit.js

@@ -380,7 +380,13 @@ Page({
             })
             if (wx.getStorageSync('userMsg').siteid != 'HY') this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
             })
         }
     },
@@ -449,7 +455,13 @@ Page({
                 })
                 this.setData({
                     repetitionShow: true,
-                    repetitionList: query.data,
+                    repetitionList: query.data.map(v => {
+                        v.chars = v.chars.reduce((acc, item) => ({
+                            ...acc,
+                            ...item
+                        }), {});
+                        return v
+                    }),
                     isSubmit: true
                 })
             }

packageA/project/addAndEdit.wxml

@@ -17,14 +17,14 @@
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
-        <view class="exp">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
-        <view class="exp">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address ||' --'}}</view>
-        <view class="exp">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
-        <view class="exp">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
-        <view class="exp">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['status'] ? 'red' : '#666666'}}">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projectnum'] ? 'red' : '#666666'}}">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projecttype'] ? 'red' : '#666666'}}">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['tradefield'] ? 'red' : '#666666'}}">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['brandName'] ? 'red' : '#666666'}}">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
     </navigator>
 </van-popup>
 <projectname id="projectname" siteid='{{siteid}}' />

packageA/project/detail.js

@@ -402,7 +402,13 @@ Page({
                             icon: "none"
                         })
                         this.setData({
-                            repetitionList: res.data,
+                            repetitionList: res.data.map(v => {
+                                v.chars = v.chars.reduce((acc, item) => ({
+                                    ...acc,
+                                    ...item
+                                }), {});
+                                return v
+                            }),
                             repetitionShow: true,
                             isRecover: true
                         });
@@ -534,7 +540,13 @@ Page({
                     } else {
                         this.setTags();
                         this.setData({
-                            repetitionList: res.data,
+                            repetitionList: res.data.map(v => {
+                                v.chars = v.chars.reduce((acc, item) => ({
+                                    ...acc,
+                                    ...item
+                                }), {});
+                                return v
+                            }),
                             repetitionShow: true
                         })
                     }

packageA/project/detail.wxml

@@ -43,14 +43,14 @@
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
-        <view class="exp">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
-        <view class="exp">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address}}</view>
-        <view class="exp">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
-        <view class="exp">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
-        <view class="exp">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['status'] ? 'red' : '#666666'}}">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projectnum'] ? 'red' : '#666666'}}">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address}}</view>
+        <view class="exp" style="color: {{item.chars['projecttype'] ? 'red' : '#666666'}}">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['tradefield'] ? 'red' : '#666666'}}">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['brandName'] ? 'red' : '#666666'}}">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
     </navigator>
 </van-popup>
 <!-- 结束 -->

packageA/project/modules/projectname/index.js

@@ -31,7 +31,13 @@ Component({
                     return res.msg
                 }
                 this.setData({
-                    repetitionList: res.data,
+                    repetitionList: res.data.map(v => {
+                        v.chars = v.chars.reduce((acc, item) => ({
+                            ...acc,
+                            ...item
+                        }), {});
+                        return v
+                    }),
                     show: this.data.siteid == 'HY' ? false : res.data.length != 0
                 })
                 return res.data.length != 0

packageA/project/modules/projectname/index.wxml

@@ -10,12 +10,12 @@
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
-        <view class="exp">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
-        <view class="exp">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address ||' --'}}</view>
-        <view class="exp">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
-        <view class="exp">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
-        <view class="exp">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['status'] ? 'red' : '#666666'}}">{{language['项目状态']||'项目状态'}}:{{item.status ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projectnum'] ? 'red' : '#666666'}}">{{language['项目编号']||'项目编号'}}:{{item.projectnum ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['项目地址']||'项目地址'}}:{{item.province+item.city+item.county+item.address ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projecttype'] ? 'red' : '#666666'}}">{{language['项目类型']||'项目类型'}}:{{language[item.projecttype]||item.projecttype ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['tradefield'] ? 'red' : '#666666'}}">{{language['领域']||'领域'}}:{{item.tradefield||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['brandName'] ? 'red' : '#666666'}}">{{language['品牌']||'品牌'}}:{{language[item.brandName]||item.brandName||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||' --'}}</view>
     </navigator>
 </van-popup>

packageA/publicCustomer/addAndEditor.js

@@ -595,7 +595,13 @@ Page({
             }])
             this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                })
             })
         }
     },
@@ -629,7 +635,13 @@ Page({
             }])
             this.setData({
                 repetitionShow: true,
-                repetitionList: query.data,
+                repetitionList: query.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
                 isSubmit: true
             })
         } else {

packageA/publicCustomer/addAndEditor.wxml

@@ -20,22 +20,22 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
+        <view class="enterprise_title"  style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
         <view class="tag-box">
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
-        <view class="exp">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
-        <view class="exp">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
-        <view class="exp">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
-        <view class="exp">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
-        <view class="exp">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['taxno'] ? 'red' : '#666666'}}">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['type'] ? 'red' : '#666666'}}">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['tradingstatus'] ? 'red' : '#666666'}}">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['followdate'] ? 'red' : '#666666'}}">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['systemapp'] ? 'red' : '#666666'}}">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
             <block wx:if="{{item.systemapp=='回收站'}}">
-                <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
-                <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>
+            <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
+            <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>
             </block>
         </view>
     </navigator>

packageA/publicCustomer/detail.js

@@ -239,7 +239,13 @@ Page({
                         icon: "none"
                     });
                     this.setData({
-                        repetitionList: res.data,
+                        repetitionList: res.data.map(v => {
+                            v.chars = v.chars.reduce((acc, item) => ({
+                                ...acc,
+                                ...item
+                            }), {});
+                            return v
+                        }),
                         repetitionShow: true
                     })
                 })

packageA/publicCustomer/detail.wxml

@@ -53,19 +53,19 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
+        <view class="enterprise_title"  style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
         <view class="tag-box">
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
-        <view class="exp">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
-        <view class="exp">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
-        <view class="exp">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
-        <view class="exp">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
-        <view class="exp">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['taxno'] ? 'red' : '#666666'}}">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['type'] ? 'red' : '#666666'}}">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['tradingstatus'] ? 'red' : '#666666'}}">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['followdate'] ? 'red' : '#666666'}}">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['systemapp'] ? 'red' : '#666666'}}">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}</view>
             <block wx:if="{{item.systemapp=='回收站'}}">
                 <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
                 <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>

packageA/saleClue/change.js

@@ -357,7 +357,13 @@ Page({
             })
             this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                })
             })
         }
     },
@@ -419,7 +425,13 @@ Page({
                 })
                 this.setData({
                     repetitionShow: true,
-                    repetitionList: query.data,
+                    repetitionList: query.data.map(v => {
+                        v.chars = v.chars.reduce((acc, item) => ({
+                            ...acc,
+                            ...item
+                        }), {});
+                        return v
+                    }),
                     isSubmit: true
                 })
             }

packageA/saleClue/change.wxml

@@ -18,14 +18,14 @@
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['项目状态']||"项目状态"}}:{{item.status ||' --'}}</view>
-        <view class="exp">{{language['项目编号']||"项目编号"}}:{{item.projectnum ||' --'}}</view>
-        <view class="exp">{{language['项目地址']||"项目地址"}}:{{item.province + item.city + item.county + item.address}}</view>
-        <view class="exp">{{language['项目类型']||"项目类型"}}:{{item.projecttype ||' --'}}</view>
-        <view class="exp">{{language['领域']||"领域"}}:{{item.tradefield||' --'}}</view>
-        <view class="exp">{{language['品牌']||"品牌"}}:{{item.brandname||' --'}}</view>
-        <view class="exp">{{language['负责人']||"负责人"}}:{{item.leader[0].name||' --'}}</view>
-        <view class="exp">{{language['手机号']||"手机号"}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['status'] ? 'red' : '#666666'}}">{{language['项目状态']||"项目状态"}}:{{item.status ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['projectnum'] ? 'red' : '#666666'}}">{{language['项目编号']||"项目编号"}}:{{item.projectnum ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['项目地址']||"项目地址"}}:{{item.province + item.city + item.county + item.address}}</view>
+        <view class="exp" style="color: {{item.chars['projecttype'] ? 'red' : '#666666'}}">{{language['项目类型']||"项目类型"}}:{{item.projecttype ||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['tradefield'] ? 'red' : '#666666'}}">{{language['领域']||"领域"}}:{{item.tradefield||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['brandname'] ? 'red' : '#666666'}}">{{language['品牌']||"品牌"}}:{{item.brandname||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||"负责人"}}:{{item.leader[0].name||' --'}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||"手机号"}}:{{item.phonenumber||" --"}}</view>
     </navigator>
 </van-popup>
 <projectname id="projectname" siteid='{{siteid}}' />

packageA/saleClue/translate.js

@@ -560,7 +560,13 @@ Page({
             }])
             this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                })
             })
         }
     },
@@ -597,7 +603,13 @@ Page({
             })
             this.setData({
                 repetitionShow: true,
-                repetitionList: query.data,
+                repetitionList: query.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
                 isSubmit: true
             })
         } else {

packageA/saleClue/translate.wxml

@@ -9,10 +9,13 @@
 </Yl_field>
 <view style="height: 160rpx;" />
 <view class="new-footer" style="padding-bottom:12rpx;">
-    <van-button custom-class='new-submit query' disabled='{{countDown ||disabled}}' bindclick='queryRepetition'>{{countDown?countDown+'S':"查重"}}</van-button>
-    <van-button custom-class='new-submit' disabled='{{disabled}}' bindclick='submit'>{{language['提交']||'提交'}}</van-button>
+    <van-button custom-class='new-submit query' disabled='{{countDown ||disabled}}' bindclick='queryRepetition'>
+        {{countDown?countDown+'S':"查重"}}
+    </van-button>
+    <van-button custom-class='new-submit' disabled='{{disabled}}' bindclick='submit'>
+        {{language['提交']||'提交'}}
+    </van-button>
 </view>
-
 <!-- 查重 -->
 <van-popup show="{{ repetitionShow }}" custom-class='popup' round position="bottom" custom-style="height: 100%;" bind:close="repClose">
     <view class="title">
@@ -20,8 +23,14 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid">
-        <view class="enterprise_title">{{item.enterprisename}}</view>
-        <view class="exp">{{language['税号']||'税号'}}:{{item.taxno}}</view>
-        <view class="exp">{{language['地址']||'地址'}}:{{item.address}}</view>
+        <view class="enterprise_title" style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">
+            {{item.enterprisename}}
+        </view>
+        <view class="exp" style="color: {{item.chars['taxno'] ? 'red' : '#666666'}}">
+            {{language['税号']||'税号'}}:{{item.taxno}}
+        </view>
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">
+            {{language['地址']||'地址'}}:{{item.address}}
+        </view>
     </navigator>
 </van-popup>

packageA/setclient/addAndEditor.js

@@ -545,10 +545,6 @@ Page({
     /* 查询是否重复 */
     async queryRepetition(e) {
         let data = this.selectComponent("#Form").query();
-        /* if (data.enterprisename == '') return wx.showToast({
-            title: `您还未填写企业名称`,
-            icon: "none"
-        }); */
         data.province = data.region[0] || "";
         data.city = data.region[1] || "";
         data.county = data.region[2] || "";
@@ -587,7 +583,13 @@ Page({
             })
             this.setData({
                 repetitionShow: true,
-                repetitionList: res.data
+                repetitionList: res.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                })
             })
         }
     },
@@ -634,7 +636,13 @@ Page({
             })
             this.setData({
                 repetitionShow: true,
-                repetitionList: query.data,
+                repetitionList: query.data.map(v => {
+                    v.chars = v.chars.reduce((acc, item) => ({
+                        ...acc,
+                        ...item
+                    }), {});
+                    return v
+                }),
                 isSubmit: true
             })
         } else {

packageA/setclient/addAndEditor.wxml

@@ -22,22 +22,22 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
+        <view class="enterprise_title" style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
         <view class="tag-box">
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
-        <view class="exp">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
-        <view class="exp">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
-        <view class="exp">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
-        <view class="exp">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
-        <view class="exp">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['taxno'] ? 'red' : '#666666'}}">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['type'] ? 'red' : '#666666'}}">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['tradingstatus'] ? 'red' : '#666666'}}">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['followdate'] ? 'red' : '#666666'}}">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['systemapp'] ? 'red' : '#666666'}}">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
             <block wx:if="{{item.systemapp=='回收站'}}">
-                <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
-                <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>
+            <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
+            <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>
             </block>
         </view>
     </navigator>

packageA/setclient/detail.js

@@ -327,7 +327,13 @@ Page({
                         icon: "none"
                     });
                     this.setData({
-                        repetitionList: res.data,
+                        repetitionList: res.data.map(v => {
+                            v.chars = v.chars.reduce((acc, item) => ({
+                                ...acc,
+                                ...item
+                            }), {});
+                            return v
+                        }),
                         repetitionShow: true
                     })
                 })

packageA/setclient/detail.wxml

@@ -54,19 +54,19 @@
         <van-icon custom-class='icon' size='40rpx' name="cross" bindtap="repClose" />
     </view>
     <navigator url="#" class="enterprise" wx:for="{{repetitionList}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="toRepDetail">
-        <view class="enterprise_title">{{item.enterprisename||" --"}}</view>
+        <view class="enterprise_title"  style="color: {{item.chars['enterprisename'] ? 'red' : '#666666'}}">{{item.enterprisename||" --"}}</view>
         <view class="tag-box">
             <van-tag custom-class='tag' wx:for="{{item.tag_sys}}" wx:key="index" wx:for-item='tag' color='#3874f6' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
             <van-tag custom-class='tag' wx:for="{{item.tag}}" wx:key="index" wx:for-item='tag' color='#FA8C16' text-color='#fff' round>{{language[tag]||tag}}</van-tag>
         </view>
-        <view class="exp">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
-        <view class="exp">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
-        <view class="exp">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
-        <view class="exp">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
-        <view class="exp">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
-        <view class="exp">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
-        <view class="exp">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
-        <view class="exp">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}
+        <view class="exp" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{language['客户地址']||'客户地址'}}:{{item.address||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['taxno'] ? 'red' : '#666666'}}">{{language['企业税号']||'企业税号'}}:{{item.taxno||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['type'] ? 'red' : '#666666'}}">{{language['客户类型']||'客户类型'}}:{{item.type||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['leader'] ? 'red' : '#666666'}}">{{language['负责人']||'负责人'}}:{{item.leader[0].name||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['phonenumber'] ? 'red' : '#666666'}}">{{language['手机号']||'手机号'}}:{{item.phonenumber||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['tradingstatus'] ? 'red' : '#666666'}}">{{language['成交状态']||'成交状态'}}:{{item.tradingstatus||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['followdate'] ? 'red' : '#666666'}}">{{language['最近跟进时间']||'最近跟进时间'}}:{{item.followdate||" --"}}</view>
+        <view class="exp" style="color: {{item.chars['systemapp'] ? 'red' : '#666666'}}">{{language['归属应用']||'归属应用'}}:{{item.systemapp||" --"}}</view>
             <block wx:if="{{item.systemapp=='回收站'}}">
                 <icon style="padding-left:10rpx;" type="warn" size="11" color='red' />
                 <text style="color: red;margin-left: 2rpx;">{{language['当前重复客户归属回收站,请联系管理处理！']||'当前重复客户归属回收站,请联系管理处理！'}}</text>