Merge branch 'master' of ssh://git.9026.com:2212/vivian520121/tielu

.idea/workspace.xml

@@ -136,7 +136,7 @@
       <find>物资部</find>
     </findStrings>
     <replaceStrings>
-      <replace>物资部</replace>
+      <replace>物机部</replace>
       <replace>creat_goods.html</replace>
       <replace>物机部</replace>
     </replaceStrings>

pages/Engineering/creat_goods.html

@@ -210,8 +210,8 @@
 
                         </div>
                        <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>

pages/Engineering/total.html

@@ -354,7 +354,7 @@
              <div class="form-actions">
                   <input type="button" value="返 回" class="btn btn-success" onclick="window.location.href=''">
                                     &nbsp;
-                  <a href="advice_note.html"><input type="submit" value="生成供货通知书" class="btn btn-success"></a>
+                  <a href="advice_note.html"></a>
              </div>
       </div>
       <!-- /.row -->