commit

app/admin/controller/water/WaterMaterialScience.php

@@ -78,6 +78,12 @@ class WaterMaterialScience extends AuthController
         return $this->fetch();
     }
 
+    public function escalator()
+    {
+        $this->assign('role', 'escalator');
+        return $this->fetch();
+    }
+
 
     public function list()
     {
@@ -96,17 +102,20 @@ class WaterMaterialScience extends AuthController
      *
      * @return \think\Response
      */
-    public function create($id = 0)
+    public function create($id = 0, $role = 0)
     {
+        if ($role == 'roof'){
+            $type = 1;
+        }elseif ($role == 'side_plate'){
+            $type = 2;
+        }elseif ($role == 'floor'){
+            $type = 4;
+        }else{
+            return Json::fail('参数错误');
+        }
         $f = [];
         $f[] = Form::input('name', '名称')->col(12);
-        $f[] = Form::select('type', '选择分类', '')->options([
-            ['value' => 0, 'label' => '请选择分类'],
-            ['value' => 1, 'label' => '顶板'],
-            ['value' => 2, 'label' => '侧板'],
-            ['value' => 3, 'label' => '拉筋'],
-            ['value' => 4, 'label' => '底板'],
-        ])->filterable(true);
+        $f[] = Form::hidden('type', $type);
         $f[] = Form::select('th_id', '选择厚度', '')->options(
             array_merge([['value' => 0, 'label' => '请选择分类']], \app\admin\model\water\WaterThickness::order('id DESC')->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
@@ -129,15 +138,21 @@ class WaterMaterialScience extends AuthController
      *
      * @return \think\Response
      */
-    public function creates($id = 0)
+    public function creates($id = 0, $role = 0)
     {
+
+        if ($role == 'column'){
+            $type = 5;
+        }elseif ($role == 'fula'){
+            $type = 6;
+        }elseif ($role == 'lacing'){
+            $type = 3;
+        }else{
+            return Json::fail('参数错误');
+        }
         $f = [];
         $f[] = Form::input('name', '名称')->col(12);
-        $f[] = Form::select('type', '选择分类', '')->options([
-            ['value' => 0, 'label' => '请选择分类'],
-            ['value' => 5, 'label' => '立柱'],
-            ['value' => 6, 'label' => '辅拉'],
-        ])->filterable(true);
+        $f[] = Form::hidden('type', $type);
         $f[] = Form::select('th_id', '选择厚度', '')->options(
             array_merge([['value' => 0, 'label' => '请选择分类']], \app\admin\model\water\WaterThickness::order('id DESC')->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
@@ -157,13 +172,16 @@ class WaterMaterialScience extends AuthController
      *
      * @return \think\Response
      */
-    public function create_warm($id = 0)
+    public function create_warm($id = 0, $role = 0)
     {
+        if ($role == 'warm'){
+            $type = 7;
+        }else{
+            return Json::fail('参数错误');
+        }
         $f = [];
         $f[] = Form::input('name', '名称')->col(12);
-        $f[] = Form::select('type', '选择分类', '')->options([
-            ['value' => 7, 'label' => '保温'],
-        ])->filterable(true);
+        $f[] = Form::hidden('type', $type);
         $f[] = Form::input('weight', '重量(kg)');
         $f[] = Form::input('unit_price', '单价');
         $f[] = Form::input('company', '单位');
@@ -181,13 +199,18 @@ class WaterMaterialScience extends AuthController
      *
      * @return \think\Response
      */
-    public function create_channel($id = 0)
+    public function create_channel($id = 0, $role = 0)
     {
+        if ($role == 'escalator'){
+            $type = 9;
+        }elseif ($role == 'channel'){
+            $type = 8;
+        }else{
+            return Json::fail('参数错误');
+        }
         $f = [];
         $f[] = Form::input('name', '名称')->col(12);
-        $f[] = Form::select('type', '选择分类', '')->options([
-            ['value' => 8, 'label' => '槽钢'],
-        ])->filterable(true);
+        $f[] = Form::hidden('type', $type);
         $f[] = Form::input('weight', '重量(kg)');
         $f[] = Form::input('unit_price', '单价');
         $f[] = Form::input('company', '单位');
@@ -244,17 +267,6 @@ class WaterMaterialScience extends AuthController
         $data = model::find($id);
         $f = [];
         $f[] = Form::input('name', '名称', $data['name'])->col(12);
-        $f[] = Form::select('type', '选择分类', (string)$data['type'])->options([
-            ['value' => 0, 'label' => '请选择分类'],
-            ['value' => 1, 'label' => '顶板'],
-            ['value' => 2, 'label' => '侧板'],
-            ['value' => 3, 'label' => '拉筋'],
-            ['value' => 4, 'label' => '底板'],
-            ['value' => 5, 'label' => '立柱'],
-            ['value' => 6, 'label' => '辅拉'],
-            ['value' => 7, 'label' => '保温'],
-            ['value' => 8, 'label' => '槽钢'],
-        ])->filterable(true);
         $f[] = Form::select('th_id', '选择厚度', (string)$data['th_id'])->options(
             array_merge([['value' => 0, 'label' => '请选择分类']], \app\admin\model\water\WaterThickness::order('id DESC')->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
@@ -280,17 +292,6 @@ class WaterMaterialScience extends AuthController
         $data = model::find($id);
         $f = [];
         $f[] = Form::input('name', '名称', $data['name'])->col(12);
-        $f[] = Form::select('type', '选择分类', (string)$data['type'])->options([
-            ['value' => 0, 'label' => '请选择分类'],
-            ['value' => 1, 'label' => '顶板'],
-            ['value' => 2, 'label' => '侧板'],
-            ['value' => 3, 'label' => '拉筋'],
-            ['value' => 4, 'label' => '底板'],
-            ['value' => 5, 'label' => '立柱'],
-            ['value' => 6, 'label' => '辅拉'],
-            ['value' => 7, 'label' => '保温'],
-            ['value' => 8, 'label' => '槽钢'],
-        ])->filterable(true);
         $f[] = Form::select('th_id', '选择厚度', (string)$data['th_id'])->options(
             array_merge([['value' => 0, 'label' => '请选择分类']], \app\admin\model\water\WaterThickness::order('id DESC')->field('id as value,name as label')->select()->toArray())
         )->filterable(true);
@@ -314,9 +315,6 @@ class WaterMaterialScience extends AuthController
         $data = model::find($id);
         $f = [];
         $f[] = Form::input('name', '名称', $data['name'])->col(12);
-        $f[] = Form::select('type', '选择分类', (string)$data['type'])->options([
-            ['value' => 7, 'label' => '保温'],
-        ])->filterable(true);
         $f[] = Form::input('weight', '重量(kg)', $data['weight']);
         $f[] = Form::input('unit_price', '单价', $data['unit_price']);
         $f[] = Form::input('company', '单位', $data['company']);
@@ -340,9 +338,6 @@ class WaterMaterialScience extends AuthController
         $data = model::find($id);
         $f = [];
         $f[] = Form::input('name', '名称', $data['name'])->col(12);
-        $f[] = Form::select('type', '选择分类', (string)$data['type'])->options([
-            ['value' => 8, 'label' => '槽钢'],
-        ])->filterable(true);
         $f[] = Form::input('weight', '重量(kg)', $data['weight']);
         $f[] = Form::input('unit_price', '单价', $data['unit_price']);
         $f[] = Form::input('company', '单位', $data['company']);
@@ -365,7 +360,6 @@ class WaterMaterialScience extends AuthController
         $model = new model;
         $data = Util::postMore([
             'name',
-            'type',
             'th_id',
             'weight',
             'unit_price',
@@ -377,7 +371,6 @@ class WaterMaterialScience extends AuthController
         ]);
         $validate = Validate::rule('name', 'require')->rule([
             'name' => 'require',
-            'type' => 'require',
             'weight' => 'require',
             'unit_price' => 'require',
             'company' => 'require',
@@ -391,7 +384,6 @@ class WaterMaterialScience extends AuthController
         ]);
         $details = $model->find($data['id']);
         $details['name'] = $data['name'];
-        $details['type'] = $data['type'];
         $details['th_id'] = $data['th_id'];
         $details['weight'] = $data['weight'];
         $details['unit_price'] = $data['unit_price'];

app/admin/model/water/WaterMaterialScience.php

@@ -56,6 +56,8 @@ class WaterMaterialScience extends BaseModel
             $model->where('a.type', 7);
         }elseif ($where['role'] == 'channel'){
             $model->where('a.type', 8);
+        }elseif ($where['role'] == 'escalator'){
+            $model->where('a.type', 9);
         }
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){

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

@@ -68,8 +68,8 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create_channel')}',{h:900,w:900})">添加材料</a>
-<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create_channel')}?role={$role}',{h:900,w:900})">添加材料</a>
+                        <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
                     <script type="text/html" id="image">
@@ -132,7 +132,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}',{h:900,w:700})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}?role={$role}',{h:900,w:700})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -142,7 +142,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -0,0 +1,177 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">搜索条件</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入名称">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <div class="layui-input-inline">
+                                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
+                                            <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 中间详细信息-->
+        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
+             v-for="item in badge" v-cloak="" v-if="item.count > 0">
+        </div>
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">材料列表</div>
+                <div class="layui-card-body">
+
+                    <div class="layui-btn-container" id="container-action">
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create_channel')}?role={$role}',{h:900,w:900})">添加材料</a>
+<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <script type="text/html" id="image">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    </script>
+                    <script type="text/html" id="type">
+                        槽钢
+                    </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_channel')}?id={{d.id}}',{h:900,w:900})">
+                            编辑
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
+                            删除
+                        </button>
+
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    var role = '{$role}';
+    layList.tableList('List', "{:Url('list')}?role="+role, function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'type', title: '材料分类', align: 'center',templet: '#type',},
+            // {field: 'th_name', title: '厚度', align: 'center'},
+            {field: 'weight', title: '重量', align: 'center'},
+            {field: 'unit_price', title: '单价', align: 'center'},
+            {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%'},
+        ];
+    });
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'open_image':
+                $eb.openImage(data.image);
+                break;
+            case 'edit':
+                location.href = layList.U({a:'edit',q:{id:data.id}});
+                break;
+        }
+    })
+
+
+    //改状态
+    layList.switch('status',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }else{
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }
+    });
+</script>
+{/block}

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:900,w:900})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}?role={$role}',{h:900,w:900})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -140,7 +140,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}',{h:900,w:700})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}?role={$role}',{h:900,w:700})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -142,7 +142,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}',{h:900,w:700})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('creates')}?role={$role}',{h:900,w:700})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -138,7 +138,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:900,w:900})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}?role={$role}',{h:900,w:900})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -139,7 +139,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:900,w:700})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}?role={$role}',{h:900,w:700})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -141,7 +141,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

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

@@ -68,7 +68,7 @@
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
-                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create_warm')}',{h:900,w:900})">添加材料</a>
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create_warm')}?role={$role}',{h:900,w:900})">添加材料</a>
 <!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
                     </div>
                     <table class="layui-hide" id="List" lay-filter="List"></table>
@@ -132,7 +132,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.WaterMaterialScience',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

app/api/controller/water/WaterQueryController.php

@@ -39,13 +39,160 @@ class WaterQueryController
         }else{
             $where[] = ['is_gc', '=' ,0];
         }
-        $roof = WaterMaterialScience::where('id', $data['roof'])->find();
-        $roofs = WaterMaterialScience::where('type', 1)->where('th_id', $roof['th_id'])->where($where)->column('long,wide', 'id');//符合厚度的顶板
-        $area = $data['long'] * $data['wide'];// 面积
-        $roof_number = ($data['long']/1) * intval(($data['wide']/1)); // 顶板使用数量1*1
+        $long = (double)$data['long'];
+        $wide = (double)$data['wide'];
+        $high = (double)$data['high'];
+        $high_array = []; // 高度数组
+        $roof_number = []; // 顶板数量
+        $floor_number = []; // 底板数量
+        $side_number = []; // 侧板数量
+        $lacing_number = []; // 拉经数量
+        $fula_number = [];//辅拉数量
+        $warm = []; //保温数量
+        $channel_number = 0;
+        for ($i = 0; $i < intval($high); $i++){
+            $high_array[] = 1;
+        }
+        if (intval($high) != $high){
+            $high_array = array_merge($high_array, [0.5]);
+        }
+        if (ceil($long) == $long && ceil($wide) == $wide && ceil($high) == $high){
+            //都为整数
+            $roof_number = ['1*1' =>  $long * $wide]; // 顶板数量
+            $floor_number = ['1*1' => $long * $wide];// 底板数量
+            foreach ($high_array as $item){
+                $side_number[] = ['1*1' => (($item * $long) + ($item * $wide)) * 2];
+            }
+        }elseif (ceil($long) != $long && ceil($wide) != $wide && ceil($high) != $high){
+            //都不为整数
+            $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => intval($long) + intval($wide), '0.5*0.5' => 1]; // 顶板数量
+            $floor_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => intval($long) + intval($wide), '0.5*0.5' => 1];// 底板数量
+            foreach ($high_array as $item){
+                if ($item >= 1){
+                    $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 4];
+                }else{
+                    $side_number[] = ['1*0.5' => ((intval($long)) + (intval($wide))) * 2, '0.5*0.5' => 4];
+                }
+            }
+        }elseif (ceil($long) != $long || ceil($wide) != $wide || ceil($high) != $high){
+            //一个整数
+            if (ceil($long) != $long && ceil($wide) == $wide && ceil($high) == $high){
+                $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => $wide]; // 顶板数量
+                $floor_number = ['1*1' => intval($long) * intval($wide), '1*0.5' => $wide];// 底板数量
+                foreach ($high_array as $item){
+                    $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 2];
+                }
+            }elseif (ceil($long) == $long && ceil($wide) != $wide and ceil($high) == $high){
+                $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => $long]; // 顶板数量
+                $floor_number = ['1*1' => intval($long) * intval($wide), '1*0.5' => $long];// 底板数量
+                foreach ($high_array as $item){
+                    $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 2];
+                }
+            }elseif (ceil($long) != $long && ceil($wide) != $wide and ceil($high) == $high){
+                $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => intval($long) + intval($wide), '0.5*0.5' => 1]; // 顶板数量
+                $floor_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => intval($long) + intval($wide), '0.5*0.5' => 1];// 底板数量
+                foreach ($high_array as $item){
+                    $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 4];
+                }
+            } elseif (ceil($long) != $long && ceil($wide) == $wide and ceil($high) != $high){
+                $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => $wide]; // 顶板数量
+                $floor_number = ['1*1' => intval($long) * intval($wide), '1*0.5' => $wide];// 底板数量
+                foreach ($high_array as $item){
+                    if ($item >= 1){
+                        $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 2];
+                    }else{
+                        $side_number[] = ['1*0.5' => ((intval($long)) + (intval($wide))) * 2, '0.5*0.5' => 2];
+                    }
+                }
+            }elseif (ceil($long) == $long && ceil($wide) != $wide and ceil($high) != $high){
+                $roof_number = ['1*1' =>  intval($long) * intval($wide), '1*0.5' => $long]; // 顶板数量
+                $floor_number = ['1*1' => intval($long) * intval($wide), '1*0.5' => $long];// 底板数量
+                foreach ($high_array as $item){
+                    if ($item >= 1){
+                        $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2, '0.1*0.5' => 2];
+                    }else{
+                        $side_number[] = ['1*0.5' => ((intval($long)) + (intval($wide))) * 2, '0.5*0.5' => 2];
+                    }
+                }
+            }elseif (ceil($long) == $long && ceil($wide) == $wide and ceil($high) != $high){
+                $roof_number = ['1*1' =>  $long * $wide]; // 顶板数量
+                $floor_number = ['1*1' => $long * $wide];// 底板数量
+                foreach ($high_array as $item){
+                    if ($item >= 1){
+                        $side_number[] = ['1*1' => ((intval($long)) + (intval($wide))) * 2];
+                    }else{
+                        $side_number[] = ['1*0.5' => ((intval($long)) + (intval($wide))) * 2];
+                    }
+                }
+            }
+        }
+
+        array_pop($high_array);// 删除最后一位，算出主拉层数
+        // 拉筋
+        foreach ($high_array as $item){
+            $lacing_number[] = ceil(((ceil($long) * (ceil($wide) - 1)) + (ceil($wide) * (ceil($long) - 1)))/2);
+        }
+        // 辅拉
+        if ($high > 1){
+            if ($high == 1.5){
+                $fula_number = [2 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1];
+            }elseif ($high == 2){
+                $fula_number = [3 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1];
+            }elseif ($high == 2.5){
+                $fula_number = [
+                    2 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1,
+                    2 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1,
+                ];
+            }elseif ($high == 3){
+                $fula_number = [
+                    3 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1,
+                    2 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1,
+                ];
+            }elseif ($high >= 3.5){
+                foreach ($high_array as $item){
+                    $fula_number[] = 2 * ( (ceil($long) - 1) + (ceil($wide) - 1) ) + 1;
+                }
+            }
+        }
+        $warm1 = 0;// 1*1 数量
+        $warm2 = 0;// 1*0.5数量
+        $warm3 = 0;// 0.5*0.5数量
+        if ($data['is_warm'] > 0){
+            foreach ($side_number as $item){
+                // 侧板
+                foreach ($item as $key => $value){
+                    if ($key == '1*1'){
+                        $warm1 += $value;
+                    }elseif ($key == '1*0.5'){
+                        $warm2 += $value;
+                    }elseif ($key == '0.5*0.5'){
+                        $warm3 += $value;
+                    }
+                }
+            }
+            foreach ($floor_number as $key => $value){
+                // 顶板
+                if ($key == '1*1'){
+                    $warm1 += $value;
+                }elseif ($key == '1*0.5'){
+                    $warm2 += $value;
+                }elseif ($key == '0.5*0.5'){
+                    $warm3 += $value;
+                }
+            }
+        }
 
-        halt($roof_number);
+        if ($data['is_channel'] > 0){
+            if (ceil($long) == $long && ceil($wide) == $wide && ceil($high) == $high){
+                //都为整数
+                $channel_number = $long * ($wide * 2 + 1) + $wide * 2;
 
+            }elseif (ceil($long) != $long || ceil($wide) || $wide && ceil($high) || $high){
+                //不为整数
+                $channel_number = $long * (ceil($wide) * 2 + 1) + $wide * 2;
+            }
+        }
+        halt($channel_number);
 
     }