569785ef by lihua

解决继续协商判断问题

1 parent f044ef73
...@@ -310,7 +310,7 @@ const cancel = () => { ...@@ -310,7 +310,7 @@ const cancel = () => {
310 <template> 310 <template>
311 <div class="page-main" v-loading="detailLoading"> 311 <div class="page-main" v-loading="detailLoading">
312 <div class="content_main"> 312 <div class="content_main">
313 <ContentWrap title="基础信息" description="" :isExpand="baseInfoExpand" :expand-swicth="true" class="mb16" 313 <ContentWrap title="基础信息" description="" :isExpand="baseInfoExpand" :expand-swicth="false" class="mb16"
314 @expand="(v) => baseInfoExpand = v"> 314 @expand="(v) => baseInfoExpand = v">
315 <div class="list_panel"> 315 <div class="list_panel">
316 <div class="list_item"> 316 <div class="list_item">
......
...@@ -467,9 +467,9 @@ const disableConfirmBtn = computed(() => { ...@@ -467,9 +467,9 @@ const disableConfirmBtn = computed(() => {
467 for (const newItem of newValue) { 467 for (const newItem of newValue) {
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 || !isEqual(newItem.constraintFieldValue, oldItem.constraintFieldValue || 470 newItem.constraintOperatorCode != oldItem.constraintOperatorCode || newItem.constraintValue != oldItem.constraintValue ||
471 !isEqual(newItem.constraintConnectorValue, oldItem.constraintConnectorValue) 471 (newItem.constraintEnName == 'dataField' && !isEqual(newItem.constraintFieldValue, oldItem.additionValue)) ||
472 )) { 472 ((newItem.constraintEnName == 'limitedDeliveryConnector' || newItem.constraintEnName == 'limitedUseConnector') && !isEqual(newItem.constraintConnectorValue, oldItem.constraintConnectorValue))) {
473 return true; 473 return true;
474 } 474 }
475 index++; 475 index++;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!