commit

app/admin/controller/water/WaterMaterialScience.php

@@ -467,47 +467,47 @@ class WaterMaterialScience extends AuthController
             }
         }
         foreach ($data as $k => $item){
-            if (isset($item[3])){;
-                if (!strstr($item[3], '双') and strstr($item[3], '/') and isset($item[8])){
-                        $array = explode('/', $item['3']);
-                        $name = $item[2].$array[1].'mm';
-                        if (strstr(explode('×',$array[2])[0], 'm')){
-                            $long =  substr(explode('×',$array[2])[0],0,strrpos(explode('×',$array[2])[0],"m"));
-                            $wide =  substr(explode('×',$array[2])[1],0,strrpos(explode('×',$array[2])[1],"m"));
-                        }else{
-                            $long = explode('×',$array[2])[0];
-                            $wide = explode('×',$array[2])[1];
-                            $name = $item[2].$array[1].'mm'.$long.'*'.$wide;
-                        }
+            if (isset($item[3])){
+                if (!strstr($item[3], '双') and strstr($item[3], '/') and isset($item[8]) and !strstr($item['0'], '辅料/配件')){
+                    $array = explode('/', $item['3']);
+                    $name = $item[2].$array[1].'mm';
+                    if (strstr(explode('×',$array[2])[0], 'm')){
+                        $long =  substr(explode('×',$array[2])[0],0,strrpos(explode('×',$array[2])[0],"m"));
+                        $wide =  substr(explode('×',$array[2])[1],0,strrpos(explode('×',$array[2])[1],"m"));
+                    }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();
-                        if (count($cate) > 0){
-                            foreach ($cate as $value){
-                                $details = \app\admin\model\water\WaterMaterialScience::where('number', $item['1'])->where('type', $value['type'])->find();
-                                if (!$details){
-                                    \app\admin\model\water\WaterMaterialScience::create([
-                                        'name' => $item[2].$array[1].'mm',
-                                        'number' => $item[1],
-                                        'type' => $value['type'],
-                                        'cate_id' => $value['id'],
-                                        'th_id' => \app\admin\model\water\WaterThickness::where('thickness', $array[1])->value('id'),
-                                        'weight' => $item[6],
-                                        'unit_price' => $item[8],
-                                        'company' => $item[5],
-                                        'long' => $long,
-                                        'wide' => $wide,
-                                    ]);
-                                }else{
-                                    $details['unit_price'] = $item[8];
-                                    $details['long'] = $long;
-                                    $details['wide'] = $wide;
-                                    $details['name'] = $name;
-                                    $details['weight'] = $item[6];
-                                    $details->save();
-                                }
+                    $cate = \app\admin\model\water\WaterCate::where('name', 'like', '%'.$name.'%')->select()->toArray();
+                    if (count($cate) > 0){
+                        foreach ($cate as $value){
+                            $details = \app\admin\model\water\WaterMaterialScience::where('number', $item['1'])->where('type', $value['type'])->find();
+                            if (!$details){
+                                \app\admin\model\water\WaterMaterialScience::create([
+                                    'name' => $item[2].$array[1].'mm',
+                                    'number' => $item[1],
+                                    'type' => $value['type'],
+                                    'cate_id' => $value['id'],
+                                    'th_id' => \app\admin\model\water\WaterThickness::where('thickness', $array[1])->value('id'),
+                                    'weight' => $item[6],
+                                    'unit_price' => $item[8],
+                                    'company' => $item[5],
+                                    'long' => $long,
+                                    'wide' => $wide,
+                                ]);
+                            }else{
+                                $details['unit_price'] = $item[8];
+                                $details['long'] = $long;
+                                $details['wide'] = $wide;
+                                $details['name'] = $name;
+                                $details['weight'] = $item[6];
+                                $details->save();
                             }
                         }
                     }
+                }
             }
         }
         return Json::successful('导入成功!');

app/admin/controller/water/WaterQuery.php

@@ -48,6 +48,7 @@ class WaterQuery extends AuthController
             ['name', ''],
             ['card', ''],
             ['order_id', ''],
+            ['uid', ''],
         ]);
 
         return Json::successlayui(model::list($where));

app/admin/model/water/WaterQuery.php

@@ -40,6 +40,7 @@ class WaterQuery extends BaseModel
         ->leftJoin('user u', 'a.uid = u.uid');
 
         if ($where['name'])$model->where('u.uid|u.nickname' , 'like', '%'.$where['name'].'%');
+        if ($where['uid'])$model->where('u.uid' , $where['uid']);
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

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

@@ -139,7 +139,7 @@
 {block name="script"}
 <script>
     var uid = {$uid};
-    layList.tableList('List', "{:Url('list')}?name="+uid, function () {
+    layList.tableList('List', "{:Url('list')}?uid="+uid, function () {
         return [
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},