| 
					
				 | 
			
			
				@@ -2609,7 +2609,7 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#calc-img').attr('src', updateData.img); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#view-calc-img').attr('src', updateData.img); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#show-calc-img').attr('src', updateData.img); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    $('#view-calc-remark').val(img_remark); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $('#view-calc-remark').text(img_remark); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#edit-img').modal('hide'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     // updateImageData = updateData; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2629,6 +2629,8 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#show-calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#view-calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $('#view-calc-remark').val(''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $('#text-edit').val('') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#edit-img').modal('hide'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     // postData(window.location.pathname + '/detail/merge-img', {updateType: 'clear', lid: data.lid, pid: data.pid, uuid: data.uuid}, function (result) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //     stageIm.loadUpdateDetailData(result); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2645,6 +2647,8 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#show-calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#view-calc-img').attr('src', ''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $('#view-calc-remark').val(''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $('#text-edit').val('') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $('#edit-img').modal('hide'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2744,7 +2748,7 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $('#view-calc-img').attr('src', calcImgSrc); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             const calcImgRemark = data && data.calc_img_remark || ''; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            console.log('calcImgRemark', calcImgRemark, '') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            console.log('calcImgRemark', calcImgRemark, 'data:', data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $('#view-calc-remark').val(calcImgRemark); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $("#view-calc-remark").attr('readonly', true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 处理 编辑 -> 添加草图中textarea多余的空格 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3067,6 +3071,7 @@ $(document).ready(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 let showDel = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!curAuditor) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     stage.status === auditConst.status.checked && parseInt(att.re_upload) && (showDel = true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    stage.status === auditConst.status.uncheck && parseInt(cur_uid) === stage.user_id && (showDel = true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     stage.status === auditConst.status.checkNo && parseInt(cur_uid) === stage.user_id && (showDel = true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     curAuditor.aid === parseInt(cur_uid) && (showDel = true) 
			 |