消毒单打印

sp-admin/sa-frame/com/sa-item.vue

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

sp-admin/sa-view/tb-declare/tb-declare-list.html

@@ -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>
 				<!-- ------------- 数据列表 ------------- -->

sp-admin/sa-view/tb-disinfect/print.html

@@ -34,64 +34,64 @@ body{left:0px;top:0px;right:0px;bottom:0px;margin:0px;font-family: Arial, Helvet
 					</tr>
 					<tr height="40">
 						<td style="border:solid #000 1px; width: 25%;hei">收货人名称</td>
-						<td style="border:solid #000 1px;" colspan="3">123</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;">123</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;">123</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;">123</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;">123</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;">123</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">产品学名6</td>
-						<td style="border:solid #000 1px;">123</td>
-						<td style="border:solid #000 1px;" colspan="2" rowspan="4"></td>
+						<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">产品学名7</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;"><div id="arrivePart"></div></td>
 						
 					</tr>
 					<tr height="40">
-						<td style="border:solid #000 1px; width: 25%;hei">产品学名8</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;"><div id="carNameAndNo"></div></td>
 						
 					</tr>
 					<tr height="40">
-						<td style="border:solid #000 1px; width: 25%;hei">产品学名9</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;"><div id="chinaCarNameAndNo"></div></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>
+						<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">产品学名11</td>
-						<td style="border:solid #000 1px;" colspan="3">123</td>
+						<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;">123</td>
-						<td style="border:solid #000 1px;">123</td>
-						<td style="border:solid #000 1px;">123</td>
+						<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;">123</td>
-						<td style="border:solid #000 1px;">123</td>
-						<td style="border:solid #000 1px;">123</td>
+						<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>
 			   
@@ -124,7 +124,25 @@ $(function(){
 		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();
 		}
 	});

sp-admin/sa-view/tb-disinfect/tb-disinfect-add.html

@@ -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>
@@ -44,8 +44,8 @@
 						<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.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>
@@ -102,8 +102,8 @@
 							chinaCarNo: '',		// 中国运输号码 
 							remark: '',		// 备注 
 							applyUnit: '',		// 申请单位 
-							applyPeople: '',		// 申请人 
-							applyPhone: '',		// 申请人联系号码 
+							declarePeople: '',		// 申请人
+							declarePhone: '',		// 申请人联系号码
 							applyTime: '',		// 申请时间 
 							acceptPeople: '',		// 受理人 
 							acceptTime: '',		// 受理时间 

sp-admin/sa-view/tb-disinfect/tb-disinfect-info.html

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

sp-admin/sa-view/tb-disinfect/tb-disinfect-list.html

@@ -26,7 +26,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>
 				<!-- ------------- 数据列表 ------------- -->
@@ -50,8 +50,8 @@
 					<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>
@@ -97,8 +97,8 @@
 						chinaCarNo: '',		// 中国运输号码 
 						remark: '',		// 备注 
 						applyUnit: '',		// 申请单位 
-						applyPeople: '',		// 申请人 
-						applyPhone: '',		// 申请人联系号码 
+						declarePeople: '',		// 申请人
+						declarePhone: '',		// 申请人联系号码
 						applyTime: '',		// 申请时间 
 						acceptPeople: '',		// 受理人 
 						acceptTime: '',		// 受理时间 
@@ -121,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) {
@@ -137,7 +137,7 @@
 					},
 					// 修改
 					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) {

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -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);
     }
 }

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfect.java

@@ -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;
 
 	/**
 	 * 计费（分） 

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

@@ -31,7 +31,6 @@ 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);

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectMapper.xml

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