Startsida Utforska Hjälp
Registrera dig Logga in
qzyReal
/
pco
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

Merge branch 'dev' of http://47.101.143.145:8090/77975466/pco into dev

qzyReal 3 år sedan
förälder
50a0ace88f 59085242af
incheckning
5944547282
15 ändrade filer med 248 tillägg och 128 borttagningar
Delad Vy Visa Diff Statistik
  1. 5 0
      sp-admin/.idea/.gitignore
  2. 2 2
      sp-admin/sa-frame/com/sa-item.vue
  3. 12 12
      sp-admin/sa-frame/menu-list.js
  4. 1 1
      sp-admin/sa-view/tb-declare/tb-declare-list.html
  5. 155 0
      sp-admin/sa-view/tb-disinfect/print.html
  6. 40 34
      sp-admin/sa-view/tb-disinfect/tb-disinfect-add.html
  7. 3 4
      sp-admin/sa-view/tb-disinfect/tb-disinfect-info.html
  8. 15 62
      sp-admin/sa-view/tb-disinfect/tb-disinfect-list.html
  9. 1 1
      sp-admin/static/sa.js
  10. 1 0
      sp-server/app.pid
  11. 2 1
      sp-server/src/main/java/com/pj/api/service/ApiService.java
  12. 2 2
      sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfect.java
  13. 1 1
      sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectController.java
  14. 6 6
      sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectMapper.xml
  15. 2 2
      sp-server/src/main/resources/application-dev.yml

+ 5 - 0
sp-admin/.idea/.gitignore
Visa fil 

@@ -0,0 +1,5 @@
 
+# Default ignored files
 
+/shelf/
 
+/workspace.xml
 
+# Editor-based HTTP Client requests
 
+/httpRequests/

+ 2 - 2
sp-admin/sa-frame/com/sa-item.vue
Visa fil 

@@ -9,12 +9,12 @@
 
 	</div>
 
 	<!-- 普通input -->
 
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'text' || type == 'link'">
 
-		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
+		<label class="c-label">{{name}}：</label> 
 		<el-input type="text" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 
 	</div>
 
 	<!-- 数字input -->
 
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'num'">
 
-		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
+		<label class="c-label">{{name}}：</label> 
 		<el-input type="number" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 
 	</div>
 
 	<!-- 密码input -->

+ 12 - 12
sp-admin/sa-frame/menu-list.js
Visa fil 

@@ -27,15 +27,7 @@ var menuList =	[
 
 			{id: 'tb-costomer-maintain', name: '信息维护', url: 'sa-view/tb-costomer/tb-costomer-maintain.html'},
 
 		]
 
 	},
 
-	{
 
-		id: 'tb-declare',
 
-		name: '申报信息',
 
-		icon: 'el-icon-folder-opened',
 
-		info: '申报表数据的维护',
 
-		childList: [
 
-			{id: 'tb-declare-list', name: '信息列表', url: 'sa-view/tb-declare/tb-declare-list.html'}
 
-		]
 
-	},
 
+
 
 	{
 
 		id: 'tb-business',
 
 		name: '业务录入',
 
@@ -122,13 +114,21 @@ var menuList =	[
 
 		]
 
 	},
 
 	{
 
+		id: 'tb-declare',
 
+		name: '申报信息',
 
+		icon: 'el-icon-folder-opened',
 
+		info: '申报表数据的维护',
 
+		childList: [
 
+			{id: 'tb-declare-list', name: '申报列表', url: 'sa-view/tb-declare/tb-declare-list.html'}
 
+		]
 
+	},
 
+	{
 
 		id: 'tb-disinfect',
 
-		name: '消毒申请单',
 
+		name: '消毒信息',
 
 		icon: 'el-icon-folder-opened',
 
 		info: '消毒申请单表数据的维护',
 
 		childList: [
 
-			{id: 'tb-disinfect-list', name: '消毒申请单-列表', url: 'sa-view/tb-disinfect/tb-disinfect-list.html'},
 
-			{id: 'tb-disinfect-add', name: '消毒申请单-添加', url: 'sa-view/tb-disinfect/tb-disinfect-add.html'},
 
+			{id: 'tb-disinfect-list', name: '申请列表', url: 'sa-view/tb-disinfect/tb-disinfect-list.html'},
 
 		]
 
 	},
 
 ]

+ 1 - 1
sp-admin/sa-view/tb-declare/tb-declare-list.html
Visa fil 

@@ -27,7 +27,7 @@
 
 				</el-form>
 
 				<!-- ------------- 快捷按钮 ------------- -->
 
 				<div class="fast-btn">
 
-					<el-button size="mini" type="primary" @click="add()">新增</el-button>
 
+<!--					<el-button size="mini" type="primary" @click="add()">新增</el-button>-->
 
 					<el-button size="mini" type="info" @click="sa.f5()">刷新</el-button>
 
 				</div>
 
 				<!-- ------------- 数据列表 ------------- -->

+ 155 - 0
sp-admin/sa-view/tb-disinfect/print.html
Visa fil 

@@ -0,0 +1,155 @@
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
+<html xmlns="http://www.w3.org/1999/xhtml">
 
+<head>
 
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+<title>打印申请单</title>
 
+<style type="text/css">
 
+body{left:0px;top:0px;right:0px;bottom:0px;margin:0px;font-family: Arial, Helvetica, sans-serif;font-size: 12px;overflow: hidden;white-space: nowrap;}
 
+
 
+
 
+</style>
 
+<script src="../../static/print/jquery-2.0.3.js" type="text/javascript"></script>
 
+<script src="../../static/print/jquery.jPrintArea.js" type="text/javascript"></script>
 
+
 
+</head>
 
+
 
+<body>
 
+
 
+<div>
 
+
 
+	<input type="button" style="height: 30;" id="print_button" value="打印" />
 
+
 
+	<fieldset align="">
 
+		<legend>打印区</legend>
 
+		<div id="myPrintArea" style="height: 1500;">
 
+			<div align="center"> 
+				<SPAN style="TEXT-DECORATION: underline;font-size:25px">消毒申请单</SPAN>
 
+				<br/><br/>
 
+			</div>
 
+			<div style="text-align:center; font-size:15px;he">
 
+				<table width="100%" style="border-collapse:collapse;border:none;">
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">发货人名称</td>
 
+						<td style="border:solid #000 1px;" colspan="3"><div id="sendPeople"></div></td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">收货人名称</td>
 
+						<td style="border:solid #000 1px;" colspan="3"><div id="receivePeople"></div></td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">品名</td>
 
+						<td style="border:solid #000 1px;"><div id="goodsName"></div></td>
 
+						<td style="border:solid #000 1px; width: 25%;hei">产地</td>
 
+						<td style="border:solid #000 1px;"><div id="origin"></div></td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">数量/重量</td>
 
+						<td style="border:solid #000 1px;"><div id="numAndWeight"></div></td>
 
+						<td style="border:solid #000 1px; width: 25%;hei">规格</td>
 
+						<td style="border:solid #000 1px;"><div id="unit"></div></td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">包装</td>
 
+						<td style="border:solid #000 1px;"><div id="pack"></div></td>
 
+						<td style="border:solid #000 1px;" colspan="2">标记及号码</td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">启动地</td>
 
+						<td style="border:solid #000 1px;"><div id="sourceAddress"></div></td>
 
+						<td style="border:solid #000 1px;" colspan="2" rowspan="4"><div id="flagAndPhone"></div></td>
 
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">到达口岸</td>
 
+						<td style="border:solid #000 1px;"><div id="arrivePart"></div></td>
 
+						
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">运输工具及号码</td>
 
+						<td style="border:solid #000 1px;"><div id="carNameAndNo"></div></td>
 
+						
+					</tr>
 
+					<tr height="40">
 
+						<td style="border:solid #000 1px; width: 25%;hei">国内运输工具及号码</td>
 
+						<td style="border:solid #000 1px;"><div id="chinaCarNameAndNo"></div></td>
 
+						
+					</tr>
 
+					<tr height="80">
 
+						<td style="border:solid #000 1px; width: 25%;hei">预约处理地点及时间</td>
 
+						<td style="border:solid #000 1px;" colspan="3">广西东兴市富民二级交易市场</td>
 
+					</tr>
 
+					<tr height="80">
 
+						<td style="border:solid #000 1px; width: 25%;hei">其他要求及备注</td>
 
+						<td style="border:solid #000 1px;" colspan="3"><div id="remark"></div></td>
 
+					</tr>
 
+				</table>
 
+				<table width="100%" style="border-collapse:collapse;border:none;">
 
+					<tr height="80">
 
+						<td style="border:solid #000 1px;">申请人单位、姓名：<div id="applyUnitAndPeople"></div></td>
 
+						<td style="border:solid #000 1px;">联系方式：<div id="declarePhone"></div></td>
 
+						<td style="border:solid #000 1px;">申请时间：<div id="applyTime"></div></td>
 
+					</tr>
 
+					<tr height="80">
 
+						<td style="border:solid #000 1px;">受理人姓名：<div id="acceptPeople"></div></td>
 
+						<td style="border:solid #000 1px;">受理时间：<div id="acceptTime"></div></td>
 
+						<td style="border:solid #000 1px;">计费：<div id="money"></div></td>
 
+					</tr>
 
+				</table>
 
+			   
+				 
+			</div>
 
+			<div align="right">
 
+				<br/><br/>
 
+				<SPAN style=";font-size:15px">      &nbsp&nbsp&nbsp&nbsp  年  &nbsp&nbsp&nbsp&nbsp 月   &nbsp&nbsp&nbsp&nbsp 日</SPAN>
 
+				
+			</div>
 
+			
+		</div>
 
+	</fieldset>
 
+
 
+</div>
 
+
 
+<script type="text/javascript">
 
+$(function(){
 
+	$("#print_button").click(function(){
 
+		$("#myPrintArea").printArea(); 
+	});
 
+	function getUrlParam(name)
 
+	{
 
+		var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
 
+		var r = window.location.search.substr(1).match(reg);  //匹配目标参数
 
+		if (r!=null) return unescape(r[2]); return null; //返回参数值
 
+	}
 
+	var id = getUrlParam('id');
 
+	$.ajax({
 
+		url: 'http://192.168.3.74:8099/pro/TbDisinfect/getById?id=' + id,
 
+		type: 'post',
 
+		success: function(data) {
 
+			console.log(data);
 
+			$("#sendPeople").html(data.data.sendPeople);
 
+			$("#receivePeople").html(data.data.receivePeople);
 
+			$("#goodsName").html(data.data.goodsName);
 
+			$("#origin").html(data.data.origin);
 
+			$("#numAndWeight").html(data.data.num + "件/" + data.data.grossWeight + "kg");
 
+			$("#unit").html(data.data.unit);
 
+			$("#pack").html(data.data.pack);
 
+			$("#flagAndPhone").html(data.data.flag + ", " + data.data.phone);
 
+			$("#sourceAddress").html(data.data.sourceAddress);
 
+			$("#arrivePart").html(data.data.arrivePart);
 
+			$("#carNameAndNo").html(data.data.carName + ", " + data.data.carNo);
 
+			$("#chinaCarNameAndNo").html(data.data.chinaCarName + ", " + data.data.chinaCarNo);
 
+			$("#remark").html(data.data.remark);
 
+			$("#applyUnitAndPeople").html(data.data.declarePeople + ", " + data.data.declarePhone);
 
+			$("#applyTime").html(data.data.applyTime);
 
+			$("#acceptPeople").html(data.data.acceptPeople);
 
+			$("#acceptTime").html(data.data.acceptTime);
 
+			$("#money").html(data.data.money + "分");
 
+			$("#myPrintArea").printArea();
 
+		}
 
+	});
 
+	
+});
 
+</script>
 
+
 
+
 
+</body>
 
+</html>

+ 40 - 34
sp-admin/sa-view/tb-disinfect/tb-disinfect-add.html
Visa fil 

@@ -14,7 +14,7 @@
 
 		<script src="../../static/kj/layer/layer.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
 		<style type="text/css">
 
-			.c-panel .el-form .c-label{width: 7em !important;}
 
+			.c-panel .el-form .c-label{width: 12em !important;}
 
 			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
 
 		</style>
 
 	</head>
 
@@ -31,8 +31,8 @@
 
 						<sa-item type="text" name="品名" v-model="m.goodsName" br></sa-item>
 
 						<sa-item type="text" name="产地" v-model="m.origin" br></sa-item>
 
 						<sa-item type="num" name="数量" v-model="m.num" br></sa-item>
 
-						<sa-item type="text" name="重量" v-model="m.grossWeight" br></sa-item>
 
-						<sa-item type="text" name="规格" v-model="m.unit" br></sa-item>
 
+						<sa-item type="num" name="重量" v-model="m.grossWeight" br></sa-item>
 
+						<sa-item type="num" name="规格" v-model="m.unit" br></sa-item>
 
 						<sa-item type="text" name="包装" v-model="m.pack" br></sa-item>
 
 						<sa-item type="text" name="标记" v-model="m.flag" br></sa-item>
 
 						<sa-item type="text" name="号码" v-model="m.phone" br></sa-item>
 
@@ -44,12 +44,18 @@
 
 						<sa-item type="text" name="中国运输号码" v-model="m.chinaCarNo" br></sa-item>
 
 						<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
 
 						<sa-item type="text" name="申请单位" v-model="m.applyUnit" br></sa-item>
 
-						<sa-item type="text" name="申请人" v-model="m.applyPeople" br></sa-item>
 
-						<sa-item type="text" name="申请人联系号码" v-model="m.applyPhone" br></sa-item>
 
-						<sa-item type="text" name="申请时间" v-model="m.applyTime" br></sa-item>
 
+						<sa-item type="text" name="申请人" v-model="m.declarePeople" br></sa-item>
 
+						<sa-item type="text" name="申请人联系号码" v-model="m.declarePhone" br></sa-item>
 
+						<div class="c-item br">
 
+							<label class="c-label">申请时间：</label>
 
+							<el-date-picker type="date" value-format="yyyy-MM-dd" v-model="m.applyTime" placeholder="请选择"></el-date-picker>
 
+						</div>
 
 						<sa-item type="text" name="受理人" v-model="m.acceptPeople" br></sa-item>
 
-						<sa-item type="text" name="受理时间" v-model="m.acceptTime" br></sa-item>
 
-						<sa-item type="text" name="计费（分）" v-model="m.money" br></sa-item>
 
+						<div class="c-item br">
 
+							<label class="c-label">受理时间：</label>
 
+							<el-date-picker type="date" value-format="yyyy-MM-dd" v-model="m.acceptTime" placeholder="请选择"></el-date-picker>
 
+						</div>
 
+						<sa-item type="num" name="计费（分）" v-model="m.money" br></sa-item>
 
 						<sa-item name="" class="s-ok" br>
 
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
 						</sa-item>
 
@@ -96,8 +102,8 @@
 
 							chinaCarNo: '',		// 中国运输号码 
 							remark: '',		// 备注 
 							applyUnit: '',		// 申请单位 
-							applyPeople: '',		// 申请人 
-							applyPhone: '',		// 申请人联系号码 
+							declarePeople: '',		// 申请人
 
+							declarePhone: '',		// 申请人联系号码
 
 							applyTime: '',		// 申请时间 
 							acceptPeople: '',		// 受理人 
 							acceptTime: '',		// 受理时间 
@@ -109,30 +115,30 @@
 
 						// 表单校验 
 						let m = this.m;
 
 						// sa.checkNull(m.id, '请输入 [主键]');
 
-						sa.checkNull(m.sendPeople, '请输入 [发货人]');
 
-						sa.checkNull(m.receivePeople, '请输入 [收货人]');
 
-						sa.checkNull(m.goodsName, '请输入 [品名]');
 
-						sa.checkNull(m.origin, '请输入 [产地]');
 
-						sa.checkNull(m.num, '请输入 [数量]');
 
-						sa.checkNull(m.grossWeight, '请输入 [重量]');
 
-						sa.checkNull(m.unit, '请输入 [规格]');
 
-						sa.checkNull(m.pack, '请输入 [包装]');
 
-						sa.checkNull(m.flag, '请输入 [标记]');
 
-						sa.checkNull(m.phone, '请输入 [号码]');
 
-						sa.checkNull(m.sourceAddress, '请输入 [启运地]');
 
-						sa.checkNull(m.arrivePart, '请输入 [到达口岸]');
 
-						sa.checkNull(m.carName, '请输入 [运输工具]');
 
-						sa.checkNull(m.carNo, '请输入 [运输工具号码]');
 
-						sa.checkNull(m.chinaCarName, '请输入 [中国运输工具]');
 
-						sa.checkNull(m.chinaCarNo, '请输入 [中国运输号码]');
 
-						sa.checkNull(m.remark, '请输入 [备注]');
 
-						sa.checkNull(m.applyUnit, '请输入 [申请单位]');
 
-						sa.checkNull(m.applyPeople, '请输入 [申请人]');
 
-						sa.checkNull(m.applyPhone, '请输入 [申请人联系号码]');
 
-						sa.checkNull(m.applyTime, '请输入 [申请时间]');
 
-						sa.checkNull(m.acceptPeople, '请输入 [受理人]');
 
-						sa.checkNull(m.acceptTime, '请输入 [受理时间]');
 
-						sa.checkNull(m.money, '请输入 [计费（分）]');
 
+						// sa.checkNull(m.sendPeople, '请输入 [发货人]');
 
+						// sa.checkNull(m.receivePeople, '请输入 [收货人]');
 
+						// sa.checkNull(m.goodsName, '请输入 [品名]');
 
+						// sa.checkNull(m.origin, '请输入 [产地]');
 
+						// sa.checkNull(m.num, '请输入 [数量]');
 
+						// sa.checkNull(m.grossWeight, '请输入 [重量]');
 
+						// sa.checkNull(m.unit, '请输入 [规格]');
 
+						// sa.checkNull(m.pack, '请输入 [包装]');
 
+						// sa.checkNull(m.flag, '请输入 [标记]');
 
+						// sa.checkNull(m.phone, '请输入 [号码]');
 
+						// sa.checkNull(m.sourceAddress, '请输入 [启运地]');
 
+						// sa.checkNull(m.arrivePart, '请输入 [到达口岸]');
 
+						// sa.checkNull(m.carName, '请输入 [运输工具]');
 
+						// sa.checkNull(m.carNo, '请输入 [运输工具号码]');
 
+						// sa.checkNull(m.chinaCarName, '请输入 [中国运输工具]');
 
+						// sa.checkNull(m.chinaCarNo, '请输入 [中国运输号码]');
 
+						// sa.checkNull(m.remark, '请输入 [备注]');
 
+						// sa.checkNull(m.applyUnit, '请输入 [申请单位]');
 
+						// sa.checkNull(m.applyPeople, '请输入 [申请人]');
 
+						// sa.checkNull(m.applyPhone, '请输入 [申请人联系号码]');
 
+						// sa.checkNull(m.applyTime, '请输入 [申请时间]');
 
+						// sa.checkNull(m.acceptPeople, '请输入 [受理人]');
 
+						// sa.checkNull(m.acceptTime, '请输入 [受理时间]');
 
+						// sa.checkNull(m.money, '请输入 [计费（分）]');
 
 				
 						// 开始增加或修改
 
 						if(this.id <= 0) {	// 添加

+ 3 - 4
sp-admin/sa-view/tb-disinfect/tb-disinfect-info.html
Visa fil 

@@ -14,7 +14,7 @@
 
 		<script src="../../static/kj/layer/layer.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
 		<style type="text/css">
 
-			.c-panel .c-label{width: 8em;}
 
+			.c-panel .c-label{width: 10em;}
 
 		</style>
 
 	</head>
 
 	<body>
 
@@ -23,7 +23,6 @@
 
 			<div class="s-body">
 
 				<div class="c-panel">
 
 					<el-form v-if="m">
 
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 
 						<sa-info name="发货人" br>{{m.sendPeople}}</sa-info>
 
 						<sa-info name="收货人" br>{{m.receivePeople}}</sa-info>
 
 						<sa-info name="品名" br>{{m.goodsName}}</sa-info>
 
@@ -42,8 +41,8 @@
 
 						<sa-info name="中国运输号码" br>{{m.chinaCarNo}}</sa-info>
 
 						<sa-info name="备注" br>{{m.remark}}</sa-info>
 
 						<sa-info name="申请单位" br>{{m.applyUnit}}</sa-info>
 
-						<sa-info name="申请人" br>{{m.applyPeople}}</sa-info>
 
-						<sa-info name="申请人联系号码" br>{{m.applyPhone}}</sa-info>
 
+						<sa-info name="申请人" br>{{m.declarePeople}}</sa-info>
 
+						<sa-info name="申请人联系号码" br>{{m.declarePhone}}</sa-info>
 
 						<sa-info name="申请时间" br>{{m.applyTime}}</sa-info>
 
 						<sa-info name="受理人" br>{{m.acceptPeople}}</sa-info>
 
 						<sa-info name="受理时间" br>{{m.acceptTime}}</sa-info>

+ 15 - 62
sp-admin/sa-view/tb-disinfect/tb-disinfect-list.html
Visa fil 

@@ -20,70 +20,18 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 
-					<sa-item type="text" name="发货人" v-model="p.sendPeople"></sa-item>
 
-					<sa-item type="text" name="收货人" v-model="p.receivePeople"></sa-item>
 
-					<sa-item type="text" name="品名" v-model="p.goodsName"></sa-item>
 
-					<sa-item type="text" name="产地" v-model="p.origin"></sa-item>
 
-					<sa-item type="num" name="数量" v-model="p.num"></sa-item>
 
-					<sa-item type="text" name="重量" v-model="p.grossWeight"></sa-item>
 
-					<sa-item type="text" name="规格" v-model="p.unit"></sa-item>
 
-					<sa-item type="text" name="包装" v-model="p.pack"></sa-item>
 
-					<sa-item type="text" name="标记" v-model="p.flag"></sa-item>
 
-					<sa-item type="text" name="号码" v-model="p.phone"></sa-item>
 
-					<sa-item type="text" name="启运地" v-model="p.sourceAddress"></sa-item>
 
-					<sa-item type="text" name="到达口岸" v-model="p.arrivePart"></sa-item>
 
-					<sa-item type="text" name="运输工具" v-model="p.carName"></sa-item>
 
-					<sa-item type="text" name="运输工具号码" v-model="p.carNo"></sa-item>
 
-					<sa-item type="text" name="中国运输工具" v-model="p.chinaCarName"></sa-item>
 
-					<sa-item type="text" name="中国运输号码" v-model="p.chinaCarNo"></sa-item>
 
-					<sa-item type="text" name="备注" v-model="p.remark"></sa-item>
 
-					<sa-item type="text" name="申请单位" v-model="p.applyUnit"></sa-item>
 
-					<sa-item type="text" name="申请人" v-model="p.applyPeople"></sa-item>
 
 					<sa-item type="text" name="申请人联系号码" v-model="p.applyPhone"></sa-item>
 
-					<sa-item type="text" name="申请时间" v-model="p.applyTime"></sa-item>
 
-					<sa-item type="text" name="受理人" v-model="p.acceptPeople"></sa-item>
 
-					<sa-item type="text" name="受理时间" v-model="p.acceptTime"></sa-item>
 
-					<sa-item type="text" name="计费（分）" v-model="p.money"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<br />
 
-					<sa-item name="综合排序">
 
-						<el-radio-group v-model="p.sortType" class="s-radio-text">
 
-							<el-radio :label="0">默认</el-radio>
 
-							<el-radio :label="1">主键</el-radio>
 
-							<el-radio :label="2">发货人</el-radio>
 
-							<el-radio :label="3">收货人</el-radio>
 
-							<el-radio :label="4">品名</el-radio>
 
-							<el-radio :label="5">产地</el-radio>
 
-							<el-radio :label="6">数量</el-radio>
 
-							<el-radio :label="7">重量</el-radio>
 
-							<el-radio :label="8">规格</el-radio>
 
-							<el-radio :label="9">包装</el-radio>
 
-							<el-radio :label="10">标记</el-radio>
 
-							<el-radio :label="11">号码</el-radio>
 
-							<el-radio :label="12">启运地</el-radio>
 
-							<el-radio :label="13">到达口岸</el-radio>
 
-							<el-radio :label="14">运输工具</el-radio>
 
-							<el-radio :label="15">运输工具号码</el-radio>
 
-							<el-radio :label="16">中国运输工具</el-radio>
 
-							<el-radio :label="17">中国运输号码</el-radio>
 
-							<el-radio :label="18">备注</el-radio>
 
-							<el-radio :label="19">申请单位</el-radio>
 
-							<el-radio :label="20">申请人</el-radio>
 
-							<el-radio :label="21">申请人联系号码</el-radio>
 
-							<el-radio :label="22">申请时间</el-radio>
 
-							<el-radio :label="23">受理人</el-radio>
 
-							<el-radio :label="24">受理时间</el-radio>
 
-							<el-radio :label="25">计费（分）</el-radio>
 
-						</el-radio-group>
 
-					</sa-item>
 
 				</el-form>
 
 				<!-- ------------- 快捷按钮 ------------- -->
 
-				<sa-item type="fast-btn" show="add,get,delete,export,reset"></sa-item>
 
+				<div class="fast-btn">
 
+<!--					<el-button size="mini" type="primary" @click="add()">新增</el-button>-->
 
+					<el-button size="mini" type="info" @click="sa.f5()">刷新</el-button>
 
+				</div>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="selection"></sa-td>
 
-					<sa-td name="主键" prop="id" type="num"></sa-td>
 
 					<sa-td name="发货人" prop="sendPeople" ></sa-td>
 
 					<sa-td name="收货人" prop="receivePeople" ></sa-td>
 
 					<sa-td name="品名" prop="goodsName" ></sa-td>
 
@@ -102,14 +50,15 @@
 
 					<sa-td name="中国运输号码" prop="chinaCarNo" ></sa-td>
 
 					<sa-td name="备注" prop="remark" ></sa-td>
 
 					<sa-td name="申请单位" prop="applyUnit" ></sa-td>
 
-					<sa-td name="申请人" prop="applyPeople" ></sa-td>
 
-					<sa-td name="申请人联系号码" prop="applyPhone" ></sa-td>
 
+					<sa-td name="申请人" prop="declarePeople" ></sa-td>
 
+					<sa-td name="申请人联系号码" prop="declarePhone" ></sa-td>
 
 					<sa-td name="申请时间" prop="applyTime" ></sa-td>
 
 					<sa-td name="受理人" prop="acceptPeople" ></sa-td>
 
 					<sa-td name="受理时间" prop="acceptTime" ></sa-td>
 
 					<sa-td name="计费（分）" prop="money" ></sa-td>
 
 					<el-table-column label="操作" fixed="right"  width="240px">
 
 						<template slot-scope="s">
 
+							<el-button class="c-btn" type="success" icon="el-icon" @click="print(s.row)">打印</el-button>
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
 							<el-button class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
@@ -148,8 +97,8 @@
 
 						chinaCarNo: '',		// 中国运输号码 
 						remark: '',		// 备注 
 						applyUnit: '',		// 申请单位 
-						applyPeople: '',		// 申请人 
-						applyPhone: '',		// 申请人联系号码 
+						declarePeople: '',		// 申请人
 
+						declarePhone: '',		// 申请人联系号码
 
 						applyTime: '',		// 申请时间 
 						acceptPeople: '',		// 受理人 
 						acceptTime: '',		// 受理时间 
@@ -172,7 +121,7 @@
 
 					},
 
 					// 查看
 
 					get: function(data) {
 
-						sa.showIframe('数据详情', 'tb-disinfect-info.html?id=' + data.id, '1050px', '90%');
 
+						sa.showIframe('数据详情', 'tb-disinfect-info.html?id=' + data.id, '600px', '90%');
 
 					},
 
 					// 查看 - 根据选中的
 
 					getBySelect: function(data) {
 
@@ -183,8 +132,12 @@
 
 						this.get(selection[0]);
 
 					},
 
 					// 修改
 
+					print: function(data) {
 
+						sa.showIframe('消毒申请单打印', 'print.html?id=' + data.id, '1000px', '100%');
 
+					},
 
+					// 修改
 
 					update: function(data) {
 
-						sa.showIframe('修改数据', 'tb-disinfect-add.html?id=' + data.id, '1000px', '90%');
 
+						sa.showIframe('修改数据', 'tb-disinfect-add.html?id=' + data.id, '600px', '90%');
 
 					},
 
 					// 新增
 
 					add: function(data) {

+ 1 - 1
sp-admin/static/sa.js
Visa fil 

@@ -9,7 +9,7 @@ var sa = {
 
 (function(){
 
 	// 公司开发环境
 
 	var cfg_dev = {
 
-		api_url: 'http://192.168.3.77:8099/pro',	// 所有ajax请求接口父地址
 
+		api_url: 'http://192.168.3.74:8099/pro',	// 所有ajax请求接口父地址
 
 		web_url: 'http://www.baidu.com'		// 此项目前台地址 (此配置项非必须)
 
 	}
 
 	// 服务器测试环境

+ 1 - 0
sp-server/app.pid
Visa fil 

@@ -1 +1,2 @@
 
+
 
 18980

+ 2 - 1
sp-server/src/main/java/com/pj/api/service/ApiService.java
Visa fil 

@@ -1,6 +1,7 @@
 
 package com.pj.api.service;
 
 
 import cn.hutool.core.bean.BeanUtil;
 
+import cn.hutool.core.date.DateUtil;
 
 import cn.hutool.core.util.RandomUtil;
 
 import cn.hutool.core.util.StrUtil;
 
 import com.pj.api.bo.InOutRecordBO;
 
@@ -132,7 +133,7 @@ public class ApiService {
 
 
     public void addDisinfect(TbDisinfect tbDisinfect) {
 
         String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
 
-        tbDisinfect.setCode(nowStr+RandomUtil.randomNumbers(6)).setApplyTime(new Date());
 
+        tbDisinfect.setCode(nowStr+RandomUtil.randomNumbers(6)).setApplyTime(DateUtil.today());
 
         tbDisinfectService.save(tbDisinfect);
 
     }
 
 }

+ 2 - 2
sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfect.java
Visa fil 

@@ -146,7 +146,7 @@ public class TbDisinfect extends Model<TbDisinfect> implements Serializable {
 
 	/**
 
 	 * 申请时间 
 	 */
 
-	private Date applyTime;
 
+	private String applyTime;
 
 
 	/**
 
 	 * 受理人 
@@ -156,7 +156,7 @@ public class TbDisinfect extends Model<TbDisinfect> implements Serializable {
 
 	/**
 
 	 * 受理时间 
 	 */
 
-	private Date acceptTime;
 
+	private String acceptTime;
 
 
 	/**
 
 	 * 计费（分）

+ 1 - 1
sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectController.java
Visa fil 

@@ -48,7 +48,7 @@ public class TbDisinfectController {
 
 	@RequestMapping("deleteByIds")
 
 	@SaCheckPermission(TbDisinfect.PERMISSION_CODE)
 
 	public AjaxJson deleteByIds(){
 
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 
 		int line = SP.publicMapper.deleteByIds(TbDisinfect.TABLE_NAME, ids);
 
 		return AjaxJson.getByLine(line);
 
 	}

+ 6 - 6
sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectMapper.xml
Visa fil 

@@ -28,8 +28,8 @@
 
 		<result property="chinaCarNo" column="china_car_no" />
 
 		<result property="remark" column="remark" />
 
 		<result property="applyUnit" column="apply_unit" />
 
-		<result property="declarePeople" column="apply_people" />
 
-		<result property="declarePhone" column="apply_phone" />
 
+		<result property="declarePeople" column="declare_people" />
 
+		<result property="declarePhone" column="declare_phone" />
 
 		<result property="applyTime" column="apply_time" />
 
 		<result property="acceptPeople" column="accept_people" />
 
 		<result property="acceptTime" column="accept_time" />
 
@@ -65,8 +65,8 @@
 
 			<if test=' this.has("chinaCarNo") '> and china_car_no = #{chinaCarNo} </if>
 
 			<if test=' this.has("remark") '> and remark = #{remark} </if>
 
 			<if test=' this.has("applyUnit") '> and apply_unit = #{applyUnit} </if>
 
-			<if test=' this.has("applyPeople") '> and apply_people = #{applyPeople} </if>
 
-			<if test=' this.has("applyPhone") '> and apply_phone = #{applyPhone} </if>
 
+			<if test=' this.has("declarePeople") '> and declare_people = #{declarePeople} </if>
 
+			<if test=' this.has("declarePhone") '> and declare_phone = #{declarePhone} </if>
 
 			<if test=' this.has("applyTime") '> and apply_time = #{applyTime} </if>
 
 			<if test=' this.has("acceptPeople") '> and accept_people = #{acceptPeople} </if>
 
 			<if test=' this.has("acceptTime") '> and accept_time = #{acceptTime} </if>
 
@@ -93,8 +93,8 @@
 
 			<when test='sortType == 17'> china_car_no desc </when>
 
 			<when test='sortType == 18'> remark desc </when>
 
 			<when test='sortType == 19'> apply_unit desc </when>
 
-			<when test='sortType == 20'> apply_people desc </when>
 
-			<when test='sortType == 21'> apply_phone desc </when>
 
+			<when test='sortType == 20'> declare_people desc </when>
 
+			<when test='sortType == 21'> declare_phone desc </when>
 
 			<when test='sortType == 22'> apply_time desc </when>
 
 			<when test='sortType == 23'> accept_people desc </when>
 
 			<when test='sortType == 24'> accept_time desc </when>

+ 2 - 2
sp-server/src/main/resources/application-dev.yml
Visa fil 

@@ -6,9 +6,9 @@ spring:
 
     # 数据源配置
 
     datasource:
 
         type: com.alibaba.druid.pool.DruidDataSource
 
-        url: jdbc:mysql://127.0.0.1:3306/pco_system?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
 
+        url: jdbc:mysql://127.0.0.1:3307/pco_system?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
 
         username: root
 
-        password: 123456
 
+        password: 1234
 
         # 是否打开sql监控台  (生产环境请务必关闭此选项)
 
         druid:
 
             stat-view-servlet: