Browse Source

刘功能优化

liuhairui 3 years ago
parent
commit
2c939fb751
2 changed files with 5 additions and 5 deletions
  1. 3 3
      application/admin/view/task/taskadd.html
  2. 2 2
      public/assets/js/backend/product.js

+ 3 - 3
application/admin/view/task/taskadd.html

@@ -67,7 +67,7 @@
             <th style="width: 150px;">{$vo.bach}</th>
             <th style="width: 350px;">{$vo.name}</th>
             <th style="width: 150px;">生产量{$vo.number}</th>
-            <th style="width: 200px;"></th>
+            <th style="width: 200px;">{$vo.machine}</th>
             <th style="display: none"></th>
         </tr>
         </thead>
@@ -196,9 +196,9 @@
                 seconds = '0'+seconds;
             }
             var now_time = year+'-'+mouth+'-'+date+' '+hours+':'+minutes+':'+seconds;
-            var img = document.getElementById("myImage"); /// get image element
+            // var img = document.getElementById("myImage"); /// get image element
             var canvas = document.getElementsByTagName('canvas')[0];
-            img.src = canvas.toDataURL();                     /// update image
+            // img.src = canvas.toDataURL();                     /// update image
             $('#time').html(now_time);
             $.print("#add-form");
             $('#qrcode').html('');

+ 2 - 2
public/assets/js/backend/product.js

@@ -109,7 +109,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                             str += "<td><input class='form-control' type='text' name='row[pname][]' readonly value='"+res.pname+"'></td>";
                             str += "<td><input class='form-control' type='text' name='row[material][]' readonly value='"+res.material+"'></td>";
                             // str += "<td><input class='form-control' type='number' name='row[weight][]' data-rule='required' value=''></td>";
-                            // str += "<td><input class='form-control' type='text' name='row[specifications][]' value='"+ (res.specifications?res.specifications:'')+"'></td>";
+                            str += "<td><input class='form-control' type='text' name='row[specifications][]' value='"+ (res.specifications?res.specifications:'')+"'></td>";
                             str += "<td><input class='form-control' type='text' name='row[unit][]'  value=''></td>";
                             str += "<td><input class='form-control' type='text' name='row[time][]' readonly value='"+res.time+"'></td>";
                             str += "<input type='hidden' value='"+i+"'>";
@@ -120,7 +120,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                         <td>${res.pname}</td>
                                         <td>${res.material}</td>
                                         <td></td>
-                                        <!--<td></td>-->
+                                        <!--<td>${res.specifications}</td>-->
                                         <!--<td></td>-->
                                     </tr>`;
                             //写入页面