Przeglądaj źródła

消毒单打印

lzm 3 lat temu
rodzic
commit
5333a8541d

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

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

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

@@ -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'},
 		]
 	},
 ]

+ 137 - 0
sp-admin/sa-view/tb-disinfect/print.html

@@ -0,0 +1,137 @@
+<!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">123</td>
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">品名</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px; width: 25%;hei">产地</td>
+						<td style="border:solid #000 1px;">123</td>
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">数量/重量</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px; width: 25%;hei">规格</td>
+						<td style="border:solid #000 1px;">123</td>
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">包装</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;" colspan="2">标记及号码</td>
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名6</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;" colspan="2" rowspan="4"></td>
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名7</td>
+						<td style="border:solid #000 1px;">123</td>
+						
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名8</td>
+						<td style="border:solid #000 1px;">123</td>
+						
+					</tr>
+					<tr height="40">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名9</td>
+						<td style="border:solid #000 1px;">123</td>
+						
+					</tr>
+					<tr height="80">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名10</td>
+						<td style="border:solid #000 1px;" colspan="3">123</td>
+					</tr>
+					<tr height="80">
+						<td style="border:solid #000 1px; width: 25%;hei">产品学名11</td>
+						<td style="border:solid #000 1px;" colspan="3">123</td>
+					</tr>
+				</table>
+				<table width="100%" style="border-collapse:collapse;border:none;">
+					<tr height="80">
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;">123</td>
+					</tr>
+					<tr height="80">
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;">123</td>
+						<td style="border:solid #000 1px;">123</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) {
+
+			$("#myPrintArea").printArea();
+		}
+	});
+	
+});
+</script>
+
+
+</body>
+</html>

+ 35 - 29
sp-admin/sa-view/tb-disinfect/tb-disinfect-add.html

@@ -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>
@@ -46,10 +46,16 @@
 						<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>
+						<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>
@@ -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) {	// 添加

+ 0 - 1
sp-admin/sa-view/tb-disinfect/tb-disinfect-info.html

@@ -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>

+ 9 - 56
sp-admin/sa-view/tb-disinfect/tb-disinfect-list.html

@@ -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>
@@ -110,6 +58,7 @@
 					<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>
@@ -183,6 +132,10 @@
 						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%');
 					},

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

@@ -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'		// 此项目前台地址 (此配置项非必须)
 	}
 	// 服务器测试环境

+ 0 - 1
sp-server/app.pid

@@ -1 +0,0 @@
-21788

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

@@ -2,6 +2,7 @@ package com.pj.project.tb_disinfect;
 
 import java.util.List;
 
+import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +31,7 @@ public class TbDisinfectController {
 	@SaCheckPermission(TbDisinfect.PERMISSION_CODE)
 	@Transactional(rollbackFor = Exception.class)
 	public AjaxJson add(TbDisinfect t){
+	    t.setRemark("123");
 		tbDisinfectService.add(t);
 		t = tbDisinfectService.getById(SP.publicMapper.getPrimarykey());
 		return AjaxJson.getSuccessData(t);
@@ -47,7 +49,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);
 	}

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

@@ -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: