4352b373 by lihua

解决对比策略

1 parent ae9eaa39
......@@ -468,8 +468,8 @@ const disableConfirmBtn = computed(() => {
let oldItem = originValue[index];
if (newItem.action != oldItem.action || newItem.constraintEnName != oldItem.constraintEnName ||
newItem.constraintOperatorCode != oldItem.constraintOperatorCode || newItem.constraintValue != oldItem.constraintValue ||
(newItem.constraintEnName == 'dataField' && !isEqual(newItem.constraintFieldValue, oldItem.additionValue)) ||
((newItem.constraintEnName == 'limitedDeliveryConnector' || newItem.constraintEnName == 'limitedUseConnector') && !isEqual(newItem.constraintConnectorValue, oldItem.constraintConnectorValue))) {
(newItem.constraintEnName == 'dataField' && !isEqual(newItem.constraintFieldValue, oldItem.additionValue?.map(a => a.enName))) ||
((newItem.constraintEnName == 'limitedDeliveryConnector' || newItem.constraintEnName == 'limitedUseConnector') && !isEqual(newItem.constraintConnectorValue, oldItem.additionValue?.map(a => a.guid)))) {
return true;
}
index++;
......@@ -1068,7 +1068,8 @@ onBeforeMount(() => {
productTableInfo.value.data = detailInfo.value.contractSubjects || [];
let productGuid = productTableInfo.value.data?.[0]?.dataProductGuid;
if (productGuid && detailType.value == 'consult') {
getDamFieldsByProductGuid(productGuid, isDataUse.value ? 'Y' : 'N').then((res: any) => {
//当前用户不等于数据提供方就要传N.
getDamFieldsByProductGuid(productGuid, provider.executionerGuid != userData.tenantGuid ? 'Y' : 'N').then((res: any) => {
if (res?.code == proxy.$passCode) {
productFieldList.value = res.data || initProductFieldValue.value;
} else {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!