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

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

@@ -27,7 +27,7 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<sa-item type="text" name="产品学名" v-model="m.goodsName" br></sa-item>
-						<sa-item type="num" name="毛重(kg)" v-model="m.grossWeight" br></sa-item>
+						<sa-item type="num" name="毛重(吨)" v-model="m.grossWeight" br></sa-item>
 						<sa-item type="num" name="数量(件)" v-model="m.num" br></sa-item>
 <!--						<sa-item type="text" name="生产日期" v-model="m.productionDate" br></sa-item>-->
 						<div class="c-item br">
@@ -44,9 +44,10 @@
 						<sa-item type="text" name="货物流向" v-model="m.route" br></sa-item>
 						<sa-item type="text" name="司机姓名" v-model="m.driverName" br></sa-item>
 						<sa-item type="text" name="司机电话" v-model="m.driverPhone" br></sa-item>
-						<sa-item type="text" name="代理商" v-model="m.agent" br></sa-item>
-						<sa-item type="text" name="代理人电话" v-model="m.agentPhone" br></sa-item>
-						<sa-item type="text" name="运输车车牌" v-model="m.chinaCarNo" br></sa-item>
+<!--						<sa-item type="text" name="代理商" v-model="m.agent" br></sa-item>-->
+						<sa-item type="text" name="代理商电话" v-model="m.agentPhone" br></sa-item>
+						<sa-item type="text" name="运输车(车头牌)" v-model="m.chinaCarNo" placeholder="运输车车头牌,多个请用逗号隔开" br></sa-item>
+						<sa-item type="text" name="运输车(车尾牌)" v-model="m.chinaCarSuff" placeholder="运输车车尾牌,多个请用逗号隔开" br></sa-item>
 						<sa-item type="text" name="越南车车牌" v-model="m.carNo" br></sa-item>
 						<sa-item type="text" name="海关报关单据" v-model="m.customProof" br></sa-item>
 						<sa-item type="text" name="进口检验检疫证书" v-model="m.quarantineProof" br></sa-item>
@@ -81,7 +82,7 @@
 					createModel: function() {
 						return {
 							id: '',		// 主键 
-							businessId: '',		// 业务id 
+							businessId: '',		// 业务id
 							goodsName: '',		// 产品学名 
 							grossWeight: '',		// 毛重 
 							num: '',		// 件数 
@@ -98,7 +99,8 @@
 							driverPhone: '',		// 联系电话(司机) 
 							agent: '',		// 代理商 
 							agentPhone: '',		// 联系电话(代理人) 
-							chinaCarNo: '',		// 运输车车牌 
+							chinaCarNo: '',		// 运输车车牌
+							chinaCarSuff: '',
 							carNo: '',		// 越南车车牌 
 							customProof: '',		// 海关报关单据 
 							quarantineProof: '',		// 进口检验检疫证书 
@@ -113,32 +115,33 @@
 						let m = this.m;
 						sa.checkNull(m.goodsName, '请输入 [产品学名]');
 						sa.checkNull(m.grossWeight, '请输入 [毛重]');
-						// sa.checkNull(m.num, '请输入 [件数]');
-						// sa.checkNull(m.productionDate, '请输入 [生产日期]');
-						// sa.checkNull(m.expirationDate, '请输入 [保质期]');
-						// sa.checkNull(m.storageMode, '请输入 [储存条件]');
-						// sa.checkNull(m.productionMode, '请输入 [生产方式]');
-						// sa.checkNull(m.origin, '请输入 [原产国]');
-						// sa.checkNull(m.producerCode, '请输入 [进口冷链食品生产商注册号]');
-						// sa.checkNull(m.sendUnit, '请输入 [货主单位]');
-						// sa.checkNull(m.receiveUnit, '请输入 [收货单位]');
-						// sa.checkNull(m.route, '请输入 [货物流向]');
-						// sa.checkNull(m.driverName, '请输入 [司机姓名]');
-						// sa.checkNull(m.driverPhone, '请输入 [司机联系电话]');
+						sa.checkNull(m.num, '请输入 [数量]');
+						sa.checkNull(m.productionDate, '请输入 [生产日期]');
+						sa.checkNull(m.expirationDate, '请输入 [保质期]');
+						sa.checkNull(m.storageMode, '请输入 [储存条件]');
+						sa.checkNull(m.productionMode, '请输入 [生产方式]');
+						sa.checkNull(m.origin, '请输入 [原产国]');
+						sa.checkNull(m.producerCode, '请输入 [进口冷链食品生产商注册号]');
+						sa.checkNull(m.sendUnit, '请输入 [货主单位]');
+						sa.checkNull(m.receiveUnit, '请输入 [收货单位]');
+						sa.checkNull(m.route, '请输入 [货物流向]');
+						sa.checkNull(m.driverName, '请输入 [司机姓名]');
+						sa.checkNull(m.driverPhone, '请输入 [司机联系电话]');
 						// sa.checkNull(m.agent, '请输入 [代理商]');
-						// sa.checkNull(m.agentPhone, '请输入 [代理人联系电话]');
+						sa.checkNull(m.agentPhone, '请输入 [代理商联系电话]');
 						if (!sa.isPhone(m.agentPhone)) {
-							sa.error('商家代理人联系号码不正确')
+							sa.error('代理商联系电话不正确')
 							return;
 						}
-						sa.checkNull(m.chinaCarNo, '请输入 [运输车车牌]');
+						sa.checkNull(m.chinaCarNo, '请输入 [运输车车头牌]');
+						sa.checkNull(m.chinaCarSuff, '请输入 [运输车车尾牌]');
 						sa.checkNull(m.carNo, '请输入 [越南车车牌]');
-						// sa.checkNull(m.customProof, '请输入 [海关报关单据]');
-						// sa.checkNull(m.quarantineProof, '请输入 [进口检验检疫证书]');
+						sa.checkNull(m.customProof, '请输入 [海关报关单据]');
+						sa.checkNull(m.quarantineProof, '请输入 [进口检验检疫证书]');
 						// sa.checkNull(m.shop, '请输入 [商铺]');
 						// sa.checkNull(m.productionCode, '请输入 [生产批号]');
 						// sa.checkNull(m.containerCode, '请输入 [柜号]');
-				
+
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加
 							sa.ajax('/TbDeclare/add', m, function(res){

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

@@ -23,30 +23,39 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="产品学名" br>{{m.goodsName}}</sa-info>
-						<sa-info name="毛重(kg)" br>{{m.grossWeight}}</sa-info>
-						<sa-info name="数量(件)" br>{{m.num}}</sa-info>
-						<sa-info name="生产日期" br>{{m.productionDate}}</sa-info>
-						<sa-info name="保质期(天)" br>{{m.expirationDate}}</sa-info>
-						<sa-info name="储存条件" br>{{m.storageMode}}</sa-info>
-						<sa-info name="生产方式" br>{{m.productionMode}}</sa-info>
-						<sa-info name="原产国" br>{{m.origin}}</sa-info>
-						<sa-info name="进口冷链食品生产商注册号" br>{{m.producerCode}}</sa-info>
-						<sa-info name="货主单位" br>{{m.sendUnit}}</sa-info>
-						<sa-info name="收货单位" br>{{m.receiveUnit}}</sa-info>
-						<sa-info name="货物流向" br>{{m.route}}</sa-info>
-						<sa-info name="司机姓名" br>{{m.driverName}}</sa-info>
-						<sa-info name="司机联系电话" br>{{m.driverPhone}}</sa-info>
-						<sa-info name="代理商" br>{{m.agent}}</sa-info>
-						<sa-info name="代理人联系电话" br>{{m.agentPhone}}</sa-info>
-						<sa-info name="运输车车牌" br>{{m.chinaCarNo}}</sa-info>
-						<sa-info name="越南车车牌" br>{{m.carNo}}</sa-info>
-						<sa-info name="海关报关单据" br>{{m.customProof}}</sa-info>
-						<sa-info name="进口检验检疫证书" br>{{m.quarantineProof}}</sa-info>
-						<sa-info name="商铺" br>{{m.shop}}</sa-info>
-						<sa-info name="生产批号" br>{{m.productionCode}}</sa-info>
-						<sa-info name="柜号" br>{{m.containerCode}}</sa-info>
-						<sa-info name="申报时间" br>{{m.createTime}}</sa-info>
+						<el-row>
+							<el-col span="12">
+								<sa-info name="产品学名" br>{{m.goodsName}}</sa-info>
+								<sa-info name="毛重(吨)" br>{{m.grossWeight}}</sa-info>
+								<sa-info name="数量(件)" br>{{m.num}}</sa-info>
+								<sa-info name="生产日期" br>{{m.productionDate}}</sa-info>
+								<sa-info name="保质期(天)" br>{{m.expirationDate}}</sa-info>
+								<sa-info name="储存条件" br>{{m.storageMode}}</sa-info>
+								<sa-info name="生产方式" br>{{m.productionMode}}</sa-info>
+								<sa-info name="原产国" br>{{m.origin}}</sa-info>
+								<sa-info name="进口冷链食品生产商注册号" br>{{m.producerCode}}</sa-info>
+								<sa-info name="货主单位" br>{{m.sendUnit}}</sa-info>
+								<sa-info name="收货单位" br>{{m.receiveUnit}}</sa-info>
+								<sa-info name="货物流向" br>{{m.route}}</sa-info>
+							</el-col>
+							<el-col span="12">
+								<sa-info name="司机姓名" br>{{m.driverName}}</sa-info>
+								<sa-info name="司机联系电话" br>{{m.driverPhone}}</sa-info>
+<!--								<sa-info name="代理商" br>{{m.agent}}</sa-info>-->
+								<sa-info name="代理人联系电话" br>{{m.agentPhone}}</sa-info>
+								<sa-info name="运输车(车头牌)" br>{{m.chinaCarNo}}</sa-info>
+								<sa-info name="运输车(车尾牌)" br>{{m.chinaCarSuff}}</sa-info>
+								<sa-info name="越南车车牌" br>{{m.carNo}}</sa-info>
+								<sa-info name="海关报关单据" br>{{m.customProof}}</sa-info>
+								<sa-info name="进口检验检疫证书" br>{{m.quarantineProof}}</sa-info>
+								<sa-info name="商铺" br>{{m.shop}}</sa-info>
+								<sa-info name="生产批号" br>{{m.productionCode}}</sa-info>
+								<sa-info name="柜号" br>{{m.containerCode}}</sa-info>
+								<sa-info name="申报时间" br>{{m.createTime}}</sa-info>
+							</el-col>
+						</el-row>
+
+
 					</el-form>
 				</div>
 			</div>

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

@@ -25,6 +25,7 @@
 					<br />
 					</sa-item>
 				</el-form>
+				<br />
 				<!-- ------------- 快捷按钮 ------------- -->
 				<div class="fast-btn">
 <!--					<el-button size="mini" type="primary" @click="add()">新增</el-button>-->
@@ -34,30 +35,30 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<sa-td name="产品学名" prop="goodsName" ></sa-td>
-					<sa-td name="毛重(kg)" prop="grossWeight" type="num"  ></sa-td>
+					<sa-td name="毛重(吨)" prop="grossWeight" type="num"  ></sa-td>
 					<sa-td name="数量(件)" prop="num" type="num" ></sa-td>
-					<sa-td name="生产日期" prop="productionDate" ></sa-td>
-					<sa-td name="保质期(天)" prop="expirationDate" type="num" ></sa-td>
-					<sa-td name="储存条件" prop="storageMode" ></sa-td>
-					<sa-td name="生产方式" prop="productionMode" ></sa-td>
-					<sa-td name="原产国" prop="origin" ></sa-td>
-					<sa-td name="进口冷链食品生产商注册号" prop="producerCode" ></sa-td>
+<!--					<sa-td name="生产日期" prop="productionDate" ></sa-td>-->
+<!--					<sa-td name="保质期(天)" prop="expirationDate" type="num" ></sa-td>-->
+<!--					<sa-td name="储存条件" prop="storageMode" ></sa-td>-->
+<!--					<sa-td name="生产方式" prop="productionMode" ></sa-td>-->
+<!--					<sa-td name="原产国" prop="origin" ></sa-td>-->
+<!--					<sa-td name="进口冷链食品生产商注册号" prop="producerCode" ></sa-td>-->
 					<sa-td name="货主单位" prop="sendUnit" ></sa-td>
 					<sa-td name="收货单位" prop="receiveUnit" ></sa-td>
 					<sa-td name="货物流向" prop="route" ></sa-td>
 					<sa-td name="司机姓名" prop="driverName" ></sa-td>
-					<sa-td name="联系电话" prop="driverPhone" ></sa-td>
-					<sa-td name="代理商" prop="agent" ></sa-td>
-					<sa-td name="联系电话" prop="agentPhone" ></sa-td>
+					<sa-td name="司机联系电话" prop="driverPhone" ></sa-td>
+<!--					<sa-td name="代理商" prop="agent" ></sa-td>-->
+					<sa-td name="代理商联系电话" prop="agentPhone" ></sa-td>
 					<sa-td name="运输车车牌" prop="chinaCarNo" ></sa-td>
 					<sa-td name="越南车车牌" prop="carNo" ></sa-td>
-					<sa-td name="海关报关单据" prop="customProof" ></sa-td>
-					<sa-td name="进口检验检疫证书" prop="quarantineProof" ></sa-td>
-					<sa-td name="商铺" prop="shop" ></sa-td>
-					<sa-td name="生产批号" prop="productionCode" ></sa-td>
-					<sa-td name="柜号" prop="containerCode" ></sa-td>
-					<sa-td name="申报时间" prop="createTime" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+<!--					<sa-td name="海关报关单据" prop="customProof" ></sa-td>-->
+<!--					<sa-td name="进口检验检疫证书" prop="quarantineProof" ></sa-td>-->
+<!--					<sa-td name="商铺" prop="shop" ></sa-td>-->
+<!--					<sa-td name="生产批号" prop="productionCode" ></sa-td>-->
+<!--					<sa-td name="柜号" prop="containerCode" ></sa-td>-->
+					<sa-td name="申报时间" prop="createTime" width="100px" ></sa-td>
+					<el-table-column label="操作" width="320px">
 						<template slot-scope="s">
 							<el-button v-if="sa.isAuth('tb-declare-print')" 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>
@@ -122,7 +123,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-declare-info.html?id=' + data.id, '600px', '90%');
+						sa.showIframe('数据详情', 'tb-declare-info.html?id=' + data.id, '900px', '90%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

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="num" name="重量" v-model="m.grossWeight" br></sa-item>
-						<sa-item type="num" 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>
@@ -40,8 +40,8 @@
 						<sa-item type="text" name="到达口岸" v-model="m.arrivePart" br></sa-item>
 						<sa-item type="text" name="运输工具" v-model="m.carName" br></sa-item>
 						<sa-item type="text" name="运输工具号码" v-model="m.carNo" br></sa-item>
-						<sa-item type="text" name="中国运输工具" v-model="m.chinaCarName" br></sa-item>
-						<sa-item type="text" name="中国运输号码" v-model="m.chinaCarNo" br></sa-item>
+						<sa-item type="text" name="国内运输工具" v-model="m.chinaCarName" br></sa-item>
+						<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.declarePeople" br></sa-item>
@@ -115,31 +115,31 @@
 						// 表单校验 
 						let m = this.m;
 						// sa.checkNull(m.id, '请输入 [主键]');
-						// sa.checkNull(m.sendPeople, '请输入 [发货人]');
-						// sa.checkNull(m.receivePeople, '请输入 [收货人]');
+						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.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.chinaCarName, '请输入 [国内运输工具]');
+						sa.checkNull(m.chinaCarNo, '请输入 [国内运输工具号码]');
 						// sa.checkNull(m.remark, '请输入 [备注]');
-						// sa.checkNull(m.applyUnit, '请输入 [申请单位]');
-						// sa.checkNull(m.applyPeople, '请输入 [申请人]');
-						// sa.checkNull(m.declarePhone, '请输入 [申请人联系号码]');
+						sa.checkNull(m.applyUnit, '请输入 [申请单位]');
+						sa.checkNull(m.declarePeople, '请输入 [申请人]');
+						sa.checkNull(m.declarePhone, '请输入 [申请人联系号码]');
 						if (!sa.isPhone(m.declarePhone)) {
 							sa.error('申请人联系号码不正确')
 							return;
 						}
-						// sa.checkNull(m.applyTime, '请输入 [申请时间]');
+						sa.checkNull(m.applyTime, '请输入 [申请时间]');
 						// sa.checkNull(m.acceptPeople, '请输入 [受理人]');
 						// sa.checkNull(m.acceptTime, '请输入 [受理时间]');
 						// sa.checkNull(m.money, '请输入 [计费（分）]');

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

@@ -23,30 +23,38 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="发货人" br>{{m.sendPeople}}</sa-info>
-						<sa-info name="收货人" br>{{m.receivePeople}}</sa-info>
-						<sa-info name="品名" br>{{m.goodsName}}</sa-info>
-						<sa-info name="产地" br>{{m.origin}}</sa-info>
-						<sa-info type="num" name="数量" :value="m.num" br></sa-info>
-						<sa-info name="重量" br>{{m.grossWeight}}</sa-info>
-						<sa-info name="规格" br>{{m.unit}}</sa-info>
-						<sa-info name="包装" br>{{m.pack}}</sa-info>
-						<sa-info name="标记" br>{{m.flag}}</sa-info>
-						<sa-info name="号码" br>{{m.phone}}</sa-info>
-						<sa-info name="启运地" br>{{m.sourceAddress}}</sa-info>
-						<sa-info name="到达口岸" br>{{m.arrivePart}}</sa-info>
-						<sa-info name="运输工具" br>{{m.carName}}</sa-info>
-						<sa-info name="运输工具号码" br>{{m.carNo}}</sa-info>
-						<sa-info name="中国运输工具" br>{{m.chinaCarName}}</sa-info>
-						<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.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>
-						<sa-info name="计费（分）" br>{{m.money}}</sa-info>
+						<el-row>
+							<el-col span="12">
+								<sa-info name="发货人" br>{{m.sendPeople}}</sa-info>
+								<sa-info name="收货人" br>{{m.receivePeople}}</sa-info>
+								<sa-info name="品名" br>{{m.goodsName}}</sa-info>
+								<sa-info name="产地" br>{{m.origin}}</sa-info>
+								<sa-info type="num" name="数量" :value="m.num" br></sa-info>
+								<sa-info name="重量(吨)" br>{{m.grossWeight}}</sa-info>
+								<sa-info name="规格(米)" br>{{m.unit}}</sa-info>
+								<sa-info name="包装" br>{{m.pack}}</sa-info>
+								<sa-info name="标记" br>{{m.flag}}</sa-info>
+								<sa-info name="号码" br>{{m.phone}}</sa-info>
+								<sa-info name="启运地" br>{{m.sourceAddress}}</sa-info>
+								<sa-info name="到达口岸" br>{{m.arrivePart}}</sa-info>
+							</el-col>
+							<el-col span="12">
+								<sa-info name="运输工具" br>{{m.carName}}</sa-info>
+								<sa-info name="运输工具号码" br>{{m.carNo}}</sa-info>
+								<sa-info name="国内运输工具" br>{{m.chinaCarName}}</sa-info>
+								<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.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>
+								<sa-info name="计费（分）" br>{{m.money}}</sa-info>
+							</el-col>
+						</el-row>
+
+
 					</el-form>
 				</div>
 			</div>

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

@@ -32,31 +32,31 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="发货人" prop="sendPeople" ></sa-td>
-					<sa-td name="收货人" prop="receivePeople" ></sa-td>
+<!--					<sa-td name="发货人" prop="sendPeople" ></sa-td>-->
+<!--					<sa-td name="收货人" prop="receivePeople" ></sa-td>-->
 					<sa-td name="品名" prop="goodsName" ></sa-td>
-					<sa-td name="产地" prop="origin" ></sa-td>
+<!--					<sa-td name="产地" prop="origin" ></sa-td>-->
 					<sa-td name="数量" prop="num" type="num"></sa-td>
-					<sa-td name="重量" prop="grossWeight" ></sa-td>
-					<sa-td name="规格" prop="unit" ></sa-td>
-					<sa-td name="包装" prop="pack" ></sa-td>
-					<sa-td name="标记" prop="flag" ></sa-td>
-					<sa-td name="号码" prop="phone" ></sa-td>
-					<sa-td name="启运地" prop="sourceAddress" ></sa-td>
-					<sa-td name="到达口岸" prop="arrivePart" ></sa-td>
+					<sa-td name="重量(吨)" prop="grossWeight" ></sa-td>
+<!--					<sa-td name="规格" prop="unit" ></sa-td>-->
+<!--					<sa-td name="包装" prop="pack" ></sa-td>-->
+<!--					<sa-td name="标记" prop="flag" ></sa-td>-->
+<!--					<sa-td name="号码" prop="phone" ></sa-td>-->
+<!--					<sa-td name="启运地" prop="sourceAddress" ></sa-td>-->
+<!--					<sa-td name="到达口岸" prop="arrivePart" ></sa-td>-->
 					<sa-td name="运输工具" prop="carName" ></sa-td>
 					<sa-td name="运输工具号码" prop="carNo" ></sa-td>
-					<sa-td name="中国运输工具" prop="chinaCarName" ></sa-td>
-					<sa-td name="中国运输号码" prop="chinaCarNo" ></sa-td>
-					<sa-td name="备注" prop="remark" ></sa-td>
+					<sa-td name="国内运输工具" prop="chinaCarName" ></sa-td>
+					<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="declarePeople" ></sa-td>
 					<sa-td name="申请人联系号码" prop="declarePhone" ></sa-td>
-					<sa-td name="申请时间" prop="applyTime" ></sa-td>
+					<sa-td name="申请时间" prop="applyTime" width="100px" min-width="100px" ></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">
+					<sa-td name="受理时间" prop="acceptTime" width="100px" min-width="100px" ></sa-td>
+<!--					<sa-td name="计费（分）" prop="money" ></sa-td>-->
+					<el-table-column label="操作"   width="320px">
 						<template slot-scope="s">
 							<el-button v-if="sa.isAuth('tb-disinfect-print')" 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>
@@ -121,7 +121,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-disinfect-info.html?id=' + data.id, '600px', '90%');
+						sa.showIframe('数据详情', 'tb-disinfect-info.html?id=' + data.id, '900px', '90%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclareMapper.xml

@@ -5,8 +5,8 @@
     <!-- 增 [G] -->
     <insert id="add">
 		insert into 
-		tb_declare (id, business_id, goods_name, gross_weight, num, production_date, expiration_date, storage_mode, production_mode, origin, producer_code, send_unit, receive_unit, route, driver_name, driver_phone, agent, agent_phone, china_car_no, car_no, custom_proof, quarantine_proof, shop, production_code, container_code) 
-		values (#{id}, #{businessId}, #{goodsName}, #{grossWeight}, #{num}, #{productionDate}, #{expirationDate}, #{storageMode}, #{productionMode}, #{origin}, #{producerCode}, #{sendUnit}, #{receiveUnit}, #{route}, #{driverName}, #{driverPhone}, #{agent}, #{agentPhone}, #{chinaCarNo}, #{carNo}, #{customProof}, #{quarantineProof}, #{shop}, #{productionCode}, #{containerCode}) 
+		tb_declare (id, business_id, goods_name, gross_weight, num, production_date, expiration_date, storage_mode, production_mode, origin, producer_code, send_unit, receive_unit, route, driver_name, driver_phone, agent, agent_phone, china_car_no, china_car_suff, car_no, custom_proof, quarantine_proof, shop, production_code, container_code)
+		values (#{id}, #{businessId}, #{goodsName}, #{grossWeight}, #{num}, #{productionDate}, #{expirationDate}, #{storageMode}, #{productionMode}, #{origin}, #{producerCode}, #{sendUnit}, #{receiveUnit}, #{route}, #{driverName}, #{driverPhone}, #{agent}, #{agentPhone}, #{chinaCarNo}, #{chinaCarSuff}, #{carNo}, #{customProof}, #{quarantineProof}, #{shop}, #{productionCode}, #{containerCode})
 	</insert>
 
     <!-- 删 -->
@@ -36,7 +36,8 @@
 		driver_phone = #{driverPhone}, 
 		agent = #{agent}, 
 		agent_phone = #{agentPhone}, 
-		china_car_no = #{chinaCarNo}, 
+		china_car_no = #{chinaCarNo},
+		china_car_suff = #{chinaCarSuff},
 		car_no = #{carNo}, 
 		custom_proof = #{customProof}, 
 		quarantine_proof = #{quarantineProof}, 
@@ -71,6 +72,7 @@
         <result property="agent" column="agent"/>
         <result property="agentPhone" column="agent_phone"/>
         <result property="chinaCarNo" column="china_car_no"/>
+        <result property="chinaCarSuff" column="china_car_suff"/>
         <result property="carNo" column="car_no"/>
         <result property="customProof" column="custom_proof"/>
         <result property="quarantineProof" column="quarantine_proof"/>

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclareService.java

@@ -2,6 +2,7 @@ package com.pj.project.tb_declare;
 
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,6 +37,9 @@ public class TbDeclareService extends ServiceImpl<TbDeclareMapper, TbDeclare> im
 
 	/** 改 */
 	int update(TbDeclare t){
+	    if(StrUtil.isEmpty(t.getBusinessId())){
+	        t.setBusinessId(null);
+        }
 		return tbDeclareMapper.update(t);
 	}