56aecc02 by lihua

解决对比策略

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