commit

app/admin/controller/water/WaterDefault.php

@@ -59,68 +59,143 @@ class WaterDefault extends AuthController
         $f = [];
         $f[] = Form::input('high', '高度')->col(12);
         $f[] = Form::select('roof', '顶板', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 1)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 1)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('floor', '底板', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 4)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 4)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('column', '立柱', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 5)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 5)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
 
         $f[] = Form::select('side_plate1', '侧板1', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 2)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('side_plate2', '侧板2', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 2)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('side_plate3', '侧板3', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 2)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('side_plate4', '侧板4', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 2)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('side_plate5', '侧板5', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 2)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
 
         $f[] = Form::select('lacing1', '拉筋1', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 3)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('lacing2', '拉筋2', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 3)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('lacing3', '拉筋3', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 3)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('lacing4', '拉筋4', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 3)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('lacing5', '拉筋5', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 3)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
 
         $f[] = Form::select('fula1', '辅拉1', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('fula2', '辅拉2', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('fula3', '辅拉3', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('fula4', '辅拉4', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
         $f[] = Form::select('fula5', '辅拉5', 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 0)->where('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
+        $f[] = Form::hidden('is_gc', 0);
 
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
 
 
+    }
+
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function creates($id = 0)
+    {
+        $f = [];
+        $f[] = Form::input('high', '高度')->col(12);
+        $f[] = Form::select('roof', '顶板', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 1)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('floor', '底板', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 4)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('column', '立柱', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 5)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+
+        $f[] = Form::select('side_plate1', '侧板1', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('side_plate2', '侧板2', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('side_plate3', '侧板3', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('side_plate4', '侧板4', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('side_plate5', '侧板5', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+
+        $f[] = Form::select('lacing1', '拉筋1', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('lacing2', '拉筋2', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('lacing3', '拉筋3', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('lacing4', '拉筋4', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('lacing5', '拉筋5', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+
+        $f[] = Form::select('fula1', '辅拉1', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('fula2', '辅拉2', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('fula3', '辅拉3', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('fula4', '辅拉4', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::select('fula5', '辅拉5', 0)->options(
+            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('is_gc', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+        )->filterable(true);
+        $f[] = Form::hidden('is_gc', 1);
+        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
+        $this->assign(compact('form'));
+        return $this->fetch('public/form-builder');
+
+
     }
 
     public function save()
@@ -146,6 +221,7 @@ class WaterDefault extends AuthController
             'fula3',
             'fula4',
             'fula5',
+            'is_gc',
         ]);
         $validate = Validate::rule([
             'high' => 'require',
@@ -199,76 +275,150 @@ class WaterDefault extends AuthController
     public function edit($id = 0)
     {
         $data = model::find($id);
-        $f = [];
-        $f[] = Form::input('high', '高度', $data['high'])->col(12);
-
-
-
-        $f[] = Form::select('roof', '顶板', (string)$data['roof'])->options(
-            array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 1)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('floor', '底板', (string)$data['floor'])->options(
-            array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 4)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('column', '立柱', (string)$data['column'])->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 5)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-
-        $side_plate = explode(',', $data['side_plate']);
-        $f[] = Form::select('side_plate1', '侧板1', $side_plate[0] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('side_plate2', '侧板2', $side_plate[1] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('side_plate3', '侧板3', $side_plate[2]?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('side_plate4', '侧板4', $side_plate[3] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('side_plate5', '侧板5', $side_plate[4]?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-
-
-        $lacing = explode(',', $data['lacing']);
-        $f[] = Form::select('lacing1', '拉筋1', $lacing[0] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('lacing2', '拉筋2', $lacing[1] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('lacing3', '拉筋3', $lacing[2] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('lacing4', '拉筋4', $lacing[3] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('lacing5', '拉筋5', $lacing[4] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
+        if ($data['is_gc'] == 0){
+            $f = [];
+            $f[] = Form::input('high', '高度', $data['high'])->col(12);
+
+
+
+            $f[] = Form::select('roof', '顶板', (string)$data['roof'])->options(
+                array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 1)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('floor', '底板', (string)$data['floor'])->options(
+                array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 4)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('column', '立柱', (string)$data['column'])->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 5)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+            $side_plate = explode(',', $data['side_plate']);
+            $f[] = Form::select('side_plate1', '侧板1', $side_plate[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate2', '侧板2', $side_plate[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate3', '侧板3', $side_plate[2]?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate4', '侧板4', $side_plate[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate5', '侧板5', $side_plate[4]?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+
+            $lacing = explode(',', $data['lacing']);
+            $f[] = Form::select('lacing1', '拉筋1', $lacing[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing2', '拉筋2', $lacing[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing3', '拉筋3', $lacing[2] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing4', '拉筋4', $lacing[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing5', '拉筋5', $lacing[4] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+            $fula = explode(',', $data['fula']);
+            $f[] = Form::select('fula1', '辅拉1', $fula[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula2', '辅拉2', $fula[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula3', '辅拉3', $fula[2] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula4', '辅拉4', $fula[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula5', '辅拉5', $fula[4] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 0)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::hidden('id', $id);
+            $form = Form::make_post_form('修改', $f, Url::buildUrl('update'));
+            $this->assign(compact('form'));
+            return $this->fetch('public/form-builder');
+        }else{
+            $f = [];
+            $f[] = Form::input('high', '高度', $data['high'])->col(12);
+
+
+
+            $f[] = Form::select('roof', '顶板', (string)$data['roof'])->options(
+                array_merge([['value' => 0, 'label' => '选择顶板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 1)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('floor', '底板', (string)$data['floor'])->options(
+                array_merge([['value' => 0, 'label' => '选择底板厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 4)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('column', '立柱', (string)$data['column'])->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 5)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+            $side_plate = explode(',', $data['side_plate']);
+            $f[] = Form::select('side_plate1', '侧板1', $side_plate[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate2', '侧板2', $side_plate[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate3', '侧板3', $side_plate[2]?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate4', '侧板4', $side_plate[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('side_plate5', '侧板5', $side_plate[4]?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 2)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+
+            $lacing = explode(',', $data['lacing']);
+            $f[] = Form::select('lacing1', '拉筋1', $lacing[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing2', '拉筋2', $lacing[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing3', '拉筋3', $lacing[2] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing4', '拉筋4', $lacing[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('lacing5', '拉筋5', $lacing[4] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 3)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+
+            $fula = explode(',', $data['fula']);
+            $f[] = Form::select('fula1', '辅拉1', $fula[0] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula2', '辅拉2', $fula[1] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula3', '辅拉3', $fula[2] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula4', '辅拉4', $fula[3] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::select('fula5', '辅拉5', $fula[4] ?? 0)->options(
+                array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_gc', 1)->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
+            )->filterable(true);
+            $f[] = Form::hidden('id', $id);
+            $form = Form::make_post_form('修改', $f, Url::buildUrl('update'));
+            $this->assign(compact('form'));
+            return $this->fetch('public/form-builder');
+        }
 
-        $fula = explode(',', $data['fula']);
-        $f[] = Form::select('fula1', '辅拉1', $fula[0] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('fula2', '辅拉2', $fula[1] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('fula3', '辅拉3', $fula[2] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('fula4', '辅拉4', $fula[3] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::select('fula5', '辅拉5', $fula[4] ?? 0)->options(
-            array_merge([['value' => 0, 'label' => '选择立柱厚度']], \app\admin\model\water\WaterCate::order('id DESC')->where('is_show', 1)->where('type', 6)->field('id as value,name as label')->select()->toArray())
-        )->filterable(true);
-        $f[] = Form::hidden('id', $id);
-        $form = Form::make_post_form('修改', $f, Url::buildUrl('update'));
-        $this->assign(compact('form'));
-        return $this->fetch('public/form-builder');
     }
 
 

app/admin/view/water/water_default/index.php

@@ -77,6 +77,7 @@
 
                     <div class="layui-btn-container" id="container-action">
                         <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:950,w:800})">添加厚度默认</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}',{h:950,w:800})">添加大公差默认</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -134,13 +135,14 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             // {field: 'uid', title: 'UID',  align: 'center'},
-            {field: 'high', title: '高度',  align: 'center'},
+            {field: 'high', title: '高度',  align: 'center',width: '4%'},
             {field: 'roof', title: '顶板',  align: 'center'},
             {field: 'floor', title: '底板',  align: 'center'},
             {field: 'side_plate_name', title: '侧板',  align: 'center'},
             {field: 'column', title: '立柱',  align: 'center'},
             {field: 'lacing_name', title: '拉筋', align: 'center'},
             {field: 'fula_name', title: '辅拉', align: 'center'},
+            {field: 'is_gc', title: '公差', templet: '#is_gc',align: 'center',width: '4%'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
     });

app/api/controller/water/WaterQueryController.php

@@ -569,8 +569,14 @@ class WaterQueryController
      */
     public function default(Request $request)
     {
-        $data = UtilService::getMore(['high']);
-        $list = WaterDefault::where('high', $data['high'])->find();
+        $data = UtilService::getMore(['high', 'is_gc']);
+        if ($data['is_gc'] == 1){
+            $where[] = ['is_gc', '=', 1];
+        }else{
+            $where[] = ['is_gc', '=', 0];
+        }
+        $list = WaterDefault::where('high', $data['high'])->where($where)->find();
+
 
         if ($list){
             $list['roof'] = ['id' => $list['roof'] , 'name' => WaterCate::where('id', $list['roof'])->value('name')];