246d2480 by lihua

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

1 parent 5326d71a
...@@ -1689,7 +1689,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1689,7 +1689,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1689 </div> 1689 </div>
1690 <div class="list_item"> 1690 <div class="list_item">
1691 <span class="item_label">公司名称:</span> 1691 <span class="item_label">公司名称:</span>
1692 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName ?? '--'" 1692 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName || userData.tenantName || '--'"
1693 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip> 1693 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip>
1694 </span> 1694 </span>
1695 </div> 1695 </div>
...@@ -1701,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1701,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1701 </div> 1701 </div>
1702 <div class="list_item"> 1702 <div class="list_item">
1703 <span class="item_label">统一社会信用代码:</span> 1703 <span class="item_label">统一社会信用代码:</span>
1704 <span class="item_value">{{ assetDetailInfo.socialCreditCode ?? "--" }}</span> 1704 <span class="item_value">{{ assetDetailInfo.socialCreditCode || "--" }}</span>
1705 </div> 1705 </div>
1706 <div class="list_item"> 1706 <div class="list_item">
1707 <span class="item_label">是否列入失信:</span> 1707 <span class="item_label">是否列入失信:</span>
...@@ -1709,7 +1709,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1709,7 +1709,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1709 </div> 1709 </div>
1710 <div class="list_item" v-if="assetDetailInfo.unitNatureName"> 1710 <div class="list_item" v-if="assetDetailInfo.unitNatureName">
1711 <span class="item_label">单位性质:</span> 1711 <span class="item_label">单位性质:</span>
1712 <span class="item_value">{{ assetDetailInfo.unitNatureName ?? '--' }}</span> 1712 <span class="item_value">{{ assetDetailInfo.unitNatureName || '--' }}</span>
1713 </div> 1713 </div>
1714 <div class="list_item"> 1714 <div class="list_item">
1715 <span class="item_label">注册日期:</span> 1715 <span class="item_label">注册日期:</span>
...@@ -1719,11 +1719,11 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1719,11 +1719,11 @@ const passCommonDialogBtnClick = (btn, info) => {
1719 </div> 1719 </div>
1720 <div class="list_item"> 1720 <div class="list_item">
1721 <span class="item_label">营业开始日期:</span> 1721 <span class="item_label">营业开始日期:</span>
1722 <span class="item_value">{{ assetDetailInfo.businessLicenseStartDate ?? "--" }}</span> 1722 <span class="item_value">{{ assetDetailInfo.businessLicenseStartDate || "--" }}</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>
1726 <span class="item_value">{{ assetDetailInfo.businessLicenseEndDate ?? "--" }}</span> 1726 <span class="item_value">{{ assetDetailInfo.businessLicenseEndDate || "--" }}</span>
1727 </div> 1727 </div>
1728 <div class="list_item is_block"> 1728 <div class="list_item is_block">
1729 <span class="item_label">单位注册地址:</span> 1729 <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!