Home Verkennen Help
Inloggen
S.H.I.E.L.D.
/
CLD-mobile
2
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

增加请假销假和撤销内容

outaozhen 6 jaren geleden
bovenliggende
09aa9c849a
commit
f9bacc4392
11 gewijzigde bestanden met toevoegingen van 446 en 1 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 16 0
      css/sui/global.css
  2. 16 0
      holidayDetail.html
  3. 23 0
      holidayDetailPage.html
  4. 75 0
      holidayIndexType.html
  5. 62 0
      holidayListDetail.html
  6. 96 0
      holidayListDetailPageBack.html
  7. 51 0
      holidayListDetailPageRevoke.html
  8. 23 0
      invoiceAdd.html
  9. 60 0
      invoiceAddTrain.html
  10. 23 0
      js/sui/global.js
  11. 1 1
      mainIndex.html

+ 16 - 0
css/sui/global.css
Bestand weergeven 

@@ -51,15 +51,31 @@
 
   padding:0.5rem;
 
   background:#F2DEDE;
 
 }
 
+.bg{
 
+  margin:0 0 1rem 0;
 
+  padding:0.5rem;
 
+}
 
 .bg-Orange{
 
   background:#fcf8e3 !important;
 
 }
 
+.bg-Red{
 
+  background:#ffc9c9 !important;
 
+}
 
+.bg-Yellow{
 
+  background:#ffe2cf !important;
 
+}
 
 .btn-Orange{
 
   background:#ffa132 !important;
 
 }
 
 .button-gray{
 
   background:#535353 !important;
 
 }
 
+.button-Red{
 
+  background:#ff2222 !important;
 
+}
 
+.button-Yellow{
 
+  background:#ff781f !important;
 
+}
 
 .formlabel{
 
   color: #3d4145;
 
 }

+ 16 - 0
holidayDetail.html
Bestand weergeven 

@@ -58,6 +58,22 @@
 
                             <a href="holidayDetailPage.html" class="item-link item-content">
 
                                 <div class="item-inner">
 
                                     <div class="item-title-row">
 
+                                        <div class="item-title">欧桃珍事假【1天】</div>
 
+                                        <div class="item-after">同意</div>
 
+                                    </div>
 
+                                    <div class="item-subtitle">2017-02-16 至 2017-02-16</div>
 
+                                    <div class="item-text">事假原因</div>
 
+                                </div>
 
+                            </a>
 
+                        </li>
 
+                    </ul>
 
+                </div>
 
+                <div class="list-block media-list">
 
+                    <ul>
 
+                        <li>
 
+                            <a href="holidayDetailPage.html" class="item-link item-content">
 
+                                <div class="item-inner">
 
+                                    <div class="item-title-row">
 
                                         <div class="item-title">欧桃珍年假【1天】</div>
 
                                         <div class="item-after">同意</div>
 
                                     </div>

+ 23 - 0
holidayDetailPage.html
Bestand weergeven 

@@ -35,7 +35,30 @@
 
                     <span class="badge">2</span>
 
                 </a>
 
             </nav>
 
+            <div class="bar bar-header-secondary barBig">
 
+                <div class="row" style="overflow: inherit;">
 
+                  <div class="col-50"><a href="holidayListDetailPageRevoke.html" class="button button-big button-block button-fill button-Red">撤销</a></div>
 
+                  <div class="col-50"><a href="holidayListDetailPageBack.html" class="button button-big button-block button-fill button-Yellow">销假</a></div>
 
+                </div>
 
+            </div>
 
             <div class="content">
 
+                <div class="content-block-title">撤销和销假说明</div>
 
+                <div class="list-block">
 
+                    <ul>
 
+                        <li class="item-content">
 
+                            <div class="item-inner">
 
+                                <div class="item-title">撤销</div>
 
+                                <div class="item-after">假如您请假选成了事假，你实际需要请的是病假，可以撤销请假</div>
 
+                            </div>
 
+                        </li>
 
+                        <li class="item-content">
 
+                            <div class="item-inner">
 
+                                <div class="item-title">销假</div>
 
+                                <div class="item-after">假如你请假请了1天，你只休了0.5天，可以选择销假0.5天</div>
 
+                            </div>
 
+                        </li>
 
+                    </ul>
 
+                </div>
 
                 <div class="content-block-title">详情</div>
 
                 <div class="list-block">
 
                     <ul>

+ 75 - 0
holidayIndexType.html
Bestand weergeven 

@@ -0,0 +1,75 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta charset=utf-8> 
+    <title>CLD.System</title> 
+    <link rel="shortcut icon" href="images/favicon.ico"> 
+    <meta name=copyright content=smartcost.com.cn> 
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
 
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+    <link rel="stylesheet" href="css/sui/sm.css">
 
+    <link rel="stylesheet" href="css/sui/sm-extend.css">
 
+    <link rel="stylesheet" href="css/sui/global.css">
 
+    <link rel="stylesheet" href="css/AirDate/datepicker.min.css">
 
+    
+  </head>
 
+  <body>
 
+    <div class="page-group">
 
+        <div class="page page-current">
 
+          <header class="bar bar-nav">
 
+              <a class="icon icon-left pull-left" href="mainIndex.html"></a>
 
+              <h1 class="title holidayTBg">请假</h1>
 
+          </header>
 
+            <nav class="bar bar-tab">
 
+                <a class="tab-item external active" href="holidayIndexDetail.html">
 
+                    <!-- <span class="icon icon-edit"></span> -->
 
+                    <span class="tab-label">请假申请</span>
 
+                </a>
 
+                <a class="tab-item external " href="holidayDetail.html">
 
+                    <!-- <span class="icon icon-me"></span> -->
 
+                    <span class="tab-label">我的假条</span>
 
+                </a>
 
+                <a class="tab-item external " href="holidayListDetail.html">
 
+                    <!-- <span class="icon icon-menu"></span> -->
 
+                    <span class="tab-label">假条审批</span>
 
+                    <span class="badge">2</span>
 
+                </a>
 
+            </nav>
 
+            <div class="content">
 
+               <div class="content-block">
 
+                <div class="content-block-title">请选择假期类型</div>
 
+                <p><a href="#" class="button">事假</a></p>
 
+                <p><a href="holidayIndexDetail.html" class="button button-fill">事假</a></p>
 
+                <p><a href="#" class="button">病假</a></p>
 
+                <p><a href="#" class="button">年假</a></p>
 
+                <p><a href="#" class="button">加班</a></p>
 
+                <p><a href="#" class="button">补休</a></p>
 
+                <p><a href="holidayIndexDetailQt.html" class="button">其他</a></p>
 
+               </div>
 
+            </div>
 
+        </div>
 
+
 
+        <div class="popup popup-aboutTime">
 
+          <div class="content-block m-0">
 
+            <p>请选择请假时间</p>
 
+            <div class="datepicker-here" data-language='zh' data-multiple-dates="3"></div>
 
+            <div class="row p-1">
 
+              <div class="col-50"><a href="#" class="button button-fill btnGray btnSelf close-popup">取消</a></div>
 
+              <div class="col-50"><a href="#" class="button button-fill btnSelf close-popup">提交</a></div>
 
+            </div>
 
+          </div>
 
+        </div>
 
+    </div>
 
+
 
+        <script src="js/jquery-1.7.1.min.js"></script>
 
+        <script type="text/javascript">$.noConflict();</script>
 
+        <script type='text/javascript' src='js/sui/zepto.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm-extend.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/global.js'></script>
 
+        <script type='text/javascript' src="js/AirDate/datepicker.js"></script>
 
+        <script type='text/javascript' src="js/AirDate/datepicker.zh.js"></script>
 
+  </body>
 
+</html>

+ 62 - 0
holidayListDetail.html
Bestand weergeven 

@@ -46,6 +46,36 @@
 
                     <div id="tab1" class="tab active">
 
                         <div class="content-block pLR-n">
 
                             <div class="list-block media-list">
 
+                                <ul class="bg-Red">
 
+                                    <li>
 
+                                        <a href="holidayListDetailPage.html" class="item-link item-content">
 
+                                            <div class="item-inner">
 
+                                                <div class="item-title-row">
 
+                                                    <div class="item-title">欧桃珍事假撤销【1天】</div>
 
+                                                </div>
 
+                                                <div class="item-subtitle">2017-02-16 至 2017-02-16</div>
 
+                                                <div class="item-text">事假原因</div>
 
+                                            </div>
 
+                                        </a>
 
+                                    </li>
 
+                                </ul>
 
+                            </div>
 
+                            <div class="list-block media-list">
 
+                                <ul class="bg-Yellow">
 
+                                    <li>
 
+                                        <a href="holidayListDetailPage.html" class="item-link item-content">
 
+                                            <div class="item-inner">
 
+                                                <div class="item-title-row">
 
+                                                    <div class="item-title">欧桃珍事假销假【0.5天】</div>
 
+                                                </div>
 
+                                                <div class="item-subtitle">2017-02-16 至 2017-02-16</div>
 
+                                                <div class="item-text">事假原因</div>
 
+                                            </div>
 
+                                        </a>
 
+                                    </li>
 
+                                </ul>
 
+                            </div>
 
+                            <div class="list-block media-list">
 
                                 <ul>
 
                                     <li>
 
                                         <a href="holidayListDetailPage.html" class="item-link item-content">
 
@@ -65,6 +95,38 @@
 
                     <div id="tab2" class="tab">
 
                         <div class="content-block pLR-n">
 
                             <div class="list-block media-list">
 
+                                <ul class="bg-Red">
 
+                                    <li>
 
+                                        <a href="holidayListDetailPage1.html" class="item-link item-content">
 
+                                            <div class="item-inner">
 
+                                                <div class="item-title-row">
 
+                                                    <div class="item-title">欧桃珍撤销事假【1天】</div>
 
+                                                    <div class="item-after">同意</div>
 
+                                                </div>
 
+                                                <div class="item-subtitle">2017-02-16 至 2017-02-16</div>
 
+                                                <div class="item-text">事假原因</div>
 
+                                            </div>
 
+                                        </a>
 
+                                    </li>
 
+                                </ul>
 
+                            </div>
 
+                            <div class="list-block media-list">
 
+                                <ul class="bg-Yellow">
 
+                                    <li>
 
+                                        <a href="holidayListDetailPage1.html" class="item-link item-content">
 
+                                            <div class="item-inner">
 
+                                                <div class="item-title-row">
 
+                                                    <div class="item-title">欧桃珍销假事假【1天】</div>
 
+                                                    <div class="item-after">同意</div>
 
+                                                </div>
 
+                                                <div class="item-subtitle">2017-02-16 至 2017-02-16</div>
 
+                                                <div class="item-text">事假原因</div>
 
+                                            </div>
 
+                                        </a>
 
+                                    </li>
 
+                                </ul>
 
+                            </div>
 
+                            <div class="list-block media-list">
 
                                 <ul>
 
                                     <li>
 
                                         <a href="holidayListDetailPage1.html" class="item-link item-content">

+ 96 - 0
holidayListDetailPageBack.html
Bestand weergeven 

@@ -0,0 +1,96 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta charset=utf-8> 
+    <title>CLD.System</title> 
+    <link rel="shortcut icon" href="images/favicon.ico"> 
+    <meta name=copyright content=smartcost.com.cn> 
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
 
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+    <link rel="stylesheet" href="css/sui/sm.css">
 
+    <link rel="stylesheet" href="css/sui/sm-extend.css">
 
+    <link rel="stylesheet" href="css/sui/global.css">
 
+    
+  </head>
 
+  <body>
 
+    <div class="page-group">
 
+        <div class="page page-current">
 
+        	<header class="bar bar-nav">
 
+        	    <a href="holidayDetailPage.html" class="pull-left open-panel"><span class="icon icon-left fL"></span></a>
 
+        	    <h1 class="title">请选择销假时间</h1>
 
+        	</header>
 
+            <nav class="bar bar-tab">
 
+                <a href="holidayDetailPage.html" class="tab-item external button button-fill button-none" href="#">
 
+                    <span class="tab-label">提交</span>
 
+                </a>
 
+            </nav>
 
+            <div class="content">
 
+              <div class="content-block-title">销假原因</div>
 
+              <div class="list-block">
 
+                   <ul>
 
+                       <li class="align-top">
 
+                           <div class="item-content">
 
+                               <div class="item-inner">
 
+                                   <div class="item-title label">销假原因</div>
 
+                                   <div class="item-input">
 
+                                       <textarea class="myinput" id="myinput" style="color: rgb(169, 169, 169);"></textarea>
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                       </li>
 
+                   </ul>
 
+               </div>
 
+                <div class="content-block-title">可销假日期列表</div>
 
+               <div class="list-block">
 
+                   <ul>
 
+                       <li>
 
+                           <div class="item-content">
 
+                               <div class="item-inner">
 
+                                   <div class="item-title label">2017-02-27</div>
 
+                                   <div class="item-input">
 
+                                    <div class="row">
 
+                                      <div class="col-50">上午&nbsp;&nbsp;<label class="label-switch toast1">
 
+                                        <input type="checkbox" name="my-checkbox" checked>
 
+                                        <div class="checkbox"></div>
 
+                                      </label></div>
 
+                                      <div class="col-50">下午&nbsp;&nbsp;<label class="label-switch toast1">
 
+                                        <input type="checkbox" name="my-checkbox">
 
+                                        <div class="checkbox"></div>
 
+                                      </label></div>
 
+                                    </div>
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                       </li>
 
+                       <li>
 
+                           <div class="item-content">
 
+                               <div class="item-inner">
 
+                                   <div class="item-title label">2017-02-28</div>
 
+                                   <div class="item-input">
 
+                                    <div class="row">
 
+                                      <div class="col-50">上午&nbsp;&nbsp;<label class="label-switch toast1">
 
+                                        <input type="checkbox" name="my-checkbox">
 
+                                        <div class="checkbox"></div>
 
+                                      </label></div>
 
+                                      <div class="col-50">下午&nbsp;&nbsp;<label class="label-switch toast1">
 
+                                        <input type="checkbox" name="my-checkbox">
 
+                                        <div class="checkbox"></div>
 
+                                      </label></div>
 
+                                    </div>
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                       </li>
 
+                   </ul>
 
+               </div>               
+            </div>
 
+        </div>
 
+
 
+        <script type='text/javascript' src='js/sui/zepto.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm-extend.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/global.js'></script>
 
+  </body>
 
+</html>

+ 51 - 0
holidayListDetailPageRevoke.html
Bestand weergeven 

@@ -0,0 +1,51 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta charset=utf-8> 
+    <title>CLD.System</title> 
+    <link rel="shortcut icon" href="images/favicon.ico"> 
+    <meta name=copyright content=smartcost.com.cn> 
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
 
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+    <link rel="stylesheet" href="css/sui/sm.css">
 
+    <link rel="stylesheet" href="css/sui/sm-extend.css">
 
+    <link rel="stylesheet" href="css/sui/global.css">
 
+    
+  </head>
 
+  <body>
 
+    <div class="page-group">
 
+        <div class="page page-current">
 
+        	<header class="bar bar-nav">
 
+        	    <a href="holidayDetailPage.html" class="pull-left open-panel"><span class="icon icon-left fL"></span></a>
 
+        	    <h1 class="title">请填写撤销原因</h1>
 
+        	</header>
 
+            <nav class="bar bar-tab">
 
+                <a href="holidayDetailPage.html" class="tab-item external button button-fill button-none" href="#">
 
+                    <span class="tab-label">提交</span>
 
+                </a>
 
+            </nav>
 
+            <div class="content">
 
+                <div class="list-block media-list">
 
+                    <ul>
 
+                       <li class="align-top">
 
+                           <div class="item-content">
 
+                               <div class="item-inner">
 
+                                   <div class="item-input">
 
+                                       <textarea class="myinput" id="myinput"></textarea>
 
+                                   </div>
 
+                               </div>
 
+                           </div>
 
+                       </li>
 
+                   </ul>
 
+                </div>                
+            </div>
 
+        </div>
 
+
 
+        <script type='text/javascript' src='js/sui/zepto.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm-extend.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/global.js'></script>
 
+  </body>
 
+</html>

+ 23 - 0
invoiceAdd.html
Bestand weergeven 

@@ -324,6 +324,29 @@
 
                   </li>
 
                 </ul>
 
               </div>
 
+              <div class="content-block-title">结算方式</div>
 
+              <div class="list-block">
 
+                <ul>
 
+                  <li>
 
+                    <div class="item-content">
 
+                      <div class="item-inner">
 
+                        <div class="item-title label">结算方式</div>
 
+                        <div class="item-input">
 
+                          <input type="text" readonly="readonly" class="invoiceaccounts" placeholder="请选择结算方式">
 
+                        </div>
 
+                      </div>
 
+                    </div>
 
+                  </li>
 
+                  <li>
 
+                    <div class="item-content">
 
+                      <div class="item-inner">
 
+                        <div class="item-title label">培训班名称</div>
 
+                        <div class="item-input"><a href="invoiceAddTrain.html">请选择</a></div>
 
+                      </div>
 
+                    </div>
 
+                  </li>
 
+                </ul>
 
+              </div>
 
               <div class="content-block-title">邮寄信息</div>
 
               <div class="list-block">
 
                 <ul>

+ 60 - 0
invoiceAddTrain.html
Bestand weergeven 

@@ -0,0 +1,60 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <meta charset=utf-8> 
+    <title>CLD.System</title> 
+    <link rel="shortcut icon" href="images/favicon.ico"> 
+    <meta name=copyright content=smartcost.com.cn> 
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
 
+    <meta name="apple-mobile-web-app-capable" content="yes">
 
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
+    <link rel="stylesheet" href="css/sui/sm.css">
 
+    <link rel="stylesheet" href="css/sui/sm-extend.css">
 
+    <link rel="stylesheet" href="css/sui/global.css">
 
+    
+  </head>
 
+  <body>
 
+    <div class="page-group">
 
+        <div class="page page-current">
 
+        	<header class="bar bar-nav">
 
+        	    <a href="invoiceAdd.html" class="pull-left open-panel"><span class="icon icon-left fL"></span></a>
 
+        	    <h1 class="title">选择培训班</h1>
 
+        	</header>
 
+            <nav class="bar bar-tab">
 
+                <a href="invoiceAdd.html" class="tab-item external button button-fill button-none" href="#">
 
+                    <span class="tab-label">提交</span>
 
+                </a>
 
+            </nav>
 
+            <div class="content">
 
+                <div class="list-block media-list">
 
+                    <ul>
 
+                        <li>
 
+                            <label class="label-checkbox item-content">
 
+                                <input type="radio" name="my-radio">
 
+                                <div class="item-media"><i class="icon icon-form-checkbox"></i></div>
 
+                                <div class="item-inner">
 
+                                    2018年4月18江西省公路工程造价高级应用培训-清单培训
 
+                                </div>
 
+                            </label>
 
+                        </li>
 
+                        <li>
 
+                            <label class="label-checkbox item-content">
 
+                                <input type="radio" name="my-radio">
 
+                                <div class="item-media"><i class="icon icon-form-checkbox"></i></div>
 
+                                <div class="item-inner">
 
+                                    2018达州市第三期实战培训班
 
+                                </div>
 
+                            </label>
 
+                        </li>
 
+                    </ul>
 
+                </div>                
+            </div>
 
+        </div>
 
+
 
+        <script type='text/javascript' src='js/sui/zepto.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/sm-extend.js' charset='utf-8'></script>
 
+        <script type='text/javascript' src='js/sui/global.js'></script>
 
+  </body>
 
+</html>

+ 23 - 0
js/sui/global.js
Bestand weergeven 

@@ -626,6 +626,29 @@ $(function(){
 
 
 });
 
 
+$(document).on('click','.invoiceaccounts', function () {
 
+      var buttons1 = [
 
+        {
 
+          text: '请选择',
 
+          label: true
 
+        },
 
+        {
 
+          text: '软件销售',
 
+        },
 
+        {
 
+          text: '培训班',
 
+        }
 
+      ];
 
+      var buttons2 = [
 
+        {
 
+          text: '取消',
 
+          bg: 'danger'
 
+        }
 
+      ];
 
+      var groups = [buttons1, buttons2];
 
+      $.actions(groups);
 
+});
 
+
 
 $(document).ready(function(){
 
     //加的效果
 
     $(".add").click(function(){

+ 1 - 1
mainIndex.html
Bestand weergeven 

@@ -52,7 +52,7 @@
 
 						</a>
 
 					</li>
 
 					<li class="card mlr-0">
 
-						<a href="holidayIndexDetail.html" class="item-link item-content">
 
+						<a href="holidayIndexType.html" class="item-link item-content">
 
 							<!-- <div class="item-media"><i class="icon icon-f7"></i></div> -->
 
 							<div class="item-inner itemBinner">
 
 								<div class="item-title">请假条</div>