commit

app/admin/controller/water/WaterCardOrder.php

@@ -73,6 +73,7 @@ class WaterCardOrder extends AuthController
         $f[] = Form::input('company', '单位');
         $f[] = Form::input('long', '长');
         $f[] = Form::input('wide', '宽');
+        $f[] = Form::radio('is_gc', '公差', 0)->options([['value' => 0, 'label' => '正常'], ['value' => 1, 'label' => '大公差']]);
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');

app/admin/controller/water/WaterMaterialScience.php

@@ -105,6 +105,7 @@ class WaterMaterialScience extends AuthController
         $f[] = Form::input('company', '单位');
         $f[] = Form::input('long', '长');
         $f[] = Form::input('wide', '宽');
+        $f[] = Form::radio('is_gc', '公差', 0)->options([['value' => 0, 'label' => '正常'], ['value' => 1, 'label' => '大公差']]);
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -137,6 +138,7 @@ class WaterMaterialScience extends AuthController
         $f[] = Form::input('weight', '重量(kg)');
         $f[] = Form::input('unit_price', '单价');
         $f[] = Form::input('company', '单位');
+        $f[] = Form::radio('is_gc', '公差', 0)->options([['value' => 0, 'label' => '正常'], ['value' => 1, 'label' => '大公差']]);
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -156,6 +158,7 @@ class WaterMaterialScience extends AuthController
             'company',
             'long',
             'wide',
+            'is_gc'
         ]);
         $validate = Validate::rule('name', 'require')->rule([
             'name' => 'require',
@@ -209,6 +212,7 @@ class WaterMaterialScience extends AuthController
         $f[] = Form::input('company', '单位', $data['company']);
         $f[] = Form::input('long', '长', $data['long']);
         $f[] = Form::input('wide', '宽', $data['wide']);
+        $f[] = Form::radio('is_gc', '公差', $data['is_gc'])->options([['value' => 0, 'label' => '正常'], ['value' => 1, 'label' => '大公差']]);
         $f[] = Form::hidden('id', $id);
         $form = Form::make_post_form('修改', $f, Url::buildUrl('update'));
         $this->assign(compact('form'));
@@ -240,6 +244,7 @@ class WaterMaterialScience extends AuthController
         $f[] = Form::input('weight', '重量(kg)', $data['weight']);
         $f[] = Form::input('unit_price', '单价', $data['unit_price']);
         $f[] = Form::input('company', '单位', $data['company']);
+        $f[] = Form::radio('is_gc', '公差', $data['is_gc'])->options([['value' => 0, 'label' => '正常'], ['value' => 1, 'label' => '大公差']]);
         $f[] = Form::hidden('id', $id);
         $form = Form::make_post_form('修改', $f, Url::buildUrl('update'));
         $this->assign(compact('form'));
@@ -267,6 +272,7 @@ class WaterMaterialScience extends AuthController
             'long',
             'wide',
             'id',
+            'is_gc'
         ]);
         $validate = Validate::rule('name', 'require')->rule([
             'name' => 'require',
@@ -291,6 +297,7 @@ class WaterMaterialScience extends AuthController
         $details['weight'] = $data['weight'];
         $details['unit_price'] = $data['unit_price'];
         $details['company'] = $data['company'];
+        $details['is_gc'] = $data['is_gc'];
         $res = $details->save();
         if ($res) return Json::successful('修改成功');
         return Json::fail('修改失败');

app/admin/view/water/water_material_science/column.php

@@ -90,6 +90,13 @@
                         辅拉
                         {{#  } }}
                     </script>
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
+                        {{#  } }}
+                    </script>
 
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edits')}?id={{d.id}}',{h:900,w:700})">
@@ -121,6 +128,7 @@
             {field: 'weight', title: '重量', align: 'center'},
             {field: 'unit_price', title: '单价', align: 'center'},
             {field: 'company', title: '单位', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/admin/view/water/water_material_science/floor.php

@@ -86,6 +86,13 @@
                         底板
                         {{#  } }}
                     </script>
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
+                        {{#  } }}
+                    </script>
 
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('create')}?id={{d.id}}',{h:900,w:900})">
@@ -119,6 +126,7 @@
             {field: 'company', title: '单位', align: 'center'},
             {field: 'long', title: '长度', align: 'center'},
             {field: 'wide', title: '宽度', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/admin/view/water/water_material_science/fula.php

@@ -84,6 +84,17 @@
                         拉筋
                         {{#  } else if(d.type == 4) { }}
                         底板
+                        {{#  } else if(d.type == 5) { }}
+                        立柱
+                        {{#  } else if(d.type == 6) { }}
+                        辅拉
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
                         {{#  } }}
                     </script>
 
@@ -117,6 +128,7 @@
             {field: 'weight', title: '重量', align: 'center'},
             {field: 'unit_price', title: '单价', align: 'center'},
             {field: 'company', title: '单位', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/admin/view/water/water_material_science/lacing.php

@@ -87,6 +87,13 @@
                         {{#  } }}
                     </script>
 
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
+                        {{#  } }}
+                    </script>
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edits')}?id={{d.id}}',{h:900,w:700})">
                             编辑
@@ -117,6 +124,7 @@
             {field: 'weight', title: '重量', align: 'center'},
             {field: 'unit_price', title: '单价', align: 'center'},
             {field: 'company', title: '单位', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/admin/view/water/water_material_science/roof.php

@@ -86,7 +86,13 @@
                         底板
                         {{#  } }}
                     </script>
-
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
+                        {{#  } }}
+                    </script>
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}',{h:900,w:900})">
                             编辑
@@ -119,6 +125,7 @@
             {field: 'company', title: '单位', align: 'center'},
             {field: 'long', title: '长度', align: 'center'},
             {field: 'wide', title: '宽度', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/admin/view/water/water_material_science/side_plate.php

@@ -87,6 +87,14 @@
                         {{#  } }}
                     </script>
 
+                    <script type="text/html" id="is_gc">
+                        {{#  if(d.is_gc == 0){ }}
+                        正常
+                        {{#  } else if(d.is_gc == 1) { }}
+                        大公差
+                        {{#  } }}
+                    </script>
+
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}',{h:900,w:700})">
                             编辑
@@ -119,6 +127,7 @@
             {field: 'company', title: '单位', align: 'center'},
             {field: 'long', title: '长度', align: 'center'},
             {field: 'wide', title: '宽度', align: 'center'},
+            {field: 'is_gc', title: '公差',templet: '#is_gc', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });