From e689b90f47540ea5dfc9f037c506555723a729b7 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Sat, 27 May 2023 18:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=BC=96=E8=BE=91=E5=90=88=E5=90=8C=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/project/view/index/view_overview.html   |  2 +-
 public/static/assets/gougu/css/gougu.css    |  3 ++-
 public/static/assets/gougu/module/oaTool.js | 28 ---------------------
 public/static/assets/gougu/module/tool.js   | 28 +++++++++++++++++++++
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/project/view/index/view_overview.html b/app/project/view/index/view_overview.html
index bc1be67..b7678db 100644
--- a/app/project/view/index/view_overview.html
+++ b/app/project/view/index/view_overview.html
@@ -17,7 +17,7 @@
 				title="修改计划结束日期" data-name="end_time"></i>
 			{gt name=":isModule('contract')" value="0"}
 				<span class="gray" style="margin-left:32px">关联合同：</span>
-				<span id="content_{$detail.id}" data-val="{$detail.contract_id}">{$detail.contract}</span>
+				<span id="contract_id_{$detail.id}" data-val="{$detail.contract_id}">{$detail.contract}</span>
 				<i class="iconfont icon-wodedianping" title="编辑" data-id="{$detail.id}" data-name="contract_id"></i>
 			{/gt}
 		</div>
diff --git a/public/static/assets/gougu/css/gougu.css b/public/static/assets/gougu/css/gougu.css
index 6b16f2b..052d976 100644
--- a/public/static/assets/gougu/css/gougu.css
+++ b/public/static/assets/gougu/css/gougu.css
@@ -36,6 +36,7 @@
 .layui-table-view{margin:0;}
 .layui-table-view .layui-table th{background-color:#f8f8f8;}
 .layui-table-form tbody tr:hover{background-color: #fff;}
+.layui-table-tool{padding:10px 12px}
 .layui-td-gray,.layui-td-gray-2,.layui-td-gray-3,.layui-td-gray-4{color:#909399; width:68px; text-align:right; background-color:#fafafa;}
 .layui-td-gray-2{width:96px;}
 .layui-td-gray-3{width:126px;}
@@ -271,7 +272,7 @@ div.layui-table-main::-webkit-scrollbar-thumb:active{background-color:rgba(0,0,0
 }
 
 /*gg-DIY*/
-.gg-form-bar{padding:10px 15px 0; background-color:#fff;}
+.gg-form-bar{padding:10px 12px 0; background-color:#fff;}
 .gg-form-bar .layui-input-inline{margin-bottom:10px;}
 .gg-tab-bar{background-color:#fff;}
 .gg-tab{text-align: left!important;}
diff --git a/public/static/assets/gougu/module/oaTool.js b/public/static/assets/gougu/module/oaTool.js
index fcd343b..3f9f8c3 100644
--- a/public/static/assets/gougu/module/oaTool.js
+++ b/public/static/assets/gougu/module/oaTool.js
@@ -455,34 +455,6 @@ layui.define(['tool'], function (exports) {
 		}
 	};
 	
-	//查看图片文件
-	$('body').on('click','.file-view-img',function () {
-		let href = $(this).data('href');
-		if(href){
-			let photos = { "data": [{"src": href}]};
-			layer.photos({
-				photos: photos
-				,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
-			});
-		}
-	});	
-	
-	//查看pdf文件
-	$('body').on('click','.file-view-pdf',function () {
-		let href = $(this).data('href');
-		if(href){
-			layer.open({
-			  type: 2,
-			  title: '查看PDF文件，可以最大化看',
-			  shadeClose: true,
-			  shade: false,
-			  maxmin: true, //开启最大化最小化按钮
-			  area: ['900px', '600px'],
-			  content: href
-			});
-		}
-	});
-	
 	//选择部门	
 	$('body').on('click','.picker-depament',function () {
 		let that = $(this);
diff --git a/public/static/assets/gougu/module/tool.js b/public/static/assets/gougu/module/tool.js
index e3b0edb..17d1bf3 100644
--- a/public/static/assets/gougu/module/tool.js
+++ b/public/static/assets/gougu/module/tool.js
@@ -314,6 +314,34 @@ layui.define([], function (exports) {
 			type: type
 		});
 		return false;
+	});	
+	
+	//查看图片附件
+	$('body').on('click','.file-view-img',function () {
+		let href = $(this).data('href');
+		if(href){
+			let photos = { "data": [{"src": href}]};
+			layer.photos({
+				photos: photos
+				,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+			});
+		}
+	});	
+	
+	//查看pdf附件
+	$('body').on('click','.file-view-pdf',function () {
+		let href = $(this).data('href');
+		if(href){
+			layer.open({
+			  type: 2,
+			  title: '查看PDF文件，可以最大化看',
+			  shadeClose: true,
+			  shade: false,
+			  maxmin: true, //开启最大化最小化按钮
+			  area: ['900px', '600px'],
+			  content: href
+			});
+		}
 	});
 	
 	//搜索表单重置快捷操作