优化扩单与电子秤功能

application/admin/view/feeding/add.html

@@ -28,6 +28,28 @@
         <div class="col-xs-12 col-sm-6" id="c_bach" >
             <input id="c-bach" data-rule="required" class="form-control"  name="row[bach]" type="text">
         </div>
+
+        <!--        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>-->
+        <!--        <div class="col-xs-12 col-sm-3" id="c_bach" >-->
+        <!--            <input id="c-bach" data-rule="required" class="form-control"  name="row[bach]" type="text">-->
+        <!--        </div>-->
+        <!--        <label class="control-label col-xs-12 col-sm-2">选择电子秤</label>-->
+        <!--        <div class="col-xs-12 col-sm-3">-->
+        <!--            <select id="dzc"  class="control-label col-xs-12 col-sm-8 form-control" style="width: 100%;">-->
+        <!--                <option value= "" selected disabled>请选择电子秤</option>-->
+        <!--                <option value="COM1">电子秤一号</option>-->
+        <!--                <option value="COM2">电子秤二号</option>-->
+        <!--                <option value="COM3">电子秤三号</option>-->
+        <!--                <option value="COM4">电子秤四号</option>-->
+        <!--                <option value="COM5">电子秤五号</option>-->
+        <!--                <option value="COM6">电子秤六号</option>-->
+        <!--                <option value="COM7">电子秤七号</option>-->
+        <!--                <option value="COM8">电子秤八号</option>-->
+        <!--                <option value="COM9">电子秤九号</option>-->
+        <!--                <option value="COM10">电子秤十号</option>-->
+        <!--                <option value="COM11">电子秤十一号</option>-->
+        <!--            </select>-->
+        <!--        </div>-->
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">日期:</label>
@@ -102,7 +124,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-<!--            <button type="submit" class="btn btn-primary btn-embossed disabled option">{:__('OK')}</button>-->
+            <!--            <button type="submit" class="btn btn-primary btn-embossed disabled option">{:__('OK')}</button>-->
             <button type="button" class="btn btn-default btn-embossed print-link">打印预览</button>
         </div>
     </div>

application/admin/view/formula/task.html

@@ -110,7 +110,7 @@
                 <th class="col-xs-12 col-sm-1">原材料</th>
                 <th class="col-xs-12 col-sm-1">百分比</th>
                 <th class="col-xs-12 col-sm-1">应加量(KG)</th>
-                <th class="col-xs-12 col-sm-1">扩单后应加重量</th>
+                <th class="col-xs-12 col-sm-1">扩单重量</th>
                 <th class="col-xs-12 col-sm-6">操作记录</th>
                 <th class="col-xs-12 col-sm-1">工序号</th>
             </tr>
@@ -177,7 +177,7 @@
                 <table class="tg" style="width: 800px;" id="print_gy">
                     <tr>
                         <th  style="text-align: center;">原材料</th>
-                    <!--<th  style="text-align: center">百分比</th>-->
+                        <!--<th  style="text-align: center">百分比</th>-->
                         <th  style="text-align: center;">应加量(KG)</th>
                         <th  style="text-align: center;">实加量(KG)</th>
                         <th  style="text-align: center;">扩单后应加重量</th>
@@ -186,7 +186,7 @@
                     {foreach name='row["gyinfo"]' id='vo'}
                     <tr>
                         <td style="width: 200px;text-align: center;font-size: 18px;line-height: 100%">{$vo.material}</td>
-                    <!--<td style="width: 100px">{$vo.percentage}</td>-->
+                        <!--<td style="width: 100px">{$vo.percentage}</td>-->
                         <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center;font-size: 18px;line-height: 10px" class="tt"></td>
                         <td style="width: 100px;text-align: center;"></td>
                         <td style="width: 100px;text-align: center;" class="tty_{$vo.id}"></td>