Merge branch 'greenUrgent' into allTestUrgent

src/Form/projectChange/add.vue

@@ -456,15 +456,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? $t(scope.column.data[scope.column.columnname])
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -959,6 +967,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)

src/Form/projectChange/edit.vue

@@ -469,15 +469,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? $t(scope.column.data[scope.column.columnname])
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -958,6 +966,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -249,13 +249,25 @@
               </el-tag>
             </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
-          <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          <p v-else><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div  class="container normal-panel" style="text-align:right">
@@ -717,6 +729,7 @@ export default {
           this.repeats = res.data
           this.total = res.total
           this.$refs.form.validateField('projectname')
+          this.tool.getCheckFontProject(res.data)
           if (this.repeats.length > 0){
             this.siteid == 'HY'?this.dialogTableVisible = true:this.dialogTableVisible = true
           }else {

src/components/duplicatesCheck/customerChangeCheck.vue

@@ -58,11 +58,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesCheck/customerCheck.vue

@@ -59,11 +59,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesCheck/projectChangeCheck.vue

@@ -45,12 +45,24 @@
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">
@@ -127,6 +139,7 @@ export default {
           this.list = res.data;
           this.total = res.total;
           this.currentPage = res.pageNumber;
+          this.tool.getCheckFontProject(res.data)
           if (this.siteid == "HY") {
             if (val == "审核") {
               this.dialogTableVisible = true;

src/components/duplicatesCheck/projectCheck.vue

@@ -39,12 +39,24 @@
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">
@@ -119,6 +131,7 @@ export default {
       } else {
         if (res.total > 0) {
           this.list = res.data;
+          this.tool.getCheckFontProject(res.data)
           this.total = res.total;
           this.currentPage = res.pageNumber;
           if (this.siteid == "HY") {

src/components/duplicatesCheck/publicCustomerCheck.vue

@@ -41,7 +41,14 @@
           </div>
           <p
             v-else
-          >{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          ><span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span></p>
         </template>
       </tableLayout>
       <div class="container normal-panel" style="text-align:right">

src/components/duplicatesData/duplicatesCustomer.vue

@@ -49,11 +49,14 @@
             }}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[0][scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[0][scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>

src/components/duplicatesData/duplicatesProject.vue

@@ -48,15 +48,23 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.chars.address && scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p v-else>
-            {{
-              scope.column.data[scope.column.columnname]
-                ? scope.column.data[scope.column.columnname]
-                : "--"
-            }}
+            <span v-if="scope.column.data[scope.column.columnname]">
+              <span :style="{color:scope.column.data.chars[scope.column.columnname] && scope.column.data[scope.column.columnname].includes(scope.column.data.chars[scope.column.columnname])?'red':'#666'}">
+                {{scope.column.data[scope.column.columnname]}}
+              </span>
+            </span>
+            <span v-else>
+              --
+            </span>
           </p>
         </template>
       </tableLayout>
@@ -121,6 +129,7 @@ export default {
       const res = await this.$api.requested(this.param);
       this.list = res.data;
       this.total = res.total
+      this.tool.getCheckFontProject(res.data)
       this.currentPage = res.pageNumber
       this.dialogTableVisible = true;
       if (res.data.length !== 0) {

src/utils/tool.js

@@ -264,5 +264,47 @@ export default {
     const month = String(newData.getMonth() + 1).padStart(2,'0')
     const date = String(newData.getDate()).padStart(2,'0')
     return year + '-' + month +'-' + date
+  },
+  /*查重项目格式化*/
+  getCheckFontProject(data){
+    data.map(item => {
+      item.chars = item.chars.reduce((acc,ite) => ({
+        ...acc,
+        ...ite
+      }),{})
+
+      item.projectname = item.projectname.split('').map(text => {
+        let projectname = item.chars.projectname.join("") || ''
+        return projectname.includes(text) ? {
+          text,
+          color: 'red'
+        } : {
+          text,
+          color: '#666'
+        }
+      })
+      return item
+    })
+  },
+  /*查重客户格式化*/
+  getCheckFontEnterprisename(data){
+    data.map(item => {
+      item.chars = item.chars.reduce((acc,ite) => ({
+        ...acc,
+        ...ite
+      }),{})
+
+      item.enterprisename = item.enterprisename.split('').map(text => {
+        let enterprisename = item.chars.enterprisename.join("") || ''
+        return enterprisename.includes(text) ? {
+          text,
+          color: 'red'
+        } : {
+          text,
+          color: '#666'
+        }
+      })
+      return item
+    })
   }
 }