841208d1 by lihua

fix: 数据质量表配置评估方案

1 parent 5668fdda
...@@ -1699,7 +1699,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1699,7 +1699,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1699 </div> 1699 </div>
1700 <div class="list_item"> 1700 <div class="list_item">
1701 <span class="item_label">公司名称:</span> 1701 <span class="item_label">公司名称:</span>
1702 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName ?? '--'" 1702 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName || userData.tenantName || '--'"
1703 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip> 1703 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip>
1704 </span> 1704 </span>
1705 </div> 1705 </div>
...@@ -1711,7 +1711,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1711,7 +1711,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1711 </div> 1711 </div>
1712 <div class="list_item"> 1712 <div class="list_item">
1713 <span class="item_label">统一社会信用代码:</span> 1713 <span class="item_label">统一社会信用代码:</span>
1714 <span class="item_value">{{ assetDetailInfo.socialCreditCode ?? "--" }}</span> 1714 <span class="item_value">{{ assetDetailInfo.socialCreditCode || "--" }}</span>
1715 </div> 1715 </div>
1716 <div class="list_item"> 1716 <div class="list_item">
1717 <span class="item_label">是否列入失信:</span> 1717 <span class="item_label">是否列入失信:</span>
...@@ -1719,7 +1719,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1719,7 +1719,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1719 </div> 1719 </div>
1720 <div class="list_item" v-if="assetDetailInfo.unitNatureName"> 1720 <div class="list_item" v-if="assetDetailInfo.unitNatureName">
1721 <span class="item_label">单位性质:</span> 1721 <span class="item_label">单位性质:</span>
1722 <span class="item_value">{{ assetDetailInfo.unitNatureName ?? '--' }}</span> 1722 <span class="item_value">{{ assetDetailInfo.unitNatureName || '--' }}</span>
1723 </div> 1723 </div>
1724 <div class="list_item"> 1724 <div class="list_item">
1725 <span class="item_label">注册日期:</span> 1725 <span class="item_label">注册日期:</span>
...@@ -1729,11 +1729,11 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1729,11 +1729,11 @@ const passCommonDialogBtnClick = (btn, info) => {
1729 </div> 1729 </div>
1730 <div class="list_item"> 1730 <div class="list_item">
1731 <span class="item_label">营业开始日期:</span> 1731 <span class="item_label">营业开始日期:</span>
1732 <span class="item_value">{{ assetDetailInfo.businessLicenseStartDate ?? "--" }}</span> 1732 <span class="item_value">{{ assetDetailInfo.businessLicenseStartDate || "--" }}</span>
1733 </div> 1733 </div>
1734 <div class="list_item"> 1734 <div class="list_item">
1735 <span class="item_label">营业结束日期:</span> 1735 <span class="item_label">营业结束日期:</span>
1736 <span class="item_value">{{ assetDetailInfo.businessLicenseEndDate ?? "--" }}</span> 1736 <span class="item_value">{{ assetDetailInfo.businessLicenseEndDate || "--" }}</span>
1737 </div> 1737 </div>
1738 <div class="list_item is_block"> 1738 <div class="list_item is_block">
1739 <span class="item_label">单位注册地址:</span> 1739 <span class="item_label">单位注册地址:</span>
......
...@@ -956,6 +956,9 @@ const modelFormTreeSelectLoad = (node, resolve, item) => { ...@@ -956,6 +956,9 @@ const modelFormTreeSelectLoad = (node, resolve, item) => {
956 d.isLeaf = true; 956 d.isLeaf = true;
957 return d; 957 return d;
958 }) || []; 958 }) || [];
959 if (groupGuid.value == node.data.guid && modelGuid.value && !treeSelectNode.value) {
960 treeSelectNode.value = data.find(d => d.guid == modelGuid.value);
961 }
959 resolve(data); 962 resolve(data);
960 } else { 963 } else {
961 resolve([]); 964 resolve([]);
...@@ -1420,7 +1423,7 @@ const selectSubjectTables = computed(() => { ...@@ -1420,7 +1423,7 @@ const selectSubjectTables = computed(() => {
1420 subjectGuid: tInfo.subjectGuid 1423 subjectGuid: tInfo.subjectGuid
1421 }]; 1424 }];
1422 } 1425 }
1423 return v.qualityModelGuid ? [treeSelectNode.value] : []; 1426 return v.qualityModelGuid ? (treeSelectNode.value ? [treeSelectNode.value] : []): [];
1424 } 1427 }
1425 if (v.planType === 3) { 1428 if (v.planType === 3) {
1426 return selectModelsByGroup.value; 1429 return selectModelsByGroup.value;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!