装箱信息

src/Form/projectChange/add.vue

@@ -456,6 +456,9 @@
                 : "--"
             }}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span>{{highlightDuplicates(scope.column.data[scope.column.columnname],scope.column.data.chars[0].projectname[0])}}</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>
@@ -670,6 +673,7 @@ export default {
           },
         ],
       },
+      projectnameCheck:[]
     };
   },
   computed: {
@@ -986,6 +990,21 @@ export default {
       let res2 = await this.$store.dispatch("optiontypeselect", "projectgrade");
       this.projectLead = res2.data;
     },
+    highlightDuplicates(text, regex) {
+      const matches = [...text.matchAll(regex)];
+      let highlightedText = text;
+
+      // 反向迭代防止已添加标签影响后续索引位置
+      for (let i = matches.length - 1; i >= 0; i--) {
+        const match = matches[i][0];
+        highlightedText = highlightedText.replace(
+            new RegExp(match),
+            `<span style="color: red;">${match}</span>`
+        );
+      }
+
+      return highlightedText;
+    }
   },
   mounted() {},
   created() {

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBoxmx.vue

@@ -20,9 +20,30 @@
         :label="$t('型号')"
         width="180">
       </el-table-column>
+     <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+       <template slot-scope="scope">
+         <p>
+           <span>{{ scope.row.caliber }}</span>
+         </p>
+       </template>
+     </el-table-column>
+     <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+       <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+         <div v-else>--</div>
+       </template>
+     </el-table-column>
       <el-table-column
         prop="spec"
         :label="$t(`规格尺寸`)"
+        v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
         width="180">
       </el-table-column>
       <el-table-column
@@ -69,7 +90,8 @@ export default {
       tableData:[],
       total:0,
       currentPage:0,
-      loading:false
+      loading:false,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{