commit

app/admin/controller/water/WaterMaterialScience.php

@@ -477,6 +477,7 @@ class WaterMaterialScience extends AuthController
                         }else{
                             $long = explode('×',$array[2])[0];
                             $wide = explode('×',$array[2])[1];
+                            $name = $item[2].$array[1].'mm'.$long.'*'.$wide;
                         }
 
                         $cate = \app\admin\model\water\WaterCate::where('name', 'like', '%'.$name.'%')->select()->toArray();

app/admin/model/water/WaterMaterialScience.php

@@ -40,7 +40,7 @@ class WaterMaterialScience extends BaseModel
         ->leftJoin('water_thickness b', 'a.th_id = b.id')
         ->leftJoin('water_cate c', 'a.cate_id = c.id');
 
-        if ($where['name'])$model->where('a.name' , 'like', '%'.$where['name'].'%');
+        if ($where['name'])$model->where('a.name|a.number' , 'like', '%'.$where['name'].'%');
         if ($where['role'] == 'roof'){
             $model->where('a.type', 1);
         }elseif ($where['role'] == 'side_plate'){

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

@@ -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.water_cate',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

@@ -123,6 +123,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

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

@@ -119,6 +119,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

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

@@ -123,6 +123,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

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

@@ -119,6 +119,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

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

@@ -122,6 +122,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

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

@@ -120,6 +120,7 @@
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'name', title: '名称', templet: '#name',  align: 'center'},
+            {field: 'number', title: '编号',  align: 'center'},
             {field: 'type', title: '材料分类', align: 'center',templet: '#type'},
             {field: 'cate_name', title: '分类', align: 'center',templet: '#cate_name'},
             {field: 'th_name', title: '厚度', align: 'center'},

app/api/controller/water/WaterQueryController.php

@@ -76,7 +76,6 @@ class WaterQueryController
 //                    User::where('uid', $request->uid())->dec('frequency', 1)->update();
 //                }
 //            }
-
             if ($user['phone']){
                 $res1 = $this->NewSmsSend('13905764599', ['code' => $user['phone']], '');
                 $res1 = $this->NewSmsSend('13905764591', ['code' => $user['phone']], '');
@@ -146,7 +145,6 @@ class WaterQueryController
                 $table[] = ['title' => '顶板','name' => $details['name'], 'specifications' => $details['long'].'*'.$details['wide'], 'number' => $v, 'unit_price' => $details['unit_price'], 'company' => $details['company'], 'ot_price' => $details['unit_price'] * $v, 'weight' => $details['weight'] * $v , 'type' => 1];
             }
         }
-
         // 底板
         $science = WaterMaterialScience::where('cate_id', $data['floor'])->order('wide DESC')->select()->toArray();
         if (count($science) == 1){
@@ -395,7 +393,7 @@ class WaterQueryController
             }
         }
         //立柱
-        $column_number = ceil((ceil($long) - 1) * (ceil($wide) -1) * $wide / 2);
+        $column_number = ceil(((ceil($long) - 1) * (ceil($wide) -1) * $high) / 2);
         //保温板数量
         $warm1 = 0;// 1*1 数量
         $warm2 = 0;// 1*0.5数量