冲突修正

src/HManagement/clueManage/clue_private/modules/distobutionOne.vue

@@ -10,7 +10,7 @@
         <tableLayout :layout="tablecols2" :data="agentlist" :custom="true" :height="tableHieght">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'ismatch'">
-              <p :style="scope.column.data.ismatch === 1?'color:#52c41a':''">{{scope.column.data.ismatch === 1?this.$t('是'):this.$t('否')}}</p>
+              <p :style="scope.column.data.ismatch === 1?'color:#52c41a':''">{{scope.column.data.ismatch === 1?$t('是'):$t('否')}}</p>
             </div>
             <div v-else-if="scope.column.columnname === 'province'">
               <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>