vivian520121 7 rokov pred
rodič
commit
5ddde40820

+ 9 - 0
dist/js/my.js

xqd
@@ -0,0 +1,9 @@
+function checkWarn() {
+	
+if ($('#homework1').is(':checked')==true){
+$('#showbox').css('display', 'block');
+}
+else {
+$('#showbox').css('display', 'none');
+}
+}

+ 10 - 2
pages/Engineering/creat_table.html

xqd xqd xqd
@@ -117,7 +117,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -155,6 +155,13 @@
   <!-- Content Wrapper. Contains page content -->
   <div class="content-wrapper">
     <!-- Content Header (Page header) -->
+    <div class="pad margin no-print">
+      <div class="callout callout-info" style="margin-bottom: 0!important;">
+        <h4><i class="fa fa-info"></i> 警告:</h4>
+        存在物资编码或者物资名称相同或者包含的信息,如下SFGS-000001,SFGS-000002,SFGS-000003 ,并联硬锚底座
+      </div>
+    </div>
+    
     <section class="content-header">
       <h1>
         导入备料计划
@@ -204,12 +211,13 @@
                                     <label class="control-label">所属项目</label>
                                     <div class="controls">
                                         <select class="form-control" name="customerType">
-                                            <option value="C_10_GROUP">2018年度台账项目</option>
+                                            <option value="C_10_GROUP">深圳地铁一号线接触网改造项目</option>
                                             
                                         </select>
                                     </div>
                                 </div>
                                   
+                                  
                                 <div class="control-group" style="margin-top: 25px;">
                                 	    <div id="fileuploader"></div>
                                 </div>

+ 1 - 1
pages/Engineering/index.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/give/give.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/give/give_note.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 15 - 2
pages/give/note_detail.html

xqd xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -279,7 +279,20 @@
                                     <td><input type="number" style="border: 0;width: 50px;" value="100"></td>
                                   	<td>JCW01-JCW-001</td>
                                 </tr>
-                              
+                                <tr>
+                               <td colspan="11">
+                              		<p>发运依据:</p>
+                              		<textarea style="width:100%;height: 100px;border: 0;"></textarea>
+                              		
+                              	</td>
+                                </tr>
+                                <tr>
+                              	<td colspan="11">
+                              		<p>发运地址/日期:</p>
+                              		<textarea style="width:100%;height: 100px;border: 0;"></textarea>
+                              		
+                              	</td>
+                              </tr>
                                 </tbody>
                             </table>
                                 

+ 1 - 1
pages/give/note_list.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 25 - 9
pages/goods/advice_note.html

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -183,14 +183,17 @@
                 </div>
                 <div class="container-fluid">
                     <div class="box-body no-padding">
-
+                <div class="col-md-3">
+                            <label class="">名称:</label>
+                            <input placeholder="请输入名称" type="text" class="form-control">
+                        </div>
                         <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>资料标准技术要求</th>
@@ -207,9 +210,9 @@
                                     <td>1</td>
                                     <td>深圳地铁一号线接触网改造项目</td>
                                     <td>JCW01-JCW-001</td>
-                                  
                                     <td>并联硬锚底座</td>
                                     <td>DTL0124(300)</td>
+                                    <td>DTL0124(300)</td>
                                     <td>套</td>
                                     <td>10</td>
                                     <td>
@@ -217,7 +220,6 @@
                                     </td>
                                     <td><input type="number"  style="border: 0;width:40px" value="1"></td>
                                   	<td><input type="text" style="border: 0"></td>				 
-
                                 </tr> 
                                 
                                 <tr>
@@ -225,7 +227,7 @@
                                     <td>1</td>
                                     <td>深圳地铁一号线接触网改造项目</td>
                                     <td>JCW01-JCW-001</td>
-                                  
+                                    <td>DTL0124(300)</td>
                                     <td>并联硬锚底座</td>
                                     <td>DTL0124(300)</td>
                                     <td>套</td>
@@ -245,6 +247,7 @@
                                   
                                     <td>并联硬锚底座</td>
                                     <td>DTL0124(300)</td>
+                                    <td>DTL0124(300)</td>
                                     <td>套</td>
                                     <td>10</td>
                                     <td>
@@ -259,9 +262,9 @@
                                     <td>1</td>
                                     <td>深圳地铁一号线接触网改造项目</td>
                                     <td>JCW01-JCW-001</td>
-                                  
                                     <td>并联硬锚底座</td>
                                     <td>DTL0124(300)</td>
+                                    <td>DTL0124(300)</td>
                                     <td>套</td>
                                     <td>10</td>
                                     <td>
@@ -276,9 +279,9 @@
                                     <td>1</td>
                                     <td>深圳地铁一号线接触网改造项目</td>
                                     <td>JCW01-JCW-001</td>
-                                  
                                     <td>并联硬锚底座</td>
                                     <td>DTL0124(300)</td>
+                                    <td>DTL0124(300)</td>
                                     <td>套</td>
                                     <td>10</td>
                                     <td>
@@ -288,7 +291,20 @@
                                   	<td><input type="text" style="border: 0"></td>				 
 
                                 </tr> 
-                              
+                                <tr>
+                              	<td colspan="11">
+                              		<p>发运依据:</p>
+                              		<textarea style="width:100%;height: 100px;border: 0;"></textarea>
+                              		
+                              	</td>
+                                </tr>
+                                <tr>
+                              	<td colspan="11">
+                              		<p>发运地址/日期:</p>
+                              		<textarea style="width:100%;height: 100px;border: 0;"></textarea>
+                              		
+                              	</td>
+                              </tr>
                                 </tbody>
                             </table>
                                 

+ 1 - 1
pages/goods/creat_goods.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/goods/give.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 8 - 1
pages/goods/goods_table.html

xqd xqd xqd xqd xqd xqd xqd
@@ -131,7 +131,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -220,6 +220,7 @@
                                     <th>表格名称</th>
                                     <th>创建时间</th>
                                     <th>状态</th>
+                                    <th></th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -230,6 +231,8 @@
                                     <td>18年1月备料计划汇总</td>
                                     <td>2016-07-23 </td>
                                     <td>已通过</td>
+                                   <td style="color: #dd4b39;">已经生成1</td>
+                                 
                                     <td>
                                          <a href="creat_goods.html" class="btn btn-primary">查看详情</a>
                            
@@ -242,6 +245,7 @@
                                     <td>18年2月备料计划汇总</td>
                                     <td>2016-07-24 </td>
                                     <td>已通过</td>
+                                   <td style="color: #dd4b39;">已经生成2</td>
                                     <td>
                                         <a href="creat_goods.html" class="btn btn-primary">查看详情</a>
                                         
@@ -253,6 +257,7 @@
                                     <td>18年3月备料计划汇总</td>
                                     <td>2016-07-24 </td>
                                     <td>已通过</td>
+                                    <td style="color: #dd4b39;">已经生成3</td>
                                     <td>
                                           <a href="creat_goods.html" class="btn btn-primary">查看详情</a>
                                         
@@ -264,6 +269,7 @@
                                     <td>18年4月备料计划汇总</td>
                                     <td>2016-07-24 </td>
                                     <td>已通过</td>
+                                    <td style="color: #dd4b39;">已经生成4</td>
                                     <td>
                                           <a href="creat_goods.html" class="btn btn-primary">查看详情</a>
                                         
@@ -275,6 +281,7 @@
                                     <td>18年5月备料计划汇总</td>
                                     <td>2016-07-24 </td>
                                     <td>已通过</td>
+                                    <td style="color: #dd4b39;">已经生成5</td>
                                     <td>
                                           <a href="creat_goods.html" class="btn btn-primary">查看详情</a>
                                         

+ 1 - 1
pages/home/index.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 2 - 2
pages/homework/detail.html

xqd xqd
@@ -128,7 +128,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -173,7 +173,7 @@
       </h1>
       <ol class="breadcrumb">
         <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-        <li class="active">劳务人员</li>
+        <li class="active">作业队领料员</li>
       </ol>
     </section>
 

+ 1 - 1
pages/homework/homework.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 2 - 2
pages/homework/note_add.html

xqd xqd
@@ -128,7 +128,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -173,7 +173,7 @@
       </h1>
       <ol class="breadcrumb">
         <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-        <li class="active">劳务人员</li>
+        <li class="active">作业队领料员</li>
       </ol>
     </section>
 

+ 1 - 1
pages/house/Stock.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/house/house.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/labor/Material_requisition.html

xqd
@@ -126,7 +126,7 @@
         </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>
+            <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>

+ 2 - 2
pages/labor/detail.html

xqd xqd
@@ -126,7 +126,7 @@
         </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>
+            <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>
@@ -171,7 +171,7 @@
       </h1>
       <ol class="breadcrumb">
         <li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-        <li class="active">劳务人员</li>
+        <li class="active">作业队领料员</li>
       </ol>
     </section>
 

+ 1 - 1
pages/labor/give_note.html

xqd
@@ -126,7 +126,7 @@
         </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>
+            <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>

+ 1 - 1
pages/message/detail.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 1 - 1
pages/message/message.html

xqd
@@ -126,7 +126,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>

+ 2 - 2
pages/organize/create.html

xqd xqd
@@ -127,7 +127,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -221,7 +221,7 @@
                                 <tbody>
                                 <tr>
                                     <td>1</td>
-                                    <td>2018年度台账项目</td>
+                                    <td>深圳地铁一号线接触网改造项目</td>
                                     <td> 
                                     	<a href="supper_add.html" class="btn btn-primary">查看详情</a>
                                         <a href="supper_add.html" class="btn btn-primary">编辑</a>

+ 118 - 3
pages/organize/supper_add.html

xqd xqd xqd xqd xqd xqd
@@ -30,6 +30,10 @@
     width: 40px;
     float: left;
     min-height: auto;
+    }
+    #showbox{
+    	display: none;
+    }
 	</style>
 </head>
 <body class="hold-transition skin-blue sidebar-mini">
@@ -128,7 +132,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>
@@ -190,7 +194,7 @@
                                 <input type="hidden" name="customerUuid" value="20160712_0945_58615">
                                 <input type="hidden" id="customerStatus" name="customerStatus" value="5">
 
-
+                                <p><a href="#">请先创建角色和账号</a></p>
                                 <div class="control-group">
                                     <label class="control-label">创建时间</label>
                                     <div class="controls">
@@ -224,12 +228,99 @@
                                         </select>
                                     </div>
                                 </div>
+                                <div class="control-group" style="margin-top: 25px;">
+                                  <div class="form-group" style="margin-right: 0px;margin-left: 0px;">
+                                	   <label class="control-label">料库</label>
+                                    <div class="checkbox">
+                                   <label>
+                                     <input type="checkbox" checked="checked">
+                                     料库a
+                                   </label>
+                                </div>
+
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" checked="checked">
+                                    料库b
+                                  </label>
+                                </div>
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" checked="checked">
+                                    料库c
+                                  </label>
+                                </div>
+                               </div>   
+                               </div>
+                               <div class="control-group" style="margin-top: 25px;">
+                                  <div class="form-group" style="margin-right: 0px;margin-left: 0px;">
+                                	   <label class="control-label">工程部主管工程师</label>
+                                    <div class="checkbox">
+                                   <label>
+                                     <input type="checkbox" checked="checked">
+                                     工程部主管工程师1
+                                   </label>
+                                </div>
+
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" checked="checked">
+                                    工程部主管工程师2
+                                  </label>
+                                </div>
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" >
+                                    工程部主管工程师3
+                                  </label>
+                                </div>
+                                 <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" >
+                                    工程部主管工程师4
+                                  </label>
+                                </div>
+                               </div>   
+                               </div>
+                               
+                                <div class="control-group" style="margin-top: 25px;">
+                                  <div class="form-group" style="margin-right: 0px;margin-left: 0px;">
+                                	   <label class="control-label">备料计划会签岗位</label>
+                                    <div class="checkbox">
+                                   <label>
+                                     <input type="checkbox" checked="checked">
+                                     工程部部长
+                                   </label>
+                                </div>
+
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" checked="checked">
+                                    物资部部长
+                                  </label>
+                                </div>
+                                <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" >
+                                    主管工程师
+                                  </label>
+                                </div>
+                                 <div class="checkbox">
+                                  <label>
+                                     <input type="checkbox" >
+                                    项目经理
+                                  </label>
+                                </div>
+                               </div>   
+                               </div>
+                               
+                               
                                 <div class="control-group" style="margin-top: 25px;">
                                 <div class="form-group" style="margin-right: 0px;margin-left: 0px;">
                                 	 <label class="control-label">作业队</label>
                                  <div class="checkbox">
                                    <label>
-                                     <input type="checkbox" checked="checked">
+                                     <input type="checkbox"  id="homework1" onclick="checkWarn();">
                                      作业队a
                                    </label>
                                 </div>
@@ -279,6 +370,29 @@
                                  </div>
                               </div>
                              </div>
+                             <div id="showbox">
+                             	<div class="control-group" style="margin-top: 25px;">
+                                    <label class="control-label">作业队1队长</label>
+                                    <div class="controls">
+                                        <select class="form-control" name="customerType">
+                                            <option value="C_10_GROUP">工程部部长</option>
+                                            <option value="C_20_BIG_COM">分管领导</option>
+                                            <option value="C_20_BIG_COM">工程师</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                 <div class="control-group" style="margin-top: 25px;">
+                                    <label class="control-label">作业队1领料员</label>
+                                    <div class="controls">
+                                        <select class="form-control" name="customerType">
+                                            <option value="C_10_GROUP">工程部部长</option>
+                                            <option value="C_20_BIG_COM">分管领导</option>
+                                            <option value="C_20_BIG_COM">工程师</option>
+                                        </select>
+                                    </div>
+                                </div>
+                             </div>
+                             
                               <div class="control-group" style="margin-top: 25px;">
                                     <label class="control-label">作业队用料计划审核人员</label>
                                     <div class="controls">
@@ -376,6 +490,7 @@
 <script src="../../dist/js/app.min.js"></script>
 <script src="../../dist/js/pages/dashboard.js"></script>
 <script src="../../dist/js/demo.js"></script>
+<script src="../../dist/js/my.js"></script>
 <script>
           $("#page1").load("../../pages/header/header.html");
 </script>

+ 1 - 1
pages/os/code.html

xqd
@@ -130,7 +130,7 @@
         </li>
          <li class="treeview">
          	<a href="../../pages/labor/Material_requisition.html">
-            <i class="fa fa-dashboard"></i> <span>劳务人员</span> <i class="fa fa-angle-left pull-right"></i>
+            <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>