Skip to content

H
HRM-admin
Commit 8cd8801b authored by FionaChen's avatar FionaChen
Browse files
Options

HRMS 啟用彈跳視窗修改

parent fa583a28
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 62 deletions
HRMS-manage.html
View file @ 8cd8801b
......@@ -123,9 +123,9 @@
<button type="button" class="btn-wt blue2 mr-2" data-toggle="modal"
data-target="#StopCompanyCount"><img src="images/icon/icon-stop.svg">停用</button>
<button type="button" class="btn-wt blue2" data-toggle="modal"
data-target="#addCompanyCount"><img src="images/icon/icon-play.svg">啟用</button>
data-target="#StartCompanyCount"><img src="images/icon/icon-play.svg">啟用</button>
</div>
<div class="sign-list phone-show">
<label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label>
<label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label>
......@@ -168,13 +168,13 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">使用中</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
id="checkyel02a" name="defaultExampleRadios02">
<label class="custom-control-label" for="checkyel02a"></label>
</div>
</div>
</td>
<td data-th="簽約公司">AAA公司</td>
<td data-th="公司名稱">甲公司</td>
......@@ -201,14 +201,14 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">使用中</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
id="company02a" name="defaultExampleRadios02">
<label class="custom-control-label" for="company02a"></label>
</div>
</div>
</td>
<td data-th="簽約公司">BBB公司</td>
<td data-th="公司名稱">乙公司</td>
......@@ -235,7 +235,7 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">停用中</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -268,7 +268,7 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">使用中</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -301,7 +301,7 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">已到期</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -334,7 +334,7 @@
</div>
</div>
</td>
<td data-th="狀態" class="phone-row">
<td data-th="狀態" class="phone-row">
<span class="mr-auto">導入中</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -368,7 +368,7 @@
</div>
</td>
<td data-th="狀態">使用中</td>
<td data-th="簽約公司" class="phone-row">
<td data-th="簽約公司" class="phone-row">
<span class="mr-auto">GGG公司</span>
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -397,10 +397,10 @@
<div>
<button type="button" class="btn-wt blue mr-2" data-toggle="modal"
data-target="#StopCompanyCount"><img src="images/icon/icon-stop.svg">停用</button>
<button type="button" class="btn-wt blue" data-toggle="modal"
data-target="#addCompanyCount"><img src="images/icon/icon-play.svg">啟用</button>
<button type="button" class="btn-wt blue2" data-toggle="modal"
data-target="#StartCompanyCount"><img src="images/icon/icon-play.svg">啟用</button>
</div>
<div class="sign-list">
<label class="mr-5"><img src="images/icon/icon-alert.svg">員工人數超過上限</label>
<label><img src="images/icon/icon-point.svg" class="mr-1">試用公司</label>
......@@ -420,7 +420,7 @@
</div>
<!-- 各公司出勤 end -->
<!-- -------------------- -->
......@@ -446,7 +446,7 @@
</div>
</div>
<button type="button" class="btn-wt blue"><img src="images/icon/icon-search.svg">搜尋</button>
</div>
......@@ -567,8 +567,8 @@
</div>
</div>
<!-- 異動記錄 end -->
</div>
......@@ -598,7 +598,7 @@
</button>
</div>
<div class="modal-body password">
<div class="row form-group">
<span class="col-4">舊密碼</span>
<input type="text" class="form-control form-control-sm col-8" name="systemAdminAccount"
......@@ -635,7 +635,7 @@
</div>
</div>
</div> -->
</div>
<div class="modal-footer">
</div>
......@@ -693,6 +693,31 @@
</div>
<!-- 停用成功 -->
<!-- 啟用成功 -->
<div class="modal fade" id="StartCompanyModal" tabindex="-1" aria-labelledby="StartCompanyModal"
aria-hidden="true">
<div class="modal-dialog success modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header whitebg">
<!-- <label class="topic">修改密碼</label> -->
<button type="button" class="close whitebg" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true" class="">×</span>
</button>
</div>
<div class="modal-body checkcont">
<div class="row form-group justify-content-center">
<span class="col-12 text-center">啟用成功</span>
<img src="images/icon/image-success.svg" class="mt-3">
</div>
</div>
<!-- <div class="modal-footer">
</div> -->
</div>
</div>
</div>
<!-- 停用成功 -->
<!-- 修改失敗 -->
<div class="modal fade" id="FailModal" tabindex="-1" aria-labelledby="FailModal"
aria-hidden="true">
......@@ -814,7 +839,7 @@
<!-- 新增公司 -->
<div class="modal fade" id="addCompanyCount" tabindex="-1" aria-labelledby="addCompanyCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">新增公司</label>
......@@ -823,20 +848,20 @@
</button>
</div>
<div class="modal-body Addcont">
<div class="d-flex justify-content-end align-items-center mb-2">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input boardCheck"
id="TestcompanyAdd" name="defaultExaTest" checked>
<label class="custom-control-label" for="TestcompanyAdd">試用公司</label>
</div>
</div>
</div>
<div class="form-group row">
<div class="custom-control custom-checkbox phone-show">
<input type="checkbox" class="custom-control-input boardCheck"
id="Testcompany" name="defaultTestcompany">
<label class="custom-control-label" for="Testcompany">試用公司</label>
</div>
</div>
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">簽約公司名稱</label>
......@@ -902,7 +927,7 @@
<label class="col-sm-4 col-12 pl-0">金鑰</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div>
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
......@@ -910,7 +935,7 @@
</div>
</div>
</div>
<div class="modal-footer">
</div>
......@@ -920,9 +945,9 @@
<!--新增公司 -->
<!-- 修改公司 -->
<!-- 編輯公司 -->
<div class="modal fade" id="EditCompanyCount" tabindex="-1" aria-labelledby="EditCompanyCount" aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">編輯</label>
......@@ -931,7 +956,7 @@
</button>
</div>
<div class="modal-body Addcont">
<div class="d-flex justify-content-end align-items-center mb-2">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input boardCheck"
......@@ -943,7 +968,7 @@
<label class="col-sm-4 col-12 pl-0">簽約公司名稱</label>
<select name="select" class="custom-select col-sm-8 col-12">
<option selected>請選擇簽約公司名稱</option>
<option value="Asia/Taipei">Asia/Taipei</option>
<option value="Asia/Taipei" selected>Asia/Taipei</option>
<option value="XXXX">XXXX</option>
<option value="OOOO">OOOO</option>
</select>
......@@ -953,30 +978,22 @@
<label class="col-sm-4 col-12 pl-0">帳號</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12" placeholder="ThisIsABook" disabled>
</div>
<!-- <div class="form-group row">
<label class="col-sm-4 col-12 pl-0">密碼</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">再次輸入密碼</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div> -->
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">所屬 tenant</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
<input type="text" class="form-control form-control-sm col-sm-8 col-12" placeholder="AAA公司">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">資料庫名稱</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
<input type="text" class="form-control form-control-sm col-sm-8 col-12" placeholder="C system">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">Server IP</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
<input type="text" class="form-control form-control-sm col-sm-8 col-12" placeholder="192.168.1.1">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">公司名稱</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
<input type="text" class="form-control form-control-sm col-sm-8 col-12 " placeholder="甲公司">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">時區</label>
......@@ -1002,38 +1019,38 @@
</div> -->
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">簽約</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
<input type="text" class="form-control form-control-sm col-sm-8 col-12" placeholder="AAA公司">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">金鑰</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div>
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#EditSuccessModal">確認</button>
</div>
</div>
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
<!--新增公司 -->
<!--編輯公司 -->
<!-- 停用勾選公司 -->
<div class="modal fade" id="StopCompanyCount" tabindex="-1" aria-labelledby="StopCompanyCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">停用勾選公司</label>
......@@ -1042,7 +1059,7 @@
</button>
</div>
<div class="modal-body Addcont">
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">停用原因</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12">
......@@ -1051,16 +1068,16 @@
<label class="col-sm-4 col-12 pl-0">金鑰</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div>
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#SureStopCompanyCount">儲存</button>
</div>
</div>
</div>
<div class="modal-footer">
</div>
......@@ -1072,7 +1089,7 @@
<!-- 確定停用公司 -->
<div class="modal fade" id="SureStopCompanyCount" tabindex="-1" aria-labelledby="SureStopCompanyCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<!-- <label class="topic">停用勾選公司</label> -->
......@@ -1094,7 +1111,7 @@
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#StopSuccessModal">確定</button>
</div>
</div>
<!-- -->
</div>
......@@ -1106,7 +1123,124 @@
<!--確定停用公司 -->
<!-- 啟用勾選公司 -->
<div class="modal fade" id="StartCompanyCount" tabindex="-1" aria-labelledby="StartCompanyCount"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">啟用勾選公司</label>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body Addcont">
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">啟用原因</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12">
</div>
<div class="form-group row">
<label class="col-sm-4 col-12 pl-0">金鑰</label>
<input type="text" class="form-control form-control-sm col-sm-8 col-12 ">
</div>
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#SureStartCompanyCount">儲存</button>
</div>
</div>
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
<!--啟用勾選公司 -->
<!-- 確定啟用公司 -->
<div class="modal fade" id="SureStartCompanyCount" tabindex="-1" aria-labelledby="SureStartCompanyCount"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<!-- <label class="topic">停用勾選公司</label> -->
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body Addcont">
<div class="message-group mt-3">
<label class="title">確定啟用</label>
</div>
<div class="message-group">
<label class="title">A公司、B公司、C公司、D公司、E公司？</label>
</div>
<!-- -->
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#SureStartCompanyCount2">確定</button>
</div>
</div>
<!-- -->
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
<!--確定啟用公司 -->
<!-- 確定啟用公司 -->
<div class="modal fade" id="SureStartCompanyCount2" tabindex="-1" aria-labelledby="SureStartCompanyCount2"
aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<!-- <label class="topic">停用勾選公司</label> -->
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body Addcont">
<div class="message-group mt-5">
<label class="title"><span class="text-danger">A公司</span>、<span class="text-danger">B公司</span>因已到期無法啟用，請前往編輯頁面修改到期日期</label>
</div>
<div class="message-group mt-5">
<label class="title"><span class="text-danger">A公司</span>、<span class="text-danger">B公司</span>因在導入中無法啟用，請前往編輯頁面修改交付日期</label>
</div>
<!-- -->
<div class="form-group mt-5">
<div class="d-flex justify-content-center">
<button type="button" class="btn btn-wt mr-3" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-wt blue" data-toggle="modal" data-dismiss="modal" data-target="#StartCompanyModal">確定</button>
</div>
</div>
<!-- -->
</div>
<div class="modal-footer">
</div>
</div>
</div>
</div>
<!--確定啟用公司 -->
<!-- js files -->
<script type="text/javascript" src="js/jquery.js"></script>
......
index.html
View file @ 8cd8801b
......@@ -811,7 +811,7 @@
<!-- 新增管理員帳號 -->
<div class="modal fade" id="addAdminCount" tabindex="-1" aria-labelledby="addAdminCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">新增管理員帳號</label>
......@@ -992,7 +992,7 @@
<!-- 修改管理員帳號 -->
<div class="modal fade" id="EditAdminCount" tabindex="-1" aria-labelledby="EditAdminCount" aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">修改管理員帳號</label>
......@@ -1184,7 +1184,7 @@
<!-- 新增角色 -->
<div class="modal fade" id="addRoleCount" tabindex="-1" aria-labelledby="addRoleCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">新增角色</label>
......@@ -1268,7 +1268,7 @@
<!-- 編輯角色 -->
<div class="modal fade" id="EditRoleCount" tabindex="-1" aria-labelledby="EditRoleCount"
aria-hidden="true">
<div class="modal-dialog modal-sm0 modal-dialog-centered0 modal-adminSchool modal-message">
<div class="modal-dialog modal-dialog-centered modal-message">
<div class="modal-content">
<div class="modal-header">
<label class="topic">編輯角色</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment