vivian520121 7 years ago
parent
commit
b1bac0adc1

+ 9 - 0
.project

xqd
@@ -24,5 +24,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1519887087290</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

+ 3 - 3
pages/Engineering/creat_table.html

xqd
@@ -91,9 +91,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class=

+ 3 - 3
pages/Engineering/create.html

xqd
@@ -101,9 +101,9 @@
          	<a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 2 - 3
pages/Engineering/index.html

xqd
@@ -100,9 +100,8 @@
          <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+           <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
           </ul>
         </li>
          <li class="treeview">

+ 3 - 3
pages/Engineering/supper_add.html

xqd
@@ -102,9 +102,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 3 - 3
pages/Engineering/table_detail.html

xqd
@@ -101,9 +101,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+           <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 22 - 4
pages/give/give.html

xqd xqd
@@ -100,9 +100,9 @@
          <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">
@@ -230,7 +230,25 @@
                     </div>
                    
                 </div> 
-               
+                <div class="box-footer">
+                      <div class="container-fluid no-padding">
+                                    <div class="pagination col-md-12 text-center no-padding">
+                                        <ul class="pagination">
+                                            <li><a href="#"><i class="fa  fa-fast-backward"></i></a></li>
+                                            <li class=""><a href="#">上一页</a></li>
+                                            <li class=""><a href="#">1</a></li>
+                                            <li class=""><a href="#">2</a></li>
+                                            <li class=""><a href="#">3</a></li>
+                                            <li><a href="#">下一页</a></li>
+                                            <li><a href="#"><i class="fa fa-fast-forward"></i></a></li>
+   <li class=""><a href="#">(1/2)</a></li>
+                                            <li><input style="min-width:80px;" type="number" class="input form-control"></li>
+                                            <li><a href="" onclick="">Go</a></li>
+                                                                                     
+                                        </ul>
+                                    </div>
+                                </div>
+        </div>
             </div> 
             
       </div>

+ 3 - 3
pages/give/give_note.html

xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 3 - 3
pages/give/note_detail.html

xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 2 - 3
pages/goods/advice_note.html

xqd
@@ -100,9 +100,8 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+           <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
           </ul>
         </li>
          <li class="treeview">

+ 3 - 3
pages/goods/creat_goods.html

xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 3 - 3
pages/goods/goods_table.html

xqd
@@ -105,9 +105,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 4 - 4
pages/home/index.html

xqd xqd
@@ -19,7 +19,7 @@
 </head>
 <body class="hold-transition skin-blue sidebar-mini">
 	<style>
-		.pagination ul > li > input {
+  .pagination ul > li > input {
     vertical-align: top;
     -webkit-border-radius: 0;
     -moz-border-radius: 0;
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 22 - 4
pages/homework/homework.html

xqd xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">
@@ -245,7 +245,25 @@
                     </div>
                    
                 </div> 
-               
+                <div class="box-footer">
+                         <div class="container-fluid no-padding">
+                                    <div class="pagination col-md-12 text-center no-padding">
+                                        <ul class="pagination">
+                                            <li><a href="#"><i class="fa  fa-fast-backward"></i></a></li>
+                                            <li class=""><a href="#">上一页</a></li>
+                                            <li class=""><a href="#">1</a></li>
+                                            <li class=""><a href="#">2</a></li>
+                                            <li class=""><a href="#">3</a></li>
+                                            <li><a href="#">下一页</a></li>
+                                            <li><a href="#"><i class="fa fa-fast-forward"></i></a></li>
+   <li class=""><a href="#">(1/2)</a></li>
+                                            <li><input style="min-width:80px;" type="number" class="input form-control"></li>
+                                            <li><a href="" onclick="">Go</a></li>
+                                                                                     
+                                        </ul>
+                                    </div>
+                                </div>
+        </div>
             </div> 
              <br>
              <div class="form-actions">

+ 3 - 3
pages/homework/write.html

xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">

+ 22 - 4
pages/house/house.html

xqd xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">
@@ -256,7 +256,25 @@
                     </div>
                    
                 </div> 
-               
+                 <div class="box-footer">
+      <div class="container-fluid no-padding">
+                                    <div class="pagination col-md-12 text-center no-padding">
+                                        <ul class="pagination">
+                                            <li><a href="#"><i class="fa  fa-fast-backward"></i></a></li>
+                                            <li class=""><a href="#">上一页</a></li>
+                                            <li class=""><a href="#">1</a></li>
+                                            <li class=""><a href="#">2</a></li>
+                                            <li class=""><a href="#">3</a></li>
+                                            <li><a href="#">下一页</a></li>
+                                            <li><a href="#"><i class="fa fa-fast-forward"></i></a></li>
+   <li class=""><a href="#">(1/2)</a></li>
+                                            <li><input style="min-width:80px;" type="number" class="input form-control"></li>
+                                            <li><a href="" onclick="">Go</a></li>
+                                                                                     
+                                        </ul>
+                                    </div>
+                                </div>
+        </div>
             </div> 
              <br>
              <div class="form-actions">

+ 26 - 8
pages/labor/Material_requisition.html

xqd xqd xqd xqd
@@ -101,8 +101,8 @@
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
           <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">
@@ -136,7 +136,7 @@
   
     <section class="content-header">
       <h1>
-       领料单
+       用料计划表
         <small>Control panel</small>
       </h1>
       <ol class="breadcrumb">
@@ -149,14 +149,14 @@
     <section class="content">
       <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">领料单</h3>
+                    <h3 class="box-title">用料计划表</h3>
                 </div>
                 <div class="container-fluid">
                     <div class="box-header">筛选条件</div>
                     <div class="row title-header">
                     	<div class="col-md-3">
-                            <label class="">领料单名称:</label>
-                            <input placeholder="请输入领料单编号" type="text" class="form-control">
+                            <label class="">用料计划表编号或名称:</label>
+                            <input placeholder="请输入用料计划表编号或名称" type="text" class="form-control">
                         </div>
                         <div class="col-md-1">
                             <br>
@@ -244,11 +244,29 @@
                     </div>
                    
                 </div> 
-               
+                <div class="box-footer">
+                     <div class="container-fluid no-padding">
+                                    <div class="pagination col-md-12 text-center no-padding">
+                                        <ul class="pagination">
+                                            <li><a href="#"><i class="fa  fa-fast-backward"></i></a></li>
+                                            <li class=""><a href="#">上一页</a></li>
+                                            <li class=""><a href="#">1</a></li>
+                                            <li class=""><a href="#">2</a></li>
+                                            <li class=""><a href="#">3</a></li>
+                                            <li><a href="#">下一页</a></li>
+                                            <li><a href="#"><i class="fa fa-fast-forward"></i></a></li>
+   <li class=""><a href="#">(1/2)</a></li>
+                                            <li><input style="min-width:80px;" type="number" class="input form-control"></li>
+                                            <li><a href="" onclick="">Go</a></li>
+                                                                                     
+                                        </ul>
+                                    </div>
+                                </div>
+        </div>
             </div> 
              <br>
              <div class="form-actions">
-                  <a href="write.html"><input type="submit" value="确定" class="btn btn-success"></a>
+                  <a href="write.html"><input type="submit" value="生成领料单" class="btn btn-success"></a>
              </div>
       </div>
     <!-- /.content -->

+ 0 - 297
pages/labor/ODO.html

xqd
@@ -1,297 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>物资台账系统</title>
-  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-  <link rel="stylesheet" href="../../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../../dist/css/font-awesome.min.css">
-  <link rel="stylesheet" href="../../dist/css/ionicons.min.css">
-  <link rel="stylesheet" href="../../dist/css/admin.css">
-  <link rel="stylesheet" href="../../dist/css/skins/_all-skins.min.css">
-  <link rel="stylesheet" href="../../plugins/iCheck/flat/blue.css">
-  <link rel="stylesheet" href="../../plugins/morris/morris.css">
-  <link rel="stylesheet" href="../../plugins/jvectormap/jquery-jvectormap-1.2.2.css">
-  <link rel="stylesheet" href="../../plugins/datepicker/datepicker3.css">
-  <link rel="stylesheet" href="../../plugins/daterangepicker/daterangepicker-bs3.css">
-  <link rel="stylesheet" href="../../plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css">
-</head>
-<body class="hold-transition skin-blue sidebar-mini">
-	<style>
-	.pagination ul > li > input {
-    vertical-align: top;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    height: auto;
-    margin-bottom: 0px;
-    background-color: #fff;
-    border-left-width: 0;
-    width: 40px;
-    float: left;
-    min-height: auto;
-	</style>
-<div class="wrapper">
-  <header id="page1">
-   </header>
-  <aside class="main-sidebar">
-
-    <section class="sidebar">
-      <div class="user-panel">
-        <div class="pull-left image">
-          <img src="../../dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
-        </div>
-        <div class="pull-left info">
-          <p>贺智强</p>
-          <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
-        </div>
-      </div>
-      <!-- search form -->
-      <form action="#" method="get" class="sidebar-form">
-        <div class="input-group">
-          <input type="text" name="q" class="form-control" placeholder="Search...">
-              <span class="input-group-btn">
-                <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>
-                </button>
-              </span>
-        </div>
-      </form>
-      <!-- /.search form -->
-      <!-- sidebar menu: : style can be found in sidebar.less -->
-        <ul class="sidebar-menu">
-        <li class="header">MAIN NAVIGATION</li>
-        <li class="treeview ">
-          <a href="../../pages/home/index.html">
-            <i class="fa fa-dashboard "></i> <span>首页</span> 
-          </a>
-        </li>
-        <li class="treeview">
-          <a href="../../pages/Engineering/create.html">
-            <i class="fa fa-dashboard"></i> <span>工程部</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/Engineering/create.html"><i class="fa fa-circle-o"></i> 项目管理</a></li>
-            <li><a href="../../pages/Engineering/index.html"><i class="fa fa-circle-o"></i> 备料计划表</a></li>
-          </ul>
-        </li>
-     
-       <li class="treeview">
-          <a href="../../pages/goods/goods_table.html">
-            <i class="fa fa-dashboard"></i> <span>物资部</span>
-          </a>
-        </li>
-       <li class="treeview">
-          <a href="../../pages/give/give.html">
-            <i class="fa fa-dashboard"></i> <span>供货商</span>
-          </a>
-        </li>
-        <li class="treeview">
-          <a href="../../pages/house/house.html">
-            <i class="fa fa-dashboard"></i> <span>库房</span>
-          </a>
-        </li>
-         <li class="treeview  ">
-          <a href="../../pages/homework/homework.html">
-            <i class="fa fa-dashboard"></i> <span>作业队</span> 
-          </a>
-        </li>
-         <li class="treeview active">
-          <a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
-          </ul>
-        </li>
-         <li class="treeview">
-           <a href="../../pages/message/message.html">
-            <i class="fa fa-dashboard"></i> <span>消息通知</span> 
-          </a>
-        </li>
-         <li class="treeview">
-          <a href="#">
-            <i class="fa fa-dashboard"></i> <span>系统设置</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统用户</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统角色</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统权限</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统日志</a></li>
-          </ul>
-        </li>
-         <li class="treeview">
-          <a href="#">
-            <i class="fa fa-dashboard"></i> <span>数据备份</span> 
-          </a>
-        </li>
-      </ul>
-    </section>
-    <!-- /.sidebar -->
-  </aside>
-
-  <!-- Content Wrapper. Contains page content -->
-  <div class="content-wrapper">
-  
-    <section class="content-header">
-      <h1>
-       出库单
-        <small>Control panel</small>
-      </h1>
-      <ol class="breadcrumb">
-        <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-        <li class="active">作业队</li>
-      </ol>
-    </section>
-
-    <!-- Main content -->
-    <section class="content">
-      <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">出库单</h3>
-                </div>
-                <div class="container-fluid">
-                    <div class="box-header">筛选条件</div>
-                    <div class="row title-header">
-                    	<div class="col-md-3">
-                            <label class="">出库单编号:</label>
-                            <input placeholder="请输入出库单编号" type="text" class="form-control">
-                        </div>
-                        <div class="col-md-1">
-                            <br>
-                            <a class="" href=""><i class="fa fa-search"></i></a>
-                        </div>
-                    </div>
-                    <div class="box-body no-padding">
-                        <div class="table-responsive col-md-12 no-padding">
-                            <table class="table mb30">
-                                <thead>
-                                <tr>
-                                 <th></th>
-                                  <th>序号</th>
-                                    <th>材料</th>
-                                    <th>编号</th>
-                                    <th>数量</th>
-                                    <th>单位</th>
-                                    <th>作业队A</th> 
-                                    <th></th> 
-       
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                 	<td><input type="checkbox"></td>
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td>LS-PE25</td>
-                                    <td>50</td>
-                                    <td>米</td>
-                                    
-                                    <td>10</td>
-                                    <td><a href="detail2.html" class="btn btn-primary">查看详情</a></td>
-                                </tr> 
-                                 <tr>
-                                 	<td><input type="checkbox"></td>
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td>LS-PE25</td>
-                                    <td>50</td>
-                                    <td>米</td>
-                                    
-                                    <td>10</td>
-                                    <td><a href="detail2.html" class="btn btn-primary">查看详情</a></td>
-                                </tr> 
-                                  <tr>
-                                 	<td><input type="checkbox"></td>
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td>LS-PE25</td>
-                                    <td>50</td>
-                                    <td>米</td>
-                                    
-                                    <td>10</td>
-                                    <td><a href="detail2.html" class="btn btn-primary">查看详情</a></td>
-                                </tr> 
-                                <tr>
-                                 	<td><input type="checkbox"></td>
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td>LS-PE25</td>
-                                    <td>50</td>
-                                    <td>米</td>
-                                    
-                                    <td>10</td>
-                                    <td><a href="detail2.html" class="btn btn-primary">查看详情</a></td>
-                                </tr> 
-                                
-                                 <tr>
-                                 	<td><input type="checkbox"></td>
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td>LS-PE25</td>
-                                    <td>50</td>
-                                    <td>米</td>
-                                    
-                                    <td>10</td>
-                                   <td><a href="creat_goods.html" class="btn btn-primary">查看详情</a></td>
-                                </tr> 
-                                </tbody>
-                            </table>
-                                
-                        </div>
-                        
-                    </div>
-                   
-                </div> 
-               
-            </div> 
-             <br>
-             <div class="form-actions">
-                  <a href="write.html"><input type="submit" value="确定" class="btn btn-success"></a>
-             </div>
-      </div>
-    <!-- /.content -->
- 
-  <!-- /.content-wrapper -->
-  <footer class="main-footer">
-    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.3
-    </div>
-    <strong>Copyright © 2014-2018<a href="http://almsaeedstudio.com">思维定制</a>.</strong> All rights
-    reserved.
-   </footer>
-
-  <div class="control-sidebar-bg"></div>
-</div>
-<script src="../../plugins/jQuery/jQuery-2.2.0.min.js"></script>
-<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
-<script>
-  $.widget.bridge('uibutton', $.ui.button);
-</script>
-<script src="../../bootstrap/js/bootstrap.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
-<script src="../../plugins/morris/morris.min.js"></script>
-<script src="../../plugins/sparkline/jquery.sparkline.min.js"></script>
-<script src="../../plugins/jvectormap/jquery-jvectormap-1.2.2.min.js"></script>
-<script src="../../plugins/jvectormap/jquery-jvectormap-world-mill-en.js"></script>
-<script src="../../plugins/knob/jquery.knob.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
-<script src="../../plugins/daterangepicker/daterangepicker.js"></script>
-<script src="../../plugins/datepicker/bootstrap-datepicker.js"></script>
-<script src="../../plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js"></script>
-<script src="../../plugins/slimScroll/jquery.slimscroll.min.js"></script>
-<script src="../../plugins/fastclick/fastclick.js"></script>
-<script src="../../dist/js/app.min.js"></script>
-<script src="../../dist/js/pages/dashboard.js"></script>
-<script src="../../dist/js/demo.js"></script>
-<script>
-          $("#page1").load("../../pages/header/header.html");
-</script>
-</body>
-</html>
-
-
-
-
-

+ 6 - 6
pages/labor/detail1.html

xqd xqd xqd xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview">
@@ -136,7 +136,7 @@
   
     <section class="content-header">
       <h1>
-      领料单
+     用料计划表
         <small>Control panel</small>
       </h1>
       <ol class="breadcrumb">
@@ -149,7 +149,7 @@
     <section class="content">
       <div class="box">
                 <div class="box-header with-border">
-                    <h3 class="box-title">领料单(LS-PE25)</h3>
+                    <h3 class="box-title">用料计划表(LS-PE25)</h3>
                 </div>
                 <div class="container-fluid">
                     <div class="box-body no-padding">
@@ -215,7 +215,7 @@
             </div> 
              <br>
              <div class="form-actions">
-                  <a href="write.html"><input type="submit" value="确定" class="btn btn-success"></a>
+                  <a href="write.html"><input type="submit" value="生成领料单" class="btn btn-success"></a>
              </div>
       </div>
     <!-- /.content -->

+ 0 - 263
pages/labor/detail2.html

xqd
@@ -1,263 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>物资台账系统</title>
-  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-  <link rel="stylesheet" href="../../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../../dist/css/font-awesome.min.css">
-  <link rel="stylesheet" href="../../dist/css/ionicons.min.css">
-  <link rel="stylesheet" href="../../dist/css/admin.css">
-  <link rel="stylesheet" href="../../dist/css/skins/_all-skins.min.css">
-  <link rel="stylesheet" href="../../plugins/iCheck/flat/blue.css">
-  <link rel="stylesheet" href="../../plugins/morris/morris.css">
-  <link rel="stylesheet" href="../../plugins/jvectormap/jquery-jvectormap-1.2.2.css">
-  <link rel="stylesheet" href="../../plugins/datepicker/datepicker3.css">
-  <link rel="stylesheet" href="../../plugins/daterangepicker/daterangepicker-bs3.css">
-  <link rel="stylesheet" href="../../plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css">
-</head>
-<body class="hold-transition skin-blue sidebar-mini">
-	<style>
-	.pagination ul > li > input {
-    vertical-align: top;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    height: auto;
-    margin-bottom: 0px;
-    background-color: #fff;
-    border-left-width: 0;
-    width: 40px;
-    float: left;
-    min-height: auto;
-	</style>
-<div class="wrapper">
-  <header id="page1">
-   </header>
-  <aside class="main-sidebar">
-
-    <section class="sidebar">
-      <div class="user-panel">
-        <div class="pull-left image">
-          <img src="../../dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
-        </div>
-        <div class="pull-left info">
-          <p>贺智强</p>
-          <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
-        </div>
-      </div>
-      <!-- search form -->
-      <form action="#" method="get" class="sidebar-form">
-        <div class="input-group">
-          <input type="text" name="q" class="form-control" placeholder="Search...">
-              <span class="input-group-btn">
-                <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>
-                </button>
-              </span>
-        </div>
-      </form>
-      <!-- /.search form -->
-      <!-- sidebar menu: : style can be found in sidebar.less -->
-        <ul class="sidebar-menu">
-        <li class="header">MAIN NAVIGATION</li>
-        <li class="treeview ">
-          <a href="../../pages/home/index.html">
-            <i class="fa fa-dashboard "></i> <span>首页</span> 
-          </a>
-        </li>
-        <li class="treeview">
-          <a href="../../pages/Engineering/create.html">
-            <i class="fa fa-dashboard"></i> <span>工程部</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/Engineering/create.html"><i class="fa fa-circle-o"></i> 项目管理</a></li>
-            <li><a href="../../pages/Engineering/index.html"><i class="fa fa-circle-o"></i> 备料计划表</a></li>
-          </ul>
-        </li>
-     
-       <li class="treeview">
-          <a href="../../pages/goods/goods_table.html">
-            <i class="fa fa-dashboard"></i> <span>物资部</span>
-          </a>
-        </li>
-       <li class="treeview">
-          <a href="../../pages/give/give.html">
-            <i class="fa fa-dashboard"></i> <span>供货商</span>
-          </a>
-        </li>
-        <li class="treeview">
-          <a href="../../pages/house/house.html">
-            <i class="fa fa-dashboard"></i> <span>库房</span>
-          </a>
-        </li>
-         <li class="treeview  ">
-          <a href="../../pages/homework/homework.html">
-            <i class="fa fa-dashboard"></i> <span>作业队</span> 
-          </a>
-        </li>
-         <li class="treeview active">
-          <a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
-          </ul>
-        </li>
-         <li class="treeview">
-           <a href="../../pages/message/message.html">
-            <i class="fa fa-dashboard"></i> <span>消息通知</span> 
-          </a>
-        </li>
-         <li class="treeview">
-          <a href="#">
-            <i class="fa fa-dashboard"></i> <span>系统设置</span> <i class="fa fa-angle-left pull-right"></i>
-          </a>
-          <ul class="treeview-menu">
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统用户</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统角色</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统权限</a></li>
-            <li><a href="index.html"><i class="fa fa-circle-o"></i> 系统日志</a></li>
-          </ul>
-        </li>
-         <li class="treeview">
-          <a href="#">
-            <i class="fa fa-dashboard"></i> <span>数据备份</span> 
-          </a>
-        </li>
-      </ul>
-    </section>
-    <!-- /.sidebar -->
-  </aside>
-
-  <!-- Content Wrapper. Contains page content -->
-  <div class="content-wrapper">
-  
-    <section class="content-header">
-      <h1>
-      出库单
-        <small>Control panel</small>
-      </h1>
-      <ol class="breadcrumb">
-        <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-        <li class="active">劳务人员</li>
-      </ol>
-    </section>
-
-    <!-- Main content -->
-    <section class="content">
-      <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">出库单(LS-PE25)</h3>
-                </div>
-                <div class="container-fluid">
-                    <div class="box-body no-padding">
-                        <div class="table-responsive col-md-12 no-padding">
-                            <table class="table mb30">
-                                <thead>
-                                <tr>
-                                  <th>序号</th>
-                                    <th>材料</th>
-                                    <th>数量</th>
-                                    <th>单位</th>
-                                    <th>备注</th>        
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                 	
-                                 	<td>1</td>
-                                    <td>联塑PE25</td>
-                                    <td><input  style="width: 60px;border: 0;" type="text" value="10"></td>
-                                    <td>米</td>
-                                    <td>作业队A</td>
-                                   
-                                </tr> 
-                                 <tr>
-                                 	<td>2</td>
-                                    <td>联塑PE25</td>
-                                    <td><input  style="width: 60px;border: 0;" type="text" value="10"></td>
-                                    <td>米</td>
-                                    <td>作业队A</td>
-                                </tr> 
-                                  <tr>
-                                 	<td>3</td>
-                                    <td>联塑PE25</td>
-                                    <td><input  style="width: 60px;border: 0;" type="text" value="10"></td>
-                                    <td>米</td>
-                                    <td>作业队A</td>
-                                </tr> 
-                                <tr>
-                                 	<td>4</td>
-                                    <td>联塑PE25</td>
-                                    <td><input  style="width: 60px;border: 0;" type="text" value="10"></td>
-                                    <td>米</td>
-                                    <td>作业队A</td>
-                                </tr> 
-                                
-                                 <tr>
-                                 <td>5</td>
-                                    <td>联塑PE25</td>
-                                    <td><input  style="width: 60px;border: 0;" type="text" value="10"></td>
-                                    <td>米</td>
-                                    <td>作业队A</td>
-                                </tr> 
-                                </tbody>
-                            </table>
-                                
-                        </div>
-                        
-                    </div>
-                   
-                </div> 
-               
-            </div> 
-             <br>
-             <div class="form-actions">
-                  <a href="write.html"><input type="submit" value="确定" class="btn btn-success"></a>
-             </div>
-      </div>
-    <!-- /.content -->
- 
-  <!-- /.content-wrapper -->
-  <footer class="main-footer">
-    <div class="pull-right hidden-xs">
-      <b>Version</b> 2.3.3
-    </div>
-    <strong>Copyright © 2014-2018<a href="http://almsaeedstudio.com">思维定制</a>.</strong> All rights
-    reserved.
-   </footer>
-
-  <div class="control-sidebar-bg"></div>
-</div>
-<script src="../../plugins/jQuery/jQuery-2.2.0.min.js"></script>
-<script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
-<script>
-  $.widget.bridge('uibutton', $.ui.button);
-</script>
-<script src="../../bootstrap/js/bootstrap.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
-<script src="../../plugins/morris/morris.min.js"></script>
-<script src="../../plugins/sparkline/jquery.sparkline.min.js"></script>
-<script src="../../plugins/jvectormap/jquery-jvectormap-1.2.2.min.js"></script>
-<script src="../../plugins/jvectormap/jquery-jvectormap-world-mill-en.js"></script>
-<script src="../../plugins/knob/jquery.knob.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
-<script src="../../plugins/daterangepicker/daterangepicker.js"></script>
-<script src="../../plugins/datepicker/bootstrap-datepicker.js"></script>
-<script src="../../plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js"></script>
-<script src="../../plugins/slimScroll/jquery.slimscroll.min.js"></script>
-<script src="../../plugins/fastclick/fastclick.js"></script>
-<script src="../../dist/js/app.min.js"></script>
-<script src="../../dist/js/pages/dashboard.js"></script>
-<script src="../../dist/js/demo.js"></script>
-<script>
-          $("#page1").load("../../pages/header/header.html");
-</script>
-</body>
-</html>
-
-
-
-

+ 3 - 3
pages/message/message.html

xqd
@@ -100,9 +100,9 @@
           <a href="../../pages/labor/Material_requisition.html">
             <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
           </a>
-          <ul class="treeview-menu">
-            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 领料单</a></li>
-            <li><a href="../../pages/labor/ODO.html"><i class="fa fa-circle-o"></i> 出库单</a></li>
+            <ul class="treeview-menu">
+            <li><a href="../../pages/labor/Material_requisition.html"><i class="fa fa-circle-o"></i> 用料计划表</a></li>
+
           </ul>
         </li>
          <li class="treeview active">