合同进度一览bug修改

@@ -173,7 +173,7 @@ const getNodeSteps = (scope) => {
         value: index + 1
         value: index + 1
       }
       }
     }),
     }),
-    step: scope.row.contractNodes.length - 1
+    step: !scope.row.contractNodes?.length ? null : (scope.row.contractNodes.length - 1)
   }
   }
 }
 }
 
 
@@ -327,6 +327,11 @@ const drawerBtnClick = async (btn, info) => {
   if (btn.value == 'cancel') {
   if (btn.value == 'cancel') {
     drawerInfo.value.visible = false;
     drawerInfo.value.visible = false;
   } else {
   } else {
+    if (info.partyAGuid == info.partyBGuid) {
+      proxy.$ElMessage.error(`甲方名称跟乙方名称不能选择同一个`);
+      drawerRef.value?.getDrawerConRef('drawerFormRef')?.ruleFormRef?.scrollToField('partyAGuid');
+      return;
+    }
     let res = await validate();
     let res = await validate();
     if (!res) {
     if (!res) {
       return
       return
@@ -572,9 +577,10 @@ const nodeFormRules = ref({
 const addNode = () => {
 const addNode = () => {
   let len = nodesInfo.value.length;
   let len = nodesInfo.value.length;
   let code = contractNodeCodes.value[len];
   let code = contractNodeCodes.value[len];
+  let nodeList = drawerRef.value?.getDrawerConRef('drawerFormRef')?.formInline?.contractTypeCode == '2' ? tradeContractNodesList.value : registerContractNodesList.value;
   nodesInfo.value.push({
   nodesInfo.value.push({
     contractNodeCode: code,
     contractNodeCode: code,
-    contractNodeName: registerContractNodesList.value.find(r => r.value == code)?.label || tradeContractNodesList.value.find(r => r.value == code)?.label,
+    contractNodeName: nodeList.find(r => r.value == code)?.label,
     nodeFormItems: cloneDeep(nodeFormItems.value),
     nodeFormItems: cloneDeep(nodeFormItems.value),
     nodeFormRules: nodeFormRules.value
     nodeFormRules: nodeFormRules.value
   })
   })
@@ -718,7 +724,7 @@ onBeforeMount(() => {
             <el-icon>
             <el-icon>
               <Plus />
               <Plus />
             </el-icon>
             </el-icon>
-            <span>新增规则</span>
+            <span>新增进展</span>
           </div>
           </div>
         </template>
         </template>
       </template>
       </template>