1d3cb7f4 by lihua

fix

1 parent 6226e6ed
...@@ -290,6 +290,14 @@ const getSensitiveFieldLabelData = (info?: { ...@@ -290,6 +290,14 @@ const getSensitiveFieldLabelData = (info?: {
290 } 290 }
291 return d; 291 return d;
292 }) || []); 292 }) || []);
293 let list = data['确认状态'];
294 if (info?.setStatus !== false || !pageInfo.value.confirmStatus?.length) {
295 confirmStatusList.value = list?.map(d => {
296 d.guid = d.confirmStatus;
297 d.label = d.confirmStatus == 'Y' ? '已确认' : '未确认';
298 return d;
299 }) || []
300 };
293 (info?.setType !== false || !pageInfo.value.labelTypeCodes?.length) && (labelTypeDataList.value = data['标签类型']?.map(d => { 301 (info?.setType !== false || !pageInfo.value.labelTypeCodes?.length) && (labelTypeDataList.value = data['标签类型']?.map(d => {
294 d.guid = d.labelTypeCode; 302 d.guid = d.labelTypeCode;
295 if (!d.labelTypeCode) { 303 if (!d.labelTypeCode) {
...@@ -298,11 +306,6 @@ const getSensitiveFieldLabelData = (info?: { ...@@ -298,11 +306,6 @@ const getSensitiveFieldLabelData = (info?: {
298 } 306 }
299 return d; 307 return d;
300 }) || []) 308 }) || [])
301 (info?.setStatus !== false || !pageInfo.value.confirmStatus?.length) && (confirmStatusList.value = data['确认状态']?.map(d => {
302 d.guid = d.confirmStatus;
303 d.label = d.confirmStatus == 'Y' ? '已确认' : '未确认';
304 return d;
305 }) || [])
306 } else { 309 } else {
307 proxy.$ElMessage({ 310 proxy.$ElMessage({
308 type: 'error', 311 type: 'error',
...@@ -433,13 +436,7 @@ const confirmStatusList: any = ref([]); ...@@ -433,13 +436,7 @@ const confirmStatusList: any = ref([]);
433 const popoverStatusListInfo = computed(() => { 436 const popoverStatusListInfo = computed(() => {
434 return { 437 return {
435 type: 'checkbox-list-btns', 438 type: 'checkbox-list-btns',
436 data: confirmStatusList.value || [{ 439 data: confirmStatusList.value,
437 guid: 'N',
438 label: '待确认'
439 }, {
440 guid: 'Y',
441 label: '已确认'
442 }],
443 placeholder: '请输入关键字搜索', 440 placeholder: '请输入关键字搜索',
444 scope: { 441 scope: {
445 row: {} 442 row: {}
...@@ -710,12 +707,11 @@ const cntLabelMap = ref({ ...@@ -710,12 +707,11 @@ const cntLabelMap = ref({
710 </template> 707 </template>
711 </el-table-column> 708 </el-table-column>
712 <el-table-column label="所属表中文名" prop="tableChName" width="140" align="left" show-overflow-tooltip> 709 <el-table-column label="所属表中文名" prop="tableChName" width="140" align="left" show-overflow-tooltip>
713 <template #default="scope"> 710 <template #default="scope">
714 <span>{{ scope.row.tableChName || '--' }}</span> 711 <span>{{ scope.row.tableChName || '--' }}</span>
715 </template> 712 </template>
716 </el-table-column> 713 </el-table-column>
717 <el-table-column label="所属表英文名" prop="tableName" width="160" align="left" 714 <el-table-column label="所属表英文名" prop="tableName" :width="dataSource == 1 ? 160 : 130" align="left" show-overflow-tooltip>
718 show-overflow-tooltip>
719 </el-table-column> 715 </el-table-column>
720 <el-table-column label="确认状态" prop="confirmStatus" class-name="filter-cell" width="120" align="center" 716 <el-table-column label="确认状态" prop="confirmStatus" class-name="filter-cell" width="120" align="center"
721 show-overflow-tooltip> 717 show-overflow-tooltip>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!