!47 分页

Merge pull request !47 from develop

app/Http/Controllers/Goods/GoodsSkusController.php

@@ -247,7 +247,7 @@ class GoodsSkusController extends Controller
         $update = reset($skus);
         DB::beginTransaction();
         try {
-            $sku = GoodsSku::query()->where('id', $update['id'])->first(['id', 'two_days_ago_num', 'yesterday_num', 'num', 'stock', 'reserve']);
+            $sku = GoodsSku::query()->where('id', $update['id'])->with(['goods:id,goods_code'])->first();
             $record = DailyStockRecord::query()
                 ->where('sku_id', $sku->id)
                 ->where('day', DateTimeUtils::getToday())

app/Listeners/UpdateBusinessGoodsStock.php

@@ -39,8 +39,8 @@ class UpdateBusinessGoodsStock implements ShouldQueue
             $log->target_type = 'goods_sku';
             $log->target_id = $event->goodsSku->id ?? 0;
             $log->target_field = 'stock';
-            $log->user_id = $event->businessOrderItem['shop_id'];
-            $log->message = ($event->businessOrderItem['external_sku_id'] ?: '商品') . '未找到';
+            $log->user_id = 1;
+            $log->message = ($event->businessOrderItem['external_sku_id'] ?? $event->businessOrderItem['id']) . '未找到';
             $log->save();
 
             return;

app/Services/Business/BusinessClient.php

@@ -10,6 +10,7 @@ use App\Models\GoodsSku;
 use App\Models\Log;
 use App\Models\Shop;
 use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Auth;
 
 abstract class BusinessClient
 {
@@ -144,10 +145,10 @@ abstract class BusinessClient
             $log = new Log();
             $log->module = 'plat';
             $log->action = $method;
-            $log->target_type = $this->getShop()->plat_id;
-            $log->target_id = $this->getSkuId();
+            $log->target_type = $this->getShop()->plat_id . '--' . $this->getShop()->name;
+            $log->target_id = $this->getShop()->id;
             $log->target_field = $params['type'];
-            $log->user_id = $this->getShop()->id;
+            $log->user_id = Auth::id();
             if ($size < 64000) {
                 $log->message = json_encode($res, 256);
             }

public/dist/css/chunk-4da2392c.0ff9404a.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-83f3bb02]{position:relative}.table[data-v-83f3bb02]{margin-top:40px;position:relative}.btn[data-v-83f3bb02]{float:right}[data-v-83f3bb02] .cell{display:flex;align-items:center}.commodityimg[data-v-83f3bb02]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-83f3bb02]{width:100%;height:100%}.confirmbtn[data-v-83f3bb02]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-83f3bb02]{margin-top:30px}.import-right a[data-v-83f3bb02]{text-decoration:none;color:#000}[data-v-83f3bb02] .btn11{padding:0;width:14px;height:14px}[data-v-83f3bb02] .btn11 img{width:100%;height:100%}.page[data-v-83f3bb02]{margin-top:20px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.loss[data-v-9c19b6e0]{position:relative}.table[data-v-9c19b6e0]{margin-top:40px;position:relative}.btn[data-v-9c19b6e0]{float:right}[data-v-9c19b6e0] .cell{display:flex;align-items:center}.commodityimg[data-v-9c19b6e0]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-9c19b6e0]{width:100%;height:100%}.confirmbtn[data-v-9c19b6e0]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-9c19b6e0]{margin-top:30px}.import-right a[data-v-9c19b6e0]{text-decoration:none;color:#000}[data-v-9c19b6e0] .btn11{padding:0;width:14px;height:14px}[data-v-9c19b6e0] .btn11 img{width:100%;height:100%}.page[data-v-9c19b6e0]{margin-top:20px}

public/dist/css/chunk-f823a01a.de53573d.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-upload--picture-card[data-v-03ee887a]{width:50px;height:50px}.el-form-item[data-v-03ee887a]{margin-left:60px}.addto[data-v-03ee887a]{display:inline-block;width:30px;height:30px;background-color:#00f;color:#fff;font-size:25px;text-align:center;line-height:30px;border-radius:5px;margin-top:4px}.avatar-uploader .el-upload[data-v-03ee887a]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-03ee887a]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-03ee887a]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-03ee887a]{width:148px;height:148px;display:block}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.el-upload--picture-card[data-v-1c75a95b]{width:50px;height:50px}.el-form-item[data-v-1c75a95b]{margin-left:60px}.addto[data-v-1c75a95b]{display:inline-block;width:30px;height:30px;background-color:#00f;color:#fff;font-size:25px;text-align:center;line-height:30px;border-radius:5px;margin-top:4px}.avatar-uploader .el-upload[data-v-1c75a95b]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-1c75a95b]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-1c75a95b]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-1c75a95b]{width:148px;height:148px;display:block}

public/dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-3043d49d.3ff10d3b.css" rel="prefetch"><link href="css/chunk-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-3e22dfcf.0c73552c.css" rel="prefetch"><link href="css/chunk-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-516d32cc.90c055c4.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="css/chunk-dce0c6c0.3d009b2d.css" rel="prefetch"><link href="js/chunk-0f67ac47.d6c77755.js" rel="prefetch"><link href="js/chunk-14ff3ba6.faaa4534.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3043d49d.669d344b.js" rel="prefetch"><link href="js/chunk-3ad98ce0.d4852cea.js" rel="prefetch"><link href="js/chunk-3e22dfcf.17a21be0.js" rel="prefetch"><link href="js/chunk-50481dc1.2ba9dc04.js" rel="prefetch"><link href="js/chunk-516d32cc.5004e058.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-959f9a24.63a93281.js" rel="prefetch"><link href="js/chunk-dce0c6c0.51e6f004.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.946c8748.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.946c8748.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-3ad98ce0.c0acee9a.css" rel="prefetch"><link href="css/chunk-3c532032.e437602b.css" rel="prefetch"><link href="css/chunk-3e22dfcf.0c73552c.css" rel="prefetch"><link href="css/chunk-4da2392c.0ff9404a.css" rel="prefetch"><link href="css/chunk-516d32cc.90c055c4.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-62101cb8.67947a26.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="css/chunk-ba60ef82.e437602b.css" rel="prefetch"><link href="css/chunk-dce0c6c0.3d009b2d.css" rel="prefetch"><link href="css/chunk-f823a01a.de53573d.css" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3ad98ce0.d4852cea.js" rel="prefetch"><link href="js/chunk-3c532032.adbdd0d5.js" rel="prefetch"><link href="js/chunk-3e22dfcf.17a21be0.js" rel="prefetch"><link href="js/chunk-4da2392c.ab05e274.js" rel="prefetch"><link href="js/chunk-516d32cc.5004e058.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-62101cb8.df8fe332.js" rel="prefetch"><link href="js/chunk-959f9a24.63a93281.js" rel="prefetch"><link href="js/chunk-ba60ef82.bd8a71c1.js" rel="prefetch"><link href="js/chunk-dce0c6c0.51e6f004.js" rel="prefetch"><link href="js/chunk-f823a01a.0e9a6380.js" rel="prefetch"><link href="css/app.62fa08a2.css" rel="preload" as="style"><link href="css/chunk-vendors.a6a7f90c.css" rel="preload" as="style"><link href="js/app.b6cb810e.js" rel="preload" as="script"><link href="js/chunk-vendors.dc4080e5.js" rel="preload" as="script"><link href="css/chunk-vendors.a6a7f90c.css" rel="stylesheet"><link href="css/app.62fa08a2.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.dc4080e5.js"></script><script src="js/app.b6cb810e.js"></script></body></html>

resources/frontend/src/views/shuju/record.vue

@@ -142,12 +142,12 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      this.getList();
+      this.query();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      this.getList();
+      this.query();
     },
 
     // 获取用户列表

resources/frontend/src/views/shuju/shuju.vue

@@ -177,12 +177,12 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      this.getList();
+      this.query();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      this.getList();
+      this.query();
     },
   },
   mounted() {

resources/frontend/src/views/yingyeting/addgoods/addgoods.vue

@@ -492,7 +492,9 @@ export default {
       // console.log("goodsid", this.goodsData.goods_id);
       let goods = {
         title: this.goodsData.goods.title,
-        img_url: this.goodsData.goods.img_url,
+        img_url: this.goodsData.goods.img_url
+          ? this.goodsData.goods.img_url
+          : "",
         type_id: this.goodsData.goods.type_id,
         brand_id: this.goodsData.goods.brand_id,
         goods_code: this.goodsData.goods.goods_code,

resources/frontend/src/views/yingyeting/yingyeting.vue

@@ -572,7 +572,7 @@ export default {
       },
       Paginationdata: {}, //分页相关数据
       current_page: 1, //当前页
-      per_page: 15, //每页显示数量
+      per_page: 100, //每页显示数量
       multipleSelection: [], //多选框选中的id
       updateType: "", //更新类型，newest-上新, inventory-库存盘点, stock-库存
       stock: false, //点击库存显示输入框变量
@@ -745,14 +745,12 @@ export default {
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      // console.log(1111, val);
-      this.getList();
+      this.handleChoose();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      // console.log(2222, val);
-      this.getList();
+      this.handleChoose();
     },
 
     //取消上新or库存盘点