commit

app/admin/controller/water/WaterCate.php

@@ -187,4 +187,21 @@ class WaterCate extends AuthController
 
     }
 
+
+    /**
+     * 设置单个产品上架|下架
+     *
+     * @return json
+     */
+    public function set_show($is_show = '', $id = '')
+    {
+        ($is_show == '' || $id == '') && Json::fail('缺少参数');
+        $res = model::where(['id' => $id])->update(['is_show' => (int)$is_show]);
+        if ($res) {
+            return JsonService::successful($is_show == 1 ? '显示成功' : '隐藏成功');
+        } else {
+            return JsonService::fail($is_show == 1 ? '显示失败' : '隐藏失败');
+        }
+    }
+
 }

app/admin/controller/water/WaterDefault.php

@@ -59,61 +59,61 @@ 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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('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('type', 6)->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
 
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));

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

@@ -98,6 +98,9 @@
                         大公差
                         {{#  } }}
                     </script>
+                    <script type="text/html" id="is_show">
+                        <input type='checkbox' name='id' lay-skin='switch' value="{{d.id}}" lay-filter='is_show' lay-text='开启|关闭'  {{ d.is_show == 1 ? 'checked' : '' }}>
+                    </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:500,w:500})">
                             编辑
@@ -125,6 +128,7 @@
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
             {field: 'type', title: '分类', templet: '#name',  align: 'center'},
             {field: 'is_gc', title: '公差', templet: '#is_gc',  align: 'center'},
+            {field: 'status', title: '状态', templet: '#is_show',  align: 'center'},
             {field: 'create_time', title: '时间', align: 'center', width: '8%'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
         ];
@@ -135,6 +139,18 @@
         layList.reload(where,true);
     });
 
+    layList.switch('is_show',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({a:'set_show',p:{is_show:1,id:value}}),function (res) {
+                layList.msg(res.msg);
+            });
+        }else{
+            layList.baseGet(layList.Url({a:'set_show',p:{is_show:0,id:value}}),function (res) {
+                layList.msg(res.msg);
+            });
+        }
+    });
+
     //点击事件绑定
     layList.tool(function (event,data,obj) {
         switch (event) {

app/api/controller/water/WaterQueryController.php

@@ -511,14 +511,14 @@ class WaterQueryController
             $where[] = ['is_gc', '=' ,0];
         }
         $list = [];
-        $list['warm'] = WaterCate::field('id,name')->where('type', 7)->select(); // 保温
-        $list['channel'] =  WaterCate::field('id,name')->where('type', 8)->select(); // 槽钢
-        $list['roof'] =  WaterCate::field('id,name')->where('type', 1)->where($where)->select();// 顶板
-        $list['side_plate'] =  WaterCate::field('id,name')->where('type', 2)->where($where)->select();// 侧板
-        $list['lacing'] =  WaterCate::field('id,name')->where('type', 3)->where($where)->select();// 拉筋
-        $list['floor'] =  WaterCate::field('id,name')->where('type', 4)->where($where)->select(); // 底板
-        $list['column'] =  WaterCate::field('id,name')->where('type', 5)->where($where)->select(); // 立柱
-        $list['fula'] =  WaterCate::field('id,name')->where('type', 6)->where($where)->select(); // 辅拉
+        $list['warm'] = WaterCate::field('id,name')->where('type', 7)->where('is_show', 1)->select(); // 保温
+        $list['channel'] =  WaterCate::field('id,name')->where('type', 8)->where('is_show', 1)->select(); // 槽钢
+        $list['roof'] =  WaterCate::field('id,name')->where('type', 1)->where($where)->where('is_show', 1)->select();// 顶板
+        $list['side_plate'] =  WaterCate::field('id,name')->where('type', 2)->where('is_show', 1)->where($where)->select();// 侧板
+        $list['lacing'] =  WaterCate::field('id,name')->where('type', 3)->where('is_show', 1)->where($where)->select();// 拉筋
+        $list['floor'] =  WaterCate::field('id,name')->where('type', 4)->where('is_show', 1)->where($where)->select(); // 底板
+        $list['column'] =  WaterCate::field('id,name')->where('type', 5)->where('is_show', 1)->where($where)->select(); // 立柱
+        $list['fula'] =  WaterCate::field('id,name')->where('type', 6)->where('is_show', 1)->where($where)->select(); // 辅拉
 
         return app('json')->success($list);
     }