| 
					
				 | 
			
			
				@@ -123,7 +123,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: [{ required: true, message: "请输入履职项" }], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         sort: [{ required: true, message: "请输入履职项显示排序" }], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      sortNumberList:[] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      sortNumberList:[], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      updateSort:null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   props: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -143,7 +144,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ruleId: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pointDtoList: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        sort: null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        sort: undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -151,6 +152,11 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.sortNumberList = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const data = id ? (await get(id)).data : this.reset(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.formData = data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if (data.sort){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.updateSort = data.sort; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.updateSort = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (this.formData.pointDtoList && this.formData.pointDtoList.length > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.formData.pointDtoList.forEach((item) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if (item.sort){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -180,8 +186,17 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         hasSameSort({ruleId:this.rule.id,sort:this.formData.sort}).then((res) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          let flag = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          //数据库有相同排序号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if (res.data && res.data === true){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //有相同排序号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            flag = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (this.updateSort && this.updateSort === this.formData.sort){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //是修改且排序号未修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            flag = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          if (flag && flag === true){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             MessageEx.info("已存在相同履职项排序号: "+this.formData.sort+",请重新输入!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 |