!36 8.19 优化侧边栏 首页筛选 分页功能

Merge pull request !36 from yezhenman

public/dist/css/chunk-3ad98ce0.c0acee9a.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)}}.conent[data-v-0f49394c]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-0f49394c]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-0f49394c]{width:114px;height:44px;border-radius:3px}.table[data-v-0f49394c]{margin-top:20px}.block[data-v-0f49394c]{margin-top:30px}
+#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)}}.conent[data-v-312969d0]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-312969d0]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-312969d0]{width:114px;height:44px;border-radius:3px}.table[data-v-312969d0]{margin-top:20px}.block[data-v-312969d0]{margin-top:30px}

public/dist/css/chunk-78bf44ba.3a189719.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-00572fb2]{position:relative}.table[data-v-00572fb2]{margin-top:40px;position:relative}.btn[data-v-00572fb2]{float:right}[data-v-00572fb2] .cell{display:flex;align-items:center}.commodityimg[data-v-00572fb2]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-00572fb2]{width:100%;height:100%}.confirmbtn[data-v-00572fb2]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-00572fb2]{margin-top:30px}.import-right a[data-v-00572fb2]{text-decoration:none;color:#000}[data-v-00572fb2] .btn11{padding:0;width:14px;height:14px}[data-v-00572fb2] .btn11 img{width:100%;height:100%}.page[data-v-00572fb2]{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-bd299e24]{position:relative}.table[data-v-bd299e24]{margin-top:40px;position:relative}.btn[data-v-bd299e24]{float:right}[data-v-bd299e24] .cell{display:flex;align-items:center}.commodityimg[data-v-bd299e24]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-bd299e24]{width:100%;height:100%}.confirmbtn[data-v-bd299e24]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-bd299e24]{margin-top:30px}.import-right a[data-v-bd299e24]{text-decoration:none;color:#000}[data-v-bd299e24] .btn11{padding:0;width:14px;height:14px}[data-v-bd299e24] .btn11 img{width:100%;height:100%}.page[data-v-bd299e24]{margin-top:20px}

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-45019d92.b1c3c56f.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-7136ffb6.9ae72c1b.css" rel="prefetch"><link href="css/chunk-84c0d1fa.47f57404.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="js/chunk-0f67ac47.eed43c85.js" rel="prefetch"><link href="js/chunk-14ff3ba6.8728594a.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-45019d92.7c880acf.js" rel="prefetch"><link href="js/chunk-50481dc1.4db40c89.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-7136ffb6.248bdb7b.js" rel="prefetch"><link href="js/chunk-84c0d1fa.4b6880d0.js" rel="prefetch"><link href="js/chunk-8eb4b592.2e383453.js" rel="prefetch"><link href="js/chunk-959f9a24.5809f600.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.230ada2b.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.230ada2b.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-0f67ac47.e437602b.css" rel="prefetch"><link href="css/chunk-14ff3ba6.56e84236.css" rel="prefetch"><link href="css/chunk-3ad98ce0.c0acee9a.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-78bf44ba.3a189719.css" rel="prefetch"><link href="css/chunk-84c0d1fa.47f57404.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="js/chunk-0f67ac47.eed43c85.js" rel="prefetch"><link href="js/chunk-14ff3ba6.8a0304d0.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-3ad98ce0.0fb41c18.js" rel="prefetch"><link href="js/chunk-50481dc1.4db40c89.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-78bf44ba.c9810140.js" rel="prefetch"><link href="js/chunk-84c0d1fa.4b6880d0.js" rel="prefetch"><link href="js/chunk-8eb4b592.e5b9638c.js" rel="prefetch"><link href="js/chunk-959f9a24.5809f600.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.2c649b2a.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.2c649b2a.js"></script></body></html>

resources/frontend/src/api/rankingData.js

@@ -75,11 +75,11 @@ export function editGoods_types(id, data) {
   });
 }
 // 商品品牌列表
-export function Brand_goods_types(data) {
+export function Brand_goods_types(params) {
   return http({
     url: "/api/goods_brands",
     method: "get",
-    data,
+    params,
   });
 }
 // 商品品牌列表删除

resources/frontend/src/views/brand/brand.vue

@@ -85,7 +85,7 @@ import {
   AddBrandgoods_types,
   editBrand_types,
 } from "../../api/rankingData";
-import axios from "axios";
+// import axios from "axios";
 export default {
   data() {
     return {

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

@@ -5,12 +5,20 @@
     <el-card class="box-card">
       <div class="goods">
         <el-form ref="form" :inline="true" :model="form">
-          <el-form-item label="商品名称：" :style="(marginRight = '80')">
+          <el-form-item label="商品名称:">
-            <el-input v-model="form.goods_title" placeholder="商品名称">
+            <el-input
+              v-model="form.goods_title"
+              placeholder="商品名称"
+              style="width: 100px"
+            >
             </el-input>
           </el-form-item>
-          <el-form-item label="商品种类：">
+          <el-form-item label="商品种类:">
-            <el-select v-model="form.type_id" placeholder="商品种类">
+            <el-select
+              v-model="form.type_id"
+              placeholder="商品种类"
+              style="width: 125px"
+            >
               <el-option
                 v-for="item in cate"
                 :key="item.id"
@@ -20,12 +28,20 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商品规格：">
+          <el-form-item label="商品规格:">
-            <el-input v-model="form.sku_title" placeholder="商品规格">
+            <el-input
+              v-model="form.sku_title"
+              placeholder="商品规格"
+              style="width: 100px"
+            >
             </el-input>
           </el-form-item>
-          <el-form-item label="商品品牌：">
+          <el-form-item label="商品品牌:">
-            <el-select v-model="form.brand_id" placeholder="商品品牌">
+            <el-select
+              v-model="form.brand_id"
+              placeholder="商品品牌"
+              style="width: 125px"
+            >
               <el-option
                 v-for="item in brand"
                 :key="item.id"
@@ -35,8 +51,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商品状态：">
+          <el-form-item label="商品状态:">
-            <el-select v-model="form.status" placeholder="商品状态">
+            <el-select
+              v-model="form.status"
+              placeholder="商品状态"
+              style="width: 125px"
+            >
               <el-option
                 v-for="item in options"
                 :key="item.id"
@@ -46,7 +66,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间：">
+          <el-form-item label="创建时间:">
             <div class="block">
               <el-date-picker
                 v-model="value1"
@@ -56,6 +76,7 @@
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 @change="getSTime"
+                style="width: 350px"
               >
               </el-date-picker>
             </div>
@@ -203,7 +224,7 @@
           tooltip-effect="dark"
           style="width: 100%"
           @selection-change="handleSelectionChange"
-          max-height="500"
+          max-height="1500"
         >
           <!-- 多选框 -->
           <el-table-column type="selection" width="55"></el-table-column>
@@ -243,7 +264,7 @@
           <el-table-column prop="yesterday_num" sortable label="1T">
           </el-table-column>
 
-          <el-table-column sortable label="今日到货" min-width="110">
+          <el-table-column sortable label="0T" min-width="80">
             <template slot-scope="scope">
               <div v-if="isShow">
                 <el-input v-model="scope.row.arrived_today_num11"></el-input>
@@ -268,8 +289,8 @@
           <el-table-column
             prop="reference_price"
             sortable
-            label="参考售价"
+            label="售价"
-            min-width="110"
+            min-width="80"
           >
             <template slot-scope="scope">
               <div v-if="scope.row.id === id">
@@ -289,14 +310,9 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="num" sortable label="总量" min-width="110">
+          <el-table-column prop="num" sortable label="总量" min-width="80">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="reserve" sortable label="预留" min-width="80">
-            prop="reserve"
-            sortable
-            label="预留量"
-            min-width="110"
-          >
             <template slot-scope="scope">
               <div v-if="scope.row.id === id1">
                 <el-input
@@ -316,7 +332,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column sortable label="店铺订单" min-width="110">
+          <el-table-column sortable label="订单" min-width="80">
             <template slot-scope="scope">
               <div>
                 <span v-if="shopOrder[scope.row.daily.sku_id]">{{