commit

app/admin/controller/water/WaterDefault.php

@@ -200,22 +200,71 @@ class WaterDefault 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' => '底板'],
-        ])->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);
-        $f[] = Form::input('weight', '重量(kg)', $data['weight']);
-        $f[] = Form::input('unit_price', '单价', $data['unit_price']);
-        $f[] = Form::input('company', '单位', $data['company']);
-        $f[] = Form::input('long', '长', $data['long']);
-        $f[] = Form::input('wide', '宽', $data['wide']);
+        $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);
+
+        $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'));
@@ -234,39 +283,70 @@ class WaterDefault extends AuthController
     {
         $model = new model;
         $data = Util::postMore([
-            'name',
-            'type',
-            'th_id',
-            'weight',
-            'unit_price',
-            'company',
-            'long',
-            'wide',
-            'id',
+            'high',
+            'roof',
+            'floor',
+            'column',
+            'side_plate1',
+            'side_plate2',
+            'side_plate3',
+            'side_plate4',
+            'side_plate5',
+            'lacing1',
+            'lacing2',
+            'lacing3',
+            'lacing4',
+            'lacing5',
+            'fula1',
+            'fula2',
+            'fula3',
+            'fula4',
+            'fula5',
+            'id'
         ]);
-        $validate = Validate::rule('name', 'require')->rule([
-            'name' => 'require',
-            'type' => 'require',
-            'th_id' => 'require',
-            'weight' => 'require',
-            'unit_price' => 'require',
-            'company' => 'require',
-            'long' => 'require',
-            'wide' => 'require',
+        $validate = Validate::rule([
+            'high' => 'require',
+            'roof' => 'require',
+            'floor' => 'require',
+            'column' => 'require',
+            'side_plate1' => 'require',
+            'lacing1' => 'require',
+            'fula1' => 'require',
         ]);
         $validate->message([
-            'name.require' => '名称不能为空',
-            'type.require' => '请选择分类',
-            'th_id.require' => '请选择厚度',
-            'weight.require' => '请填写重量',
-            'unit_price.require' => '请填写单价',
-            'company.require' => '请填写单位',
-            'long.require' => '请填写长度',
-            'wide.require' => '请填写宽度',
+            'high.require' => '高度不能为空',
+            'roof.require' => '请选择顶板',
+            'floor.require' => '请选择底板',
+            'column.require' => '请填写立柱',
+            'side_plate1.require' => '最少填写侧板1',
+            'lacing1.require' => '最少填写拉筋1',
+            'fula1.require' => '最少填写辅拉1',
         ]);
+        if ($data['side_plate1'] > 0) $data['side_plate'] = $data['side_plate1'];
+        if ($data['side_plate2'] > 0) $data['side_plate'] .= ','.$data['side_plate2'];
+        if ($data['side_plate3'] > 0) $data['side_plate'] .= ','.$data['side_plate3'];
+        if ($data['side_plate4'] > 0) $data['side_plate'] .= ','.$data['side_plate4'];
+        if ($data['side_plate5'] > 0) $data['side_plate'] .= ','.$data['side_plate5'];
+
+        if ($data['lacing1'] > 0) $data['lacing'] = $data['lacing1'];
+        if ($data['lacing2'] > 0) $data['lacing'] .= ','.$data['lacing2'];
+        if ($data['lacing3'] > 0) $data['lacing'] .= ','.$data['lacing3'];
+        if ($data['lacing4'] > 0) $data['lacing'] .= ','.$data['lacing4'];
+        if ($data['lacing5'] > 0) $data['lacing'] .= ','.$data['lacing5'];
+
+        if ($data['fula1'] > 0) $data['fula'] = $data['fula1'];
+        if ($data['fula2'] > 0) $data['fula'] .= ','.$data['fula2'];
+        if ($data['fula3'] > 0) $data['fula'] .= ','.$data['fula3'];
+        if ($data['fula4'] > 0) $data['fula'] .= ','.$data['fula4'];
+        if ($data['fula5'] > 0) $data['fula'] .= ','.$data['fula5'];
         $details = $model->find($data['id']);
-        $details['name'] = $data['name'];
-        $details['thickness'] = $data['thickness'];
+        $details['high'] = $data['high'];
+        $details['roof'] = $data['roof'];
+        $details['floor'] = $data['floor'];
+        $details['column'] = $data['column'];
+        $details['side_plate'] = $data['side_plate'];
+        $details['lacing'] = $data['lacing'];
+        $details['fula'] = $data['fula'];
         $res = $details->save();
         if ($res) return Json::successful('修改成功');
         return Json::fail('修改失败');

app/admin/model/water/WaterCate.php

@@ -42,7 +42,7 @@ class WaterCate extends BaseModel
     {
         $model = self::field('*')->order('id DESC');
 
-        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'].'%');
+        if ($where['name'])$model->where('name|id' , 'like', '%'.$where['name'].'%');
         if ($where['type'])$model->where('type' , $where['type']);
         if ($where['gc']){
             if ($where['gc'] == 1){

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|a.number' , 'like', '%'.$where['name'].'%');
+        if ($where['name'])$model->where('a.name|a.number|a.id' , 'like', '%'.$where['name'].'%');
         if ($where['role'] == 'roof'){
             $model->where('a.type', 1);
         }elseif ($where['role'] == 'side_plate'){

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

@@ -111,9 +111,9 @@
                     </script>
 
                     <script type="text/html" id="act">
-<!--                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('water.WaterQuery/details')}?id={{d.query_id}}',{h:1100,w:1100})">-->
-<!--                            详情-->
-<!--                        </button>-->
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}',{h:1100,w:1100})">
+                            编辑
+                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>

app/api/controller/PublicController.php

@@ -330,4 +330,16 @@ class PublicController
         return app('json')->successful($list);
     }
 
+    /**
+     * 正常公差
+     * @return void
+     */
+    public function gc()
+    {
+        $data['zcgc'] = explode(',',sys_config('zcgc'));
+        $data['dgc'] = explode(',',sys_config('dgc'));
+        return app('json')->successful($data);
+
+    }
+
 }

route/api/route.php

@@ -244,6 +244,8 @@ Route::group(function () {
     Route::get('card/list', 'user.UserCardController/list')->name('cardList');
     //每月发放次数
     Route::get('month', 'user.UserCardController/month')->name('month');
+    // 公差
+    Route::get('gc', 'PublicController/gc')->name('gc');
 
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);