首页 发现 帮助
注册 登录
qzyReal
/
pco
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

审核业务需要修改先进行驳回

qzyReal 2 年之前
父节点
160b4b8153
当前提交
e6388cd313
共有 6 个文件被更改，包括 185 次插入 和 174 次删除
合并视图 显示文件统计
  1. 167 168
      sp-admin/login.html
  2. 2 2
      sp-admin/sa-view/tb-business-car/tb-business-car-info.html
  3. 4 0
      sp-admin/sa-view/tb-business/tb-car-disincle-edit.html
  4. 1 1
      sp-server/src/main/java/com/pj/api/open/service/OpenService.java
  5. 9 1
      sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java
  6. 2 2
      sp-server/src/main/resources/application-dev.yml

+ 167 - 168
sp-admin/login.html
查看文件 

@@ -1,183 +1,182 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="zh">
 
 <html lang="zh">
 
-<head>
 
-    <meta charset="utf-8">
 
-    <title>登录</title>
 
-    <meta name="description" content="particles.js is a lightweight JavaScript library for creating particles.">
 
-    <meta name="author" content="Vincent Garreau"/>
 
-    <meta name="viewport"
 
-          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-    <link rel="stylesheet" media="screen" href="sa-frame/login/style.css">
 
-    <link rel="stylesheet" href="static/sa.css">
 
-    <style type="text/css">
 
-        /* 背景图片 */
 
-        #particles-js {
 
-            background-image: url(sa-frame/login/bg.jpg);
 
-        }
 
+	<head>
 
+		<meta charset="utf-8">
 
+		<title>登录</title>
 
+		<meta name="description" content="particles.js is a lightweight JavaScript library for creating particles.">
 
+		<meta name="author" content="Vincent Garreau" />
 
+		<meta name="viewport"
 
+			content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
+		<link rel="stylesheet" media="screen" href="sa-frame/login/style.css">
 
+		<link rel="stylesheet" href="static/sa.css">
 
+		<style type="text/css">
 
+			/* 背景图片 */
 
+			#particles-js {
 
+				background-image: url(sa-frame/login/bg.jpg);
 
+			}
 
 
 
-        /* 样式调整 */
 
-        .login-box {
 
-            display: flex;
 
-            justify-content: center;
 
-            align-items: center;
 
-            position: fixed;
 
-            width: inherit;
 
-            height: 100%;
 
-            pointer-events: none;
 
-        }
 
+			/* 样式调整 */
 
+			.login-box {
 
+				display: flex;
 
+				justify-content: center;
 
+				align-items: center;
 
+				position: fixed;
 
+				width: inherit;
 
+				height: 100%;
 
+				pointer-events: none;
 
+			}
 
 
 
-        .login {
 
-            height: auto;
 
-            padding: 50px 50px;
 
-            position: static;
 
-            margin: 0 auto !important;
 
-            pointer-events: all;
 
-            border-radius: 0px;
 
-        }
 
+			.login {
 
+				height: auto;
 
+				padding: 50px 50px;
 
+				position: static;
 
+				margin: 0 auto !important;
 
+				pointer-events: all;
 
+				border-radius: 0px;
 
+			}
 
 
 
-        .login-top {
 
-            margin-top: 0px;
 
-            margin-bottom: 30px;
 
-        }
 
+			.login-top {
 
+				margin-top: 0px;
 
+				margin-bottom: 30px;
 
+			}
 
 
 
-        .logo-img {
 
-            width: 50px;
 
-            height: 50px;
 
-            vertical-align: middle;
 
-            position: relative;
 
-            top: -3px;
 
-            border-radius: 50%;
 
-            margin-left: -10px;
 
-            margin-right: 10px;
 
-        }
 
+			.logo-img {
 
+				width: 50px;
 
+				height: 50px;
 
+				vertical-align: middle;
 
+				position: relative;
 
+				top: -3px;
 
+				border-radius: 50%;
 
+				margin-left: -10px;
 
+				margin-right: 10px;
 
+			}
 
 
 
-        .logo-img {
 
-            display: none;
 
-        }
 
+			.logo-img {
 
+				display: none;
 
+			}
 
 
 
-        .login-button {
 
-            width: 270px;
 
-            border-radius: 0px;
 
-            transition: all 0.2s;
 
-        }
 
+			.login-button {
 
+				width: 270px;
 
+				border-radius: 0px;
 
+				transition: all 0.2s;
 
+			}
 
 
 
-        .login-button:hover {
 
-            background-color: #0E80eF;
 
-        }
 
+			.login-button:hover {
 
+				background-color: #0E80eF;
 
+			}
 
 
 
-        /* .page-title{line-height: 50px;} */
 
-        .sk-rotating-plane {
 
-        }
 
+			/* .page-title{line-height: 50px;} */
 
+			.sk-rotating-plane {}
 
 
 
-        /* 动画相关 */
 
-        /* .login{background-color: rgba(0,0,0,0); } */
 
-        .login {
 
-            opacity: 0;
 
-        }
 
-    </style>
 
-</head>
 
-<body>
 
+			/* 动画相关 */
 
+			/* .login{background-color: rgba(0,0,0,0); } */
 
+			.login {
 
+				opacity: 0;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
 
 
-<div id="particles-js">
 
-    <div class="login-box">
 
-        <div class="login">
 
-            <div class="login-top">
 
-                <img src="" class="logo-img" alt="">
 
-                <span class="page-title">登录</span>
 
-            </div>
 
-            <div class="login-center clearfix">
 
-                <div class="login-center-img"><img src="sa-frame/login/name.png"/></div>
 
-                <div class="login-center-input">
 
-                    <input type="text" name="key" value="" placeholder="请输入账号"/>
 
-                    <div class="login-center-input-text">账号</div>
 
-                </div>
 
-            </div>
 
-            <div class="login-center clearfix">
 
-                <div class="login-center-img"><img src="sa-frame/login/password.png"/></div>
 
-                <div class="login-center-input">
 
-                    <input type="password" name="password" value="" placeholder="请输入密码"/>
 
-                    <div class="login-center-input-text">密码</div>
 
-                </div>
 
-            </div>
 
-            <div class="login-button">登录</div>
 
-        </div>
 
-    </div>
 
-    <div class="sk-rotating-plane"></div>
 
-</div>
 
-<div style="text-align: center;position: relative;bottom: 20px;background-color: #000000;padding: 5px;">
 
-    <a href="https://beian.miit.gov.cn/" target="_blank" style="color: #FFFFFF;">桂ICP备12007573号-1</a>
 
-</div>
 
+		<div id="particles-js">
 
+			<div class="login-box">
 
+				<div class="login">
 
+					<div class="login-top">
 
+						<img src="" class="logo-img" alt="">
 
+						<span class="page-title">登录</span>
 
+					</div>
 
+					<div class="login-center clearfix">
 
+						<div class="login-center-img"><img src="sa-frame/login/name.png" /></div>
 
+						<div class="login-center-input">
 
+							<input type="text" name="key" value="" placeholder="请输入账号" />
 
+							<div class="login-center-input-text">账号</div>
 
+						</div>
 
+					</div>
 
+					<div class="login-center clearfix">
 
+						<div class="login-center-img"><img src="sa-frame/login/password.png" /></div>
 
+						<div class="login-center-input">
 
+							<input type="password" name="password" value="" placeholder="请输入密码" />
 
+							<div class="login-center-input-text">密码</div>
 
+						</div>
 
+					</div>
 
+					<div class="login-button">登录</div>
 
+				</div>
 
+			</div>
 
+			<div class="sk-rotating-plane"></div>
 
+		</div>
 
+		<div style="text-align: center;position: relative;bottom: 20px;background-color: #000000;padding: 5px;">
 
+			<a href="https://beian.miit.gov.cn/" target="_blank" style="color: #FFFFFF;">桂ICP备12007573号-1</a>
 
+		</div>
 
 
 
-<!-- scripts -->
 
-<script src="sa-frame/login/particles.min.js"></script>
 
-<script src="sa-frame/login/app.js"></script>
 
-<script src="static/kj/jquery.min.js"></script>
 
-<script src="static/kj/layer/layer.js"></script>
 
-<script src="static/sa.js"></script>
 
-<script type="text/javascript">
 
-    // 你所有要改的代码全在这里   ↓↓↓↓↓
 
+		<!-- scripts -->
 
+		<script src="sa-frame/login/particles.min.js"></script>
 
+		<script src="sa-frame/login/app.js"></script>
 
+		<script src="static/kj/jquery.min.js"></script>
 
+		<script src="static/kj/layer/layer.js"></script>
 
+		<script src="static/sa.js"></script>
 
+		<script type="text/javascript">
 
+			// 你所有要改的代码全在这里   ↓↓↓↓↓
 
 
 
-    // 所有参考属性
 
-    var page_title = '场站管理系统 后台登录'; // 页面标题
 
-    var key = ''; // 默认的账号
 
-    var password = ''; // 默认的password
 
-    var logo = ''; // logo地址，为空字符串则不显示
 
-
 
-    // 点击登录按钮
 
-    document.querySelector(".login-button").onclick = function () {
 
-        // 1、取值
 
-        var p = {
 
-            key: $('[name=key]').val(),
 
-            password: $('[name=password]').val()
 
-        }
 
-        // 2、判断
 
-        if (p.key == '' || p.password == '') {
 
-            return layer.msg('请输入账号密码');
 
-        }
 
-        // 3、请求后台
 
-        sa.ajax('/AccAdmin/doLogin', p, function (res) {
 
-            // 写入token
 
-            if (res.data.tokenInfo) {
 
-                localStorage.tokenName = res.data.tokenInfo.tokenName;
 
-                localStorage.tokenValue = res.data.tokenInfo.tokenValue;
 
-            }
 
-            // 写入权限码
 
-            sa.setAuth(res.data.per_list);
 
-            // 打个招呼，进入 index.html
 
-            sa.msg('登录成功，欢迎你：' + p.key);
 
-            setTimeout(function () {
 
-                if (parent == window) {
 
-                    location.href = "index.html";
 
-                } else {
 
-                    sa.closeCurrIframe();
 
-                    parent.location.reload();
 
-                }
 
-            }, 500);
 
-        })
 
-    }
 
-    // 你所有要改的代码全在这里   ↑↑↑↑↑
 
-</script>
 
-<script type="text/javascript">
 
-    // 替换属性
 
-    $('.page-title').html(page_title);
 
-    $('title').html(page_title);
 
-    $('[name=key]').val(key);
 
-    $('[name=password]').val(password);
 
-    if (logo != null && logo != '') {
 
-        $('.logo-img').attr('src', logo);
 
-        $('.logo-img').show();
 
-    }
 
-    // 绑定回车事件
 
-    $('[name=password]').bind('keypress', function (event) {
 
-        if (event.keyCode == "13") {
 
-            $('.login-button').click();
 
-        }
 
-    });
 
-    // 去掉透明
 
-    setTimeout(function () {
 
-        // document.querySelector('.login').style.backgroundColor = 'rgba(256,256,256,1)';
 
-        document.querySelector('.login').style.opacity = '1';
 
-    }, 0)
 
-</script>
 
-</body>
 
+			// 所有参考属性
 
+			var page_title = '场站管理系统 后台登录'; // 页面标题
 
+			var key = ''; // 默认的账号
 
+			var password = ''; // 默认的password
 
+			var logo = ''; // logo地址，为空字符串则不显示
 
+			// 点击登录按钮
 
+			document.querySelector(".login-button").onclick = function() {
 
+			
+				// 1、取值
 
+				var p = {
 
+					key: $('[name=key]').val(),
 
+					password: $('[name=password]').val()
 
+				}
 
+				// 2、判断
 
+				if (p.key == '' || p.password == '') {
 
+					return layer.msg('请输入账号密码');
 
+				}
 
+				// 3、请求后台
 
+				sa.ajax('/AccAdmin/doLogin', p, function(res) {
 
+					// 写入token
 
+					if (res.data.tokenInfo) {
 
+						localStorage.tokenName = res.data.tokenInfo.tokenName;
 
+						localStorage.tokenValue = res.data.tokenInfo.tokenValue;
 
+					}
 
+					// 写入权限码
 
+					sa.setAuth(res.data.per_list);
 
+					// 打个招呼，进入 index.html
 
+					sa.msg('登录成功，欢迎你：' + p.key);
 
+					setTimeout(function() {
 
+						if (parent == window) {
 
+							location.href = "index.html";
 
+						} else {
 
+							sa.closeCurrIframe();
 
+							parent.location.reload();
 
+						}
 
+					}, 500);
 
+				})
 
+			}
 
+			// 你所有要改的代码全在这里   ↑↑↑↑↑
 
+		</script>
 
+		<script type="text/javascript">
 
+			// 替换属性
 
+			$('.page-title').html(page_title);
 
+			$('title').html(page_title);
 
+			$('[name=key]').val(key);
 
+			$('[name=password]').val(password);
 
+			if (logo != null && logo != '') {
 
+				$('.logo-img').attr('src', logo);
 
+				$('.logo-img').show();
 
+			}
 
+			// 绑定回车事件
 
+			$('[name=password]').bind('keypress', function(event) {
 
+				if (event.keyCode == "13") {
 
+					$('.login-button').click();
 
+				}
 
+			});
 
+			// 去掉透明
 
+			setTimeout(function() {
 
+				// document.querySelector('.login').style.backgroundColor = 'rgba(256,256,256,1)';
 
+				document.querySelector('.login').style.opacity = '1';
 
+			}, 0)
 
+		</script>
 
+	</body>
 
 </html>
 
 </html>

+ 2 - 2
sp-admin/sa-view/tb-business-car/tb-business-car-info.html
查看文件 

@@ -128,9 +128,9 @@
 
 			</div>
 
 			</div>
 
 			<!-- ------- 底部按钮 ------- -->
 
 			<!-- ------- 底部按钮 ------- -->
 
 			<div class="s-foot">
 
 			<div class="s-foot">
 
-				<el-button v-if="sa.isAuth('tb-business-car-judge')&&m.pay!==1&&m.businessType===1" class="c-btn"
 
+				<el-button v-if="sa.isAuth('tb-business-car-judge')&&m.businessType===1&&m.confirmJudge!=1" class="c-btn"
 
 					type="success" icon="el-icon" @click="pass()">审核通过</el-button>
 
 					type="success" icon="el-icon" @click="pass()">审核通过</el-button>
 
-				<el-button v-if="sa.isAuth('tb-business-car-judge')&&m.pay!==1&&m.businessType===1" class="c-btn"
 
+				<el-button v-if="sa.isAuth('tb-business-car-judge')&&m.businessType===1&&m.confirmJudge==1" class="c-btn"
 
 					type="warning" icon="el-icon" @click="callback()">审核驳回</el-button>
 
 					type="warning" icon="el-icon" @click="callback()">审核驳回</el-button>
 
 				<el-button v-if="sa.isAuth('tb-business-car-print')&&m.pay===1&&m.businessType===1" type="success" @click="printFn()">打印</el-button>
 
 				<el-button v-if="sa.isAuth('tb-business-car-print')&&m.pay===1&&m.businessType===1" type="success" @click="printFn()">打印</el-button>
 
 				<el-button type="success" @click="sa.closeCurrIframe()">关闭</el-button>
 
 				<el-button type="success" @click="sa.closeCurrIframe()">关闭</el-button>

+ 4 - 0
sp-admin/sa-view/tb-business/tb-car-disincle-edit.html
查看文件 

@@ -551,6 +551,10 @@
 
                 this.car.form.netWeight = '';
 
                 this.car.form.netWeight = '';
 
             },
 
             },
 
             editFn(data) {
 
             editFn(data) {
 
+				if(data.confirmJudge===1){
 
+					sa.error('该车辆已审核，请先驳回审核在修改');
 
+					return;
 
+				}
 
                 Object.assign(this.car, {
 
                 Object.assign(this.car, {
 
                     visible: true,
 
                     visible: true,
 
                     form: JSON.parse(JSON.stringify(data))
 
                     form: JSON.parse(JSON.stringify(data))

+ 1 - 1
sp-server/src/main/java/com/pj/api/open/service/OpenService.java
查看文件 

@@ -129,7 +129,7 @@ public class OpenService {
 
             //=======创建新的放行记录==========
 
             //=======创建新的放行记录==========
 
             tbBusinessCar = new TbBusinessCar();
 
             tbBusinessCar = new TbBusinessCar();
 
             tbBusinessCar.setCarNo(carNo).setPay(0).setCarSize(0D).setIsLock(0)
 
             tbBusinessCar.setCarNo(carNo).setPay(0).setCarSize(0D).setIsLock(0)
 
-                    .setCarCompany(tbCar != null ? tbCar.getCustomerName() : "临时")
 
+                    .setCarCompany(tbCar != null ? tbCar.getCustomerName() : "临时").setCreateTime(now)
 
                     .setInChannel(channel).setRealInTime(now).setCarType(TbItem.ItemTypeEnum.EMPTY_TYPE.getType())
 
                     .setInChannel(channel).setRealInTime(now).setCarType(TbItem.ItemTypeEnum.EMPTY_TYPE.getType())
 
                     .setBasePartMoney(new BigDecimal("0")).setTimeUpdate(now).setConfirmJudge(TbBusinessCar.ConfirmJudgeEnum.NO_NEED_JUDGE.getCode())
 
                     .setBasePartMoney(new BigDecimal("0")).setTimeUpdate(now).setConfirmJudge(TbBusinessCar.ConfirmJudgeEnum.NO_NEED_JUDGE.getCode())
 
                     .setNo(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + RandomUtil.randomNumbers(4));
 
                     .setNo(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + RandomUtil.randomNumbers(4));

+ 9 - 1
sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java
查看文件 

@@ -796,7 +796,8 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
 
             }
 
             }
 
             //最新一条记录
 
             //最新一条记录
 
             TbBusinessCar db = tbBusinessCarService.findTheLastRecord(carNo);
 
             TbBusinessCar db = tbBusinessCarService.findTheLastRecord(carNo);
 
-            if (db!=null&&db.getConfirmJudge()==TbBusinessCar.ConfirmJudgeEnum.JUDGE_PASS.getCode()){
 
+            //存在并且未离场+已审核
 
+            if (db!=null&&db.getConfirmJudge()==TbBusinessCar.ConfirmJudgeEnum.JUDGE_PASS.getCode()&&db.getRealOutTime()==null){
 
                 throw new BusinessException("车辆【"+carNo+"】已审核，请驳回再录入业务");
 
                 throw new BusinessException("车辆【"+carNo+"】已审核，请驳回再录入业务");
 
             }
 
             }
 
             if (!tbGoods.getName().contains("整车")){
 
             if (!tbGoods.getName().contains("整车")){
 
@@ -953,6 +954,13 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
 
                 }
 
                 }
 
             } else {
 
             } else {
 
                 TbBusinessCar checkCar = tbBusinessCarService.findTheLastRecord(carNo);
 
                 TbBusinessCar checkCar = tbBusinessCarService.findTheLastRecord(carNo);
 
+                //存在+审核+未离场的
 
+                if (checkCar!=null
 
+                        &&checkCar.getConfirmJudge()==TbBusinessCar.ConfirmJudgeEnum.JUDGE_PASS.getCode()
 
+                        &&checkCar.getRealOutTime()==null){
 
+                    throw new BusinessException("车辆【"+carNo+"】已审核，请驳回再录入业务");
 
+                }
 
+                //不存在或者已经离场的
 
                 if (checkCar == null ||
 
                 if (checkCar == null ||
 
                         (checkCar.getRealInTime() != null && checkCar.getRealOutTime() != null)) {
 
                         (checkCar.getRealInTime() != null && checkCar.getRealOutTime() != null)) {
 
                     checkCar = new TbBusinessCar();
 
                     checkCar = new TbBusinessCar();

+ 2 - 2
sp-server/src/main/resources/application-dev.yml
查看文件 

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