qymljy vor 1 Jahr
Ursprung
Commit
036890a977

+ 1 - 21
src/Form/projectChange/add.vue

@@ -964,7 +964,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
-          this.getFontHighlight(res.data)
+          this.tool.getFontHighlight(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)
@@ -993,26 +993,6 @@ export default {
       let res2 = await this.$store.dispatch("optiontypeselect", "projectgrade");
       this.projectLead = res2.data;
     },
-    getFontHighlight(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
-      })
-    }
   },
   mounted() {},
   created() {

+ 6 - 0
src/Form/projectChange/edit.vue

@@ -469,6 +469,11 @@
                 : "--"
             }}</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>
           </div>
@@ -958,6 +963,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
+          this.tool.getFontHighlight(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)

+ 1 - 0
src/components/duplicatesCheck/customerCheck.vue

@@ -175,6 +175,7 @@ export default {
           this.list = res.data;
           this.total = res.total;
           this.currentPage = res.pageNumber;
+          this.tool.getFontHighlight(res.data)
           this.list.forEach((item) => {
             this.isBack = false;
             if (item.systemapp === "回收站") {

+ 2 - 24
src/components/duplicatesCheck/projectCheck.vue

@@ -45,7 +45,7 @@
             </span>
           </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span :style="{color: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>
+            <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
@@ -124,7 +124,7 @@ export default {
       } else {
         if (res.total > 0) {
           this.list = res.data;
-          this.getFontHighlight(res.data)
+          this.tool.getFontHighlight(res.data)
           this.total = res.total;
           this.currentPage = res.pageNumber;
           if (this.siteid == "HY") {
@@ -310,28 +310,6 @@ export default {
         this.listData();
       }
     },
-    getFontHighlight(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'
-          }
-        })
-        console.log(data,'1111')
-        console.log(item,'item333333')
-        return item
-      })
-    }
   },
   created() {
     this.tablecols = this.tool.tabelCol(