github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 04:03:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Suh
2024-01-18 17:37:21 +09:00
parent e2e4d06bb0 c9160cd4e8
commit 149db2ff02
19 changed files with 404 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/out/create.jsp
View File

@@ -12,7 +12,9 @@
<div class="row">
<div class="col-12">
<input type='hidden' id="manager_id" value="83f11782-ae95-11ee-935d-0242ac110006">
<c:set var="userData" value="${sessionScope.userData}" />
<input type='hidden' id="manager_id" value="${userData.id }">
<input type='hidden' id="activation" value="1">

33
src/main/webapp/WEB-INF/views/price/create.jsp
View File

@@ -1,4 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!DOCTYPE html>
<html>
<head>
@@ -45,11 +46,8 @@
aria-describedby="basic-addon1">
</div>
<!-- 추후 수정 -->
<input type='hidden' id="manager_id" value="83bdda69-ae95-11ee-935d-0242ac110006">
<!-- 추후 수정 -->
<c:set var="userData" value="${sessionScope.userData}" />
<input type='hidden' id="manager_id" value="${userData.id }">
</div>
</div>
</div>
@@ -93,8 +91,8 @@ $(document).ready(function() {
type: "post",
data: {
"price": price,
"manager_id": manager_id, // 추후 수정해야함.
"product_id": product_id, // 추후 수정해야함.
"manager_id": manager_id,
"product_id": product_id,
"activation": true
},
datatype:"json"
@@ -102,24 +100,6 @@ $(document).ready(function() {
if (data == true) {
alert("제품 가격을 추가했습니다.");
$(location).attr("href", "/price/list");
//생각해서 바꿔야함.
// 조건 : DB에서 생성되는 uuid를 어떻게 자바스크립트에서 가져올것인지 궁리.
/*
var form = document.createElement("form");
form.action = "/product/read";
form.method = "POST";
document.body.appendChild(form);
var input = document.createElement("input");
input.type = "hidden";
input.name = "id";
input.value = data.id;
form.appendChild(input);
form.submit();
*/
} else {
alert("제품 가격 추가에 실패하였습니다.");
}
@@ -153,8 +133,5 @@ function showSearchModal(title, val){
</script>
</body>
</html>

10
src/main/webapp/WEB-INF/views/price/update.jsp
View File

@@ -1,4 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!DOCTYPE html>
<html>
<head>
@@ -34,14 +35,15 @@
<input type="text" class="form-control" placeholder="등록날짜"
aria-label="등록날짜" value="${dto.registration_date }" readonly>
</div>
<c:set var="userData" value="${sessionScope.userData}" />
<div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon4">담당자</span>
<input type="text" class="form-control" placeholder="담당자"
aria-label="담당자" value="${dto.accountDto.name }" readonly>
aria-label="담당자" value="${userData.name }" readonly>
</div>
<input type='hidden' id="id" value="${dto.id }">
<input type='hidden' id="manager_id" value="${userData.id }">
</div>
</div>
</div>
@@ -62,6 +64,7 @@
$("#submitBtn").on("click", function() {
var id = $("#id").val();
var price = $("#price").val();
var manager_id = $("#manager_id").val();
if (!price || isNaN(price)) {
alert("올바른 가격을 입력하세요.");
@@ -74,7 +77,8 @@
type: "put",
data: {
"id": id,
"price": price
"price": price,
"manager_id": manager_id
},
datatype: "json"
}).done(function(data) {

8
src/main/webapp/WEB-INF/views/product/create.jsp
View File

@@ -63,11 +63,9 @@
<input type='hidden' id="vendor_id" value="">
</div>
<!-- 추후 수정 -->
<input type='hidden' id="manager_id" value="83bdda69-ae95-11ee-935d-0242ac110006">
<c:set var="userData" value="${sessionScope.userData}" />
<input type='hidden' id="manager_id" value="${userData.id }">
<!-- 추후 수정 -->
</div>
</div>
</div>
@@ -81,7 +79,7 @@
</div>
</div>
</form>
</div>
<!-- 스크립트 -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>

7
src/main/webapp/WEB-INF/views/product/update.jsp
View File

@@ -1,4 +1,5 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!DOCTYPE html>
<html>
<head>
@@ -59,10 +60,8 @@
</div>
<input type='hidden' id="id" value="${dto.id }">
<!-- 추후 수정 -->
<input type='hidden' id="manager_id" value="83bdda69-ae95-11ee-935d-0242ac110006">
<!-- 추후 수정 -->
<c:set var="userData" value="${sessionScope.userData}" />
<input type='hidden' id="manager_id" value="${userData.id }">
</div>
</div>

431
src/main/webapp/WEB-INF/views/resetpassword/list.jsp
View File

@@ -1,244 +1,249 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>패스워드 초기화 요청</title>
<meta charset="UTF-8">
<title>패스워드 초기화 요청</title>
</head>
<body>
<div class="mt-5 mb-5 text-center">
<h1>패스워드 초기화 요청</h1>
</div>
<hr>
<div class="body">
<div class="container-fluid">
<div class="col-12">
<form>
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option value="0">사원명</option>
<option value="1">사번</option>
</select>
</div>
<input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
<!-- 페이징작업용 -->
<input type="hidden" id="searchn1" value="${searchn}">
<input type="hidden" id="search1" value="${search}">
<!-- 페이징작업용 -->
</div>
</form>
</div>
</div>
<div class="container-fluid">
<div class="row row-table">
<div class="col-12">
<table class="table">
<thead class="table-dark">
<tr>
<th>번호</th>
<th>사원명</th>
<th>email</th>
<th>요청사유</th>
<th></th>
<div class="mt-5 mb-5 text-center">
<h1>패스워드 초기화 요청</h1>
</div>
<hr>
<div class="body">
<div class="container-fluid">
<div class="col-12">
<form>
<div class="input-group mb-3 w-30 col-centered">
<div class="w-25">
<select class="form-select" name="searchn" id="searchn">
<option value="0">사원명</option>
<option value="1">사번</option>
</select>
</div>
<input type="text" id="search" name="search" class="form-control"
aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
<button class="btn btn-info" type="button" id="searchBtn">검색</button>
</tr>
</thead>
<tbody>
<c:forEach items="${rlist }" var="dto">
<tr class="detailTr col-5" data-id="${dto.id}" >
<td class="col-1">${start} <c:set var="start" value="${start +1 }"/></td>
<td class="col-1">${dto.name }</td>
<td class="col-1">${dto.email }</td>
<td class="col-1">${dto.note }</td>
<td class="col-1">
<button type="button" class="btn btn-primary" value="${dto.id}" id="resetpassword">확인</button>
<button type="button" class="btn btn-warning" value="${dto.id}" id="cancelrequest">취소</button>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row row-buttons">
<!-- 페이징작업용 -->
<input type="hidden" id="searchn1" value="${searchn}">
<input type="hidden" id="search1" value="${search}">
<!-- 페이징작업용 -->
<div class="col-6 d-flex justify-content-center">
<nav>
<ul class="pagination">
</div>
</form>
</div>
</div>
<div class="container-fluid">
<div class="row row-table">
<div class="col-12">
<table class="table">
<thead class="table-dark">
<tr>
<th>번호</th>
<th>사원명</th>
<th>email</th>
<th>요청사유</th>
<th></th>
<c:if test="${begin > pageNum }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" id="before"
value="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a href="javascript:void(0);" class="page-link " id="pageNow"
value="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link" id="after" value="${end + 1 }">&gt;</a>
</li>
</c:if>
</ul>
</nav>
</div>
</tr>
</thead>
<tbody>
<c:forEach items="${rlist }" var="dto">
<tr class="detailTr col-5" data-id="${dto.id}">
<td class="col-1">${start} <c:set var="start" value="${start +1 }"/></td>
<td class="col-1">${dto.name }</td>
<td class="col-1">${dto.email }</td>
<td class="col-1">${dto.note }</td>
<td class="col-1">
<button type="button" class="btn btn-primary" data-resetpassword="${dto.id}"
id="resetpassword">확인
</button>
<button type="button" class="btn btn-warning" data-resetpasswordDelete="${dto.id}"
id="resetpasswordDelete">취소
</button>
<input type="hidden" id="id" value="${dto.id}"/>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row row-buttons">
</div><!-- row row-buttons -->
</div>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function(){
$("#resetpassword").on("click",function(){
var resetpassword = $("#resetpassword").val();
<div class="col-12 d-flex justify-content-center">
<nav>
<ul class="pagination">
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
<c:if test="${begin > pageNum }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link"
onclick="pageingFunction(this.id)" id="${begin - 1 }">&lt;</a>
</li>
</c:if>
<c:forEach begin="${begin }" end="${end }" var="i">
<li class="page-item <c:if test="${p == i}"> active </c:if>">
<a href="javascript:void(0);" class="page-link "
onclick="pageingFunction(this.id); return false;" id="${i }">${i }</a>
</li>
</c:forEach>
<c:if test="${end < totalPages }">
<li class="page-item">
<a href="javascript:void(0);" class="page-link"
onclick="pageingFunction(this.id)" id="${end + 1 }">&gt;</a>
</li>
</c:if>
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
</ul>
</nav>
</div>
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
<input type="hidden" value="${p}" id="p"/>
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = pageNow;
form.appendChild(input3);
</div><!-- row row-buttons -->
</div>
</div>
var input4 = document.createElement("input");
input4.type = "hidden";
input4.name = "resetpassword";
input4.value = resetpassword;
form.appendChild(input4);
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
document.body.appendChild(form);
form.submit();
});
$(document).ready(function () {
$("#resetpassword").on("click", function(){
var id = $("#id").val();
$.ajax({
url: "/resetpassword/update",
type: "put",
data: {
"id": id,
},
datatype:"json"
}).done(function (data) {
if (data == true) {
alert("비밀번호를 초기화했습니다.");
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
$("#cancelrequest").on("click",function(){
var cancelrequest = $("#cancelrequest").val();
// var input1 = document.createElement("input");
// input1.type = "hidden";
// input1.name = "id";
// input1.value = id;
// form.appendChild(input1);
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
form.submit();
window.location.href = "/resetpassword/list";
} else {
alert("비밀번호를 초기화를 실패했습니다..");
}
}).fail(function () {
alert("오류가 발생했습니다.");
}).always(function () {
//
});
});
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
$("#resetpasswordDelete").on("click", function(){
var id = $("#id").val();
$.ajax({
url: "/resetpassword/delete",
type: "delete",
data: {
"id": id,
},
datatype:"json"
}).done(function (data) {
if (data == true) {
alert("요청을 거절하였습니다.");
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
// var input1 = document.createElement("input");
// input1.type = "hidden";
// input1.name = "id";
// input1.value = id;
// form.appendChild(input1);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = 1;
form.appendChild(input3);
form.submit();
window.location.href = "/resetpassword/list";
} else {
alert("거절을 실패했습니다..");
}
}).fail(function () {
alert("오류가 발생했습니다.");
}).always(function () {
//
});
});
var input4 = document.createElement("input");
input4.type = "hidden";
input4.name = "cancelrequest";
input4.value = cancelrequest;
form.appendChild(input4);
//검색기능
$("#searchBtn").on("click", function () {
document.body.appendChild(form);
form.submit();
});
//검색기능
$("#searchBtn").on("click",function(){
var searchn = $("#searchn").val();
var search = $("#search").val();
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = 1;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
var searchn = $("#searchn").val();
var search = $("#search").val();
});
});//ready
$("#before, #pageNow, #after").on("click", function () {
var searchn = $("#searchn1").val();
var search = $("#search1").val();
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = 1;
form.appendChild(input3);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p1";
input3.value = clickedId;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
});
document.body.appendChild(form);
form.submit();
});
</script>
});//ready
function pageingFunction(clickedId) {
var searchn1 = $("#searchn1").val();
var search1 = $("#search1").val();
var form = document.createElement("form");
form.action = "/resetpassword/list";
form.method = "get";
var input1 = document.createElement("input");
input1.type = "hidden";
input1.name = "searchn";
input1.value = searchn1;
form.appendChild(input1);
var input2 = document.createElement("input");
input2.type = "hidden";
input2.name = "search";
input2.value = search1;
form.appendChild(input2);
var input3 = document.createElement("input");
input3.type = "hidden";
input3.name = "p";
input3.value = clickedId;
form.appendChild(input3);
document.body.appendChild(form);
form.submit();
}
</script>
</body>
</html>

3
src/main/webapp/WEB-INF/views/vendor/create.jsp vendored
View File

@@ -37,7 +37,8 @@
<%-- 세션 만들어지고 value 수정--%>
<input type='hidden' id="manager_id" value="15b68e54-b0f0-11ee-935d-0242ac110006"/>
<c:set var="userData" value="${sessionScope.userData}" />
<input type='hidden' id="manager_id" value="${userData.id }">
<input type='hidden' id="activation" value="1">

10
src/main/webapp/WEB-INF/views/vendor/list.jsp vendored
View File

@@ -69,7 +69,7 @@
<div class="row row-buttons">
<div class="col-3 text-start">
<img width="50" height="50" src="https://img.icons8.com/color/48/ms-excel.png" alt="ms-excel"/>
<button type="button" class="btn btn-success" id="uploadExcel">업로드</button>
<button type="button" class="btn btn-success" id="downlodeExcelForm">업로드</button>
<button type="button" class="btn btn-success" id="download">다운로드</button>
</div>
<div class="col-6 d-flex justify-content-center">
@@ -106,6 +106,14 @@
$(document).ready(function(){
$("#downlodeExcelForm").on("click",function(){
var form = document.createElement("form");
form.action = "/vendor/downloadTest";
form.method = "GET";
document.body.appendChild(form);
form.submit();
});
//POST방식으로 create폼화면 출력
$("#createButton").on("click",function(){
var form = document.createElement("form");

3
src/main/webapp/WEB-INF/views/warehouse/create.jsp
View File

@@ -36,7 +36,8 @@
<%-- 세션 만들어지고 value 수정--%>
<input type='hidden' id="managerId" value="e9882095-aeb2-11ee-935d-0242ac110006">
<c:set var="userData" value="${sessionScope.userData}"/>
<input type='hidden' id="manager_id" value="${userData.id }">
<input type='hidden' id="currentCapacity" value="0">
<input type='hidden' id="activation" value="1">

BIN
src/main/webapp/excelfiles/excelform/거래처 데이터 입력 서식.xlsx Normal file
View File

Binary file not shown.