!218 合并

Merge pull request !218 from 赵世界/feat/2024

app/Http/Controllers/Goods/GoodsSkusController.php

@@ -483,9 +483,6 @@ class GoodsSkusController extends Controller
             $this->log->message = $request->get('reason');
             $this->setBeforeUpdateForLog($record->loss_num);
             $record->loss_num += $request->loss_num;
-            if ('补发' === $request->get('reason')) {
-                $record->reissue_num += $request->loss_num;
-            }
             $record->save();
             $this->setAfterUpdateForLog($record->loss_num);
             $sku->stock -= $request->loss_num;

app/Models/DailySalesReport.php

@@ -14,5 +14,6 @@ class DailySalesReport extends Model
     public $fieldSearchable = [
         'date',
         'name' => 'like',
+        'sales_num' => '>',
     ];
 }

database/migrations/2024_03_14_150026_create_daily_sales_reports_table.php

@@ -25,7 +25,7 @@ class CreateDailySalesReportsTable extends Migration
             $table->string('external_sku_id', 64);
             $table->integer('inventory')->default(0)->comment('盘点数量');
             $table->integer('arrived_today_num')->default(0)->comment('今日到货');
-            $table->integer('sales_num')->default(0)->comment('销量');
+            $table->integer('sales_num')->default(0)->comment('总销量');
             $table->integer('already_cancel_number')->default(0)->comment('已取消数量');
             $table->unsignedInteger('loss_num')->default(0)->comment('损耗');
             $table->decimal('goal_rate', 8, 4)->default(0)->comment('目标去化率');

public/dist/css/134.9791a0cc.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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-65938c54]{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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-32c63f25]{margin-top:20px}

public/dist/css/440.6e10234a.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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.table[data-v-08540a0c]{margin-top:20px;position:relative}.btn[data-v-08540a0c]{float:right}[data-v-08540a0c] .cell{display:flex;align-items:center}.commodityimg[data-v-08540a0c]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-08540a0c]{width:100%;height:100%}.confirmbtn[data-v-08540a0c]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-08540a0c]{margin-top:30px}.import-right a[data-v-08540a0c]{text-decoration:none;color:#000}[data-v-08540a0c] .btn11{padding:0;width:14px;height:14px}[data-v-08540a0c] .btn11 img{width:100%;height:100%}.page[data-v-08540a0c]{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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.table[data-v-b19d0430]{margin-top:20px;position:relative}.btn[data-v-b19d0430]{float:right}[data-v-b19d0430] .cell{display:flex;align-items:center}.commodityimg[data-v-b19d0430]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-b19d0430]{width:100%;height:100%}.confirmbtn[data-v-b19d0430]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-b19d0430]{margin-top:30px}.import-right a[data-v-b19d0430]{text-decoration:none;color:#000}[data-v-b19d0430] .btn11{padding:0;width:14px;height:14px}[data-v-b19d0430] .btn11 img{width:100%;height:100%}.page[data-v-b19d0430]{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><script defer="defer" src="js/chunk-vendors.d9425508.js"></script><script defer="defer" src="js/app.82729805.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.487f8f5a.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></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><script defer="defer" src="js/chunk-vendors.d9425508.js"></script><script defer="defer" src="js/app.4e444ea1.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.487f8f5a.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></body></html>

public/dist/js/120.5c1d5ae6.js

@@ -1,4 +1,4 @@
 (self["webpackChunkerp"]=self["webpackChunkerp"]||[]).push([[120],{3120:function(e,t,n){"use strict";n.r(t),n.d(t,{default:function(){return m}});var r=function(){var e=this,t=e._self._c;return t("div",[t("el-container",[t("el-container",[t("el-aside",{class:e.show?"aside-show":"aside-hide"},[t("el-menu",{attrs:{router:"","background-color":"#282c34","text-color":"#fff","default-active":e.$route.path,"default-openeds":e.openeds}},e._l(e.menu,(function(n){return t("div",{key:n.id},[n.children?t("el-submenu",{attrs:{index:n.code}},[t("template",{slot:"title"},[t("span",[e._v(e._s(n.name))])]),e._l(n.children,(function(n){return t("el-menu-item",{key:n.id,attrs:{index:n.code}},[e._v(e._s(n.name)+" ")])}))],2):t("el-menu-item",{attrs:{index:n.code}},[t("span",[e._v(e._s(n.name))])])],1)})),0)],1),t("el-main",[t("div",{staticClass:"head"},[t("ul",[t("li",[t("div",{staticClass:"add",on:{click:e.add}},[e.show?t("i",{staticClass:"el-icon-s-unfold"}):t("i",{staticClass:"el-icon-s-fold"})]),t("div",{staticClass:"right"},[t("el-breadcrumb",{attrs:{"separator-class":"el-icon-arrow-right"}},e._l(e.titie,(function(n,r){return t("el-breadcrumb-item",{key:r},[e._v(e._s(n.name)+" ")])})),1)],1)]),t("li",[t("div",{staticStyle:{"margin-right":"10px"}},[e._v(e._s(e.usernmae))]),t("div",{staticClass:"token",on:{click:e.hanleLogout}},[e._v("登出")])])])]),t("div",{staticClass:"box-card"},[t("router-view")],1)])],1)],1)],1)},s=[],i=(n(4114),n(5272)),a=n(802);function o(){return(0,a.A)({url:"/api/menus",method:"get"})}var u={mounted(){o().then((e=>{this.menu=e.data.data})),this.usernmae=localStorage.getItem("userName")},data(){return{menu:[],show:!0,levelData:[],titie:[],head:"",onindex:0,openeds:["GOODS_MANAGE"],usernmae:""}},watch:{$route:{handler:function(e){this.titie=e.matched,this.head=e.name,this.levelData.push({name:e.name,path:e.path});const t=[],n={};for(var r=0;r<this.levelData.length;r++)n[this.levelData[r].name]||(t.push(this.levelData[r]),n[this.levelData[r].name]=!0);this.levelData=t},deep:!0,immediate:!0}},methods:{next(){this.hanletop()},hanletop(){document.getElementById("bottom").scrollIntoView({behavior:"smooth"})},hanlebottom(){document.getElementById("top").scrollIntoView({behavior:"smooth"})},hanleLogout(){(0,i.eF)(),this.$router.push({path:"/Login"})},handlerclick(e){this.$route.path!==e&&this.$router.push({path:e})},add(){this.show=!this.show},hanblDelete(e,t){var n=this.levelData[e].name;if(this.onindex=e,this.levelData.splice(this.onindex,1),t===this.head){var r,s;for(let e=0;e<this.levelData.length;e++)r=this.levelData[e].path,s=this.levelData[e].name;this.levelData.length&&s!==n&&this.$router.push({path:r})}}}},l=u,c=n(1656),d=(0,c.A)(l,r,s,!1,null,"c25279e8",null),m=d.exports},5272:function(e,t,n){"use strict";n.d(t,{eF:function(){return i},gf:function(){return s}});const r="admin_token";function s(){return localStorage.getItem("token")}function i(){return localStorage.removeItem(r)}},802:function(e,t,n){"use strict";var r=n(2505),s=n.n(r),i=n(5272),a=n(5947),o=n.n(a),u=n(1052),l=s().create({timeout:36e4});l.interceptors.request.use((e=>(e.headers.Authorization="Bearer "+(0,i.gf)(),o().start(),e)),(e=>Promise.reject(e))),l.interceptors.response.use((e=>{o().done();const t=e.status;if(200===t||201===t)return e}),(e=>(o().done(),400===e.response.status&&(0,u.Message)({message:e.response.data.errorMessage,type:"error"}),500===e.response.status&&(0,u.Message)({message:e.response.data.message,type:"error"}),Promise.reject(e)))),t.A=l},5947:function(e,t,n){var r,s;
 /* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
  * @license MIT */(function(i,a){r=a,s="function"===typeof r?r.call(t,n,t,e):r,void 0===s||(e.exports=s)})(0,(function(){var e={version:"0.2.0"},t=e.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};function n(e,t,n){return e<t?t:e>n?n:e}function r(e){return 100*(-1+e)}function s(e,n,s){var i;return i="translate3d"===t.positionUsing?{transform:"translate3d("+r(e)+"%,0,0)"}:"translate"===t.positionUsing?{transform:"translate("+r(e)+"%,0)"}:{"margin-left":r(e)+"%"},i.transition="all "+n+"ms "+s,i}e.configure=function(e){var n,r;for(n in e)r=e[n],void 0!==r&&e.hasOwnProperty(n)&&(t[n]=r);return this},e.status=null,e.set=function(r){var o=e.isStarted();r=n(r,t.minimum,1),e.status=1===r?null:r;var u=e.render(!o),l=u.querySelector(t.barSelector),c=t.speed,d=t.easing;return u.offsetWidth,i((function(n){""===t.positionUsing&&(t.positionUsing=e.getPositioningCSS()),a(l,s(r,c,d)),1===r?(a(u,{transition:"none",opacity:1}),u.offsetWidth,setTimeout((function(){a(u,{transition:"all "+c+"ms linear",opacity:0}),setTimeout((function(){e.remove(),n()}),c)}),c)):setTimeout(n,c)})),this},e.isStarted=function(){return"number"===typeof e.status},e.start=function(){e.status||e.set(0);var n=function(){setTimeout((function(){e.status&&(e.trickle(),n())}),t.trickleSpeed)};return t.trickle&&n(),this},e.done=function(t){return t||e.status?e.inc(.3+.5*Math.random()).set(1):this},e.inc=function(t){var r=e.status;return r?("number"!==typeof t&&(t=(1-r)*n(Math.random()*r,.1,.95)),r=n(r+t,0,.994),e.set(r)):e.start()},e.trickle=function(){return e.inc(Math.random()*t.trickleRate)},function(){var t=0,n=0;e.promise=function(r){return r&&"resolved"!==r.state()?(0===n&&e.start(),t++,n++,r.always((function(){n--,0===n?(t=0,e.done()):e.set((t-n)/t)})),this):this}}(),e.render=function(n){if(e.isRendered())return document.getElementById("nprogress");u(document.documentElement,"nprogress-busy");var s=document.createElement("div");s.id="nprogress",s.innerHTML=t.template;var i,o=s.querySelector(t.barSelector),l=n?"-100":r(e.status||0),c=document.querySelector(t.parent);return a(o,{transition:"all 0 linear",transform:"translate3d("+l+"%,0,0)"}),t.showSpinner||(i=s.querySelector(t.spinnerSelector),i&&d(i)),c!=document.body&&u(c,"nprogress-custom-parent"),c.appendChild(s),s},e.remove=function(){l(document.documentElement,"nprogress-busy"),l(document.querySelector(t.parent),"nprogress-custom-parent");var e=document.getElementById("nprogress");e&&d(e)},e.isRendered=function(){return!!document.getElementById("nprogress")},e.getPositioningCSS=function(){var e=document.body.style,t="WebkitTransform"in e?"Webkit":"MozTransform"in e?"Moz":"msTransform"in e?"ms":"OTransform"in e?"O":"";return t+"Perspective"in e?"translate3d":t+"Transform"in e?"translate":"margin"};var i=function(){var e=[];function t(){var n=e.shift();n&&n(t)}return function(n){e.push(n),1==e.length&&t()}}(),a=function(){var e=["Webkit","O","Moz","ms"],t={};function n(e){return e.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,(function(e,t){return t.toUpperCase()}))}function r(t){var n=document.body.style;if(t in n)return t;var r,s=e.length,i=t.charAt(0).toUpperCase()+t.slice(1);while(s--)if(r=e[s]+i,r in n)return r;return t}function s(e){return e=n(e),t[e]||(t[e]=r(e))}function i(e,t,n){t=s(t),e.style[t]=n}return function(e,t){var n,r,s=arguments;if(2==s.length)for(n in t)r=t[n],void 0!==r&&t.hasOwnProperty(n)&&i(e,n,r);else i(e,s[1],s[2])}}();function o(e,t){var n="string"==typeof e?e:c(e);return n.indexOf(" "+t+" ")>=0}function u(e,t){var n=c(e),r=n+t;o(n,t)||(e.className=r.substring(1))}function l(e,t){var n,r=c(e);o(e,t)&&(n=r.replace(" "+t+" "," "),e.className=n.substring(1,n.length-1))}function c(e){return(" "+(e.className||"")+" ").replace(/\s+/gi," ")}function d(e){e&&e.parentNode&&e.parentNode.removeChild(e)}return e}))}}]);
-//# sourceMappingURL=120.f7bab21f.js.map
+//# sourceMappingURL=120.5c1d5ae6.js.map

public/dist/js/353.e5fb591c.js

@@ -1,4 +1,4 @@
 (self["webpackChunkerp"]=self["webpackChunkerp"]||[]).push([[353],{8353:function(t,e,r){"use strict";r.r(e),r.d(e,{default:function(){return c}});var n=function(){var t=this,e=t._self._c;return e("div",[e("el-card",{staticClass:"box-card",attrs:{"body-style":{padding:"20px 20px 0 20px"}}},[e("el-form",{staticClass:"demo-form-inline",attrs:{inline:!0,model:t.formSearch}},[e("el-form-item",{attrs:{label:"团购状态"}},[e("el-select",{attrs:{placeholder:"团购状态"},model:{value:t.formSearch.status,callback:function(e){t.$set(t.formSearch,"status",e)},expression:"formSearch.status"}},[e("el-option",{attrs:{label:"未开始",value:"-5"}}),e("el-option",{attrs:{label:"跟团中",value:"1"}}),e("el-option",{attrs:{label:"预览中",value:"-10"}}),e("el-option",{attrs:{label:"已结束",value:"20"}})],1)],1),e("el-form-item",{attrs:{label:"活动标题"}},[e("el-input",{attrs:{placeholder:"活动标题"},model:{value:t.formSearch.title,callback:function(e){t.$set(t.formSearch,"title",e)},expression:"formSearch.title"}})],1),e("el-form-item",[e("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.getGroupList()}}},[t._v("查询")]),e("el-button",{attrs:{type:"success"},on:{click:function(e){return t.groupAdd()}}},[t._v("新增团购")])],1)],1)],1),e("el-card",{staticClass:"box-card",staticStyle:{"margin-top":"10px"}},[e("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:t.tableData,border:"","row-key":"id","tree-props":{children:"children"}}},[e("el-table-column",{attrs:{prop:"shop.name",label:"店铺"}}),e("el-table-column",{attrs:{prop:"title",label:"活动标题"}}),e("el-table-column",{attrs:{prop:"status",label:"团购状态"}}),e("el-table-column",{attrs:{label:"开团时间"},scopedSlots:t._u([{key:"default",fn:function(r){return[e("div",[t._v(t._s(r.row.start_time))]),e("div",[t._v("至")]),e("div",[t._v(t._s(r.row.end_time))])]}}])}),e("el-table-column",{attrs:{label:"手机查看"},scopedSlots:t._u([{key:"default",fn:function(t){return[e("el-image",{staticStyle:{width:"100px",height:"100px"},attrs:{src:t.row.qr_code_url}})]}}])}),e("el-table-column",{attrs:{prop:"create_status",label:"创建结果"}}),e("el-table-column",{attrs:{prop:"options",label:"操作"},scopedSlots:t._u([{key:"default",fn:function(r){return[0==r.row.parent_id?e("el-button",{attrs:{type:"text",size:"small"},on:{click:function(e){return t.groupEdit(r.row.id)}}},[t._v("编辑")]):t._e()]}}])})],1)],1)],1)},o=[],s=(r(4114),r(7403)),a={data(){return{formSearch:{status:"",title:"",page:1,per_page:20},loading:!0,tableData:[]}},mounted(){this.getGroupList()},methods:{getGroupList(){(0,s.M5)(this.formSearch).then((t=>{this.tableData=t.data.data,this.loading=!1}))},groupAdd(){this.$router.push({path:"GROUP_GOODS_ADD",query:{id:0}})},groupEdit(t){this.$router.push({path:"GROUP_GOODS_EDIT",query:{id:t}})}}},i=a,u=r(1656),l=(0,u.A)(i,n,o,!1,null,null,null),c=l.exports},7403:function(t,e,r){"use strict";r.d(e,{$:function(){return s},M5:function(){return o},OY:function(){return u},V9:function(){return a},cj:function(){return i},vS:function(){return l}});var n=r(802);function o(t){return(0,n.A)({url:"/api/group",method:"get",params:t})}function s(t){return(0,n.A)({url:"/api/group",method:"post",data:t})}function a(t){return(0,n.A)({url:`/api/group/${t}`,method:"get"})}function i(t,e){return(0,n.A)({url:`/api/group/${t}`,method:"patch",data:e})}function u(t){return(0,n.A)({url:"/api/groupGoods",method:"get",params:t})}function l(t){return(0,n.A)({url:"/api/groupGoods",method:"post",params:t})}},5272:function(t,e,r){"use strict";r.d(e,{eF:function(){return s},gf:function(){return o}});const n="admin_token";function o(){return localStorage.getItem("token")}function s(){return localStorage.removeItem(n)}},802:function(t,e,r){"use strict";var n=r(2505),o=r.n(n),s=r(5272),a=r(5947),i=r.n(a),u=r(1052),l=o().create({timeout:36e4});l.interceptors.request.use((t=>(t.headers.Authorization="Bearer "+(0,s.gf)(),i().start(),t)),(t=>Promise.reject(t))),l.interceptors.response.use((t=>{i().done();const e=t.status;if(200===e||201===e)return t}),(t=>(i().done(),400===t.response.status&&(0,u.Message)({message:t.response.data.errorMessage,type:"error"}),500===t.response.status&&(0,u.Message)({message:t.response.data.message,type:"error"}),Promise.reject(t)))),e.A=l},5947:function(t,e,r){var n,o;
 /* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
  * @license MIT */(function(s,a){n=a,o="function"===typeof n?n.call(e,r,e,t):n,void 0===o||(t.exports=o)})(0,(function(){var t={version:"0.2.0"},e=t.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};function r(t,e,r){return t<e?e:t>r?r:t}function n(t){return 100*(-1+t)}function o(t,r,o){var s;return s="translate3d"===e.positionUsing?{transform:"translate3d("+n(t)+"%,0,0)"}:"translate"===e.positionUsing?{transform:"translate("+n(t)+"%,0)"}:{"margin-left":n(t)+"%"},s.transition="all "+r+"ms "+o,s}t.configure=function(t){var r,n;for(r in t)n=t[r],void 0!==n&&t.hasOwnProperty(r)&&(e[r]=n);return this},t.status=null,t.set=function(n){var i=t.isStarted();n=r(n,e.minimum,1),t.status=1===n?null:n;var u=t.render(!i),l=u.querySelector(e.barSelector),c=e.speed,p=e.easing;return u.offsetWidth,s((function(r){""===e.positionUsing&&(e.positionUsing=t.getPositioningCSS()),a(l,o(n,c,p)),1===n?(a(u,{transition:"none",opacity:1}),u.offsetWidth,setTimeout((function(){a(u,{transition:"all "+c+"ms linear",opacity:0}),setTimeout((function(){t.remove(),r()}),c)}),c)):setTimeout(r,c)})),this},t.isStarted=function(){return"number"===typeof t.status},t.start=function(){t.status||t.set(0);var r=function(){setTimeout((function(){t.status&&(t.trickle(),r())}),e.trickleSpeed)};return e.trickle&&r(),this},t.done=function(e){return e||t.status?t.inc(.3+.5*Math.random()).set(1):this},t.inc=function(e){var n=t.status;return n?("number"!==typeof e&&(e=(1-n)*r(Math.random()*n,.1,.95)),n=r(n+e,0,.994),t.set(n)):t.start()},t.trickle=function(){return t.inc(Math.random()*e.trickleRate)},function(){var e=0,r=0;t.promise=function(n){return n&&"resolved"!==n.state()?(0===r&&t.start(),e++,r++,n.always((function(){r--,0===r?(e=0,t.done()):t.set((e-r)/e)})),this):this}}(),t.render=function(r){if(t.isRendered())return document.getElementById("nprogress");u(document.documentElement,"nprogress-busy");var o=document.createElement("div");o.id="nprogress",o.innerHTML=e.template;var s,i=o.querySelector(e.barSelector),l=r?"-100":n(t.status||0),c=document.querySelector(e.parent);return a(i,{transition:"all 0 linear",transform:"translate3d("+l+"%,0,0)"}),e.showSpinner||(s=o.querySelector(e.spinnerSelector),s&&p(s)),c!=document.body&&u(c,"nprogress-custom-parent"),c.appendChild(o),o},t.remove=function(){l(document.documentElement,"nprogress-busy"),l(document.querySelector(e.parent),"nprogress-custom-parent");var t=document.getElementById("nprogress");t&&p(t)},t.isRendered=function(){return!!document.getElementById("nprogress")},t.getPositioningCSS=function(){var t=document.body.style,e="WebkitTransform"in t?"Webkit":"MozTransform"in t?"Moz":"msTransform"in t?"ms":"OTransform"in t?"O":"";return e+"Perspective"in t?"translate3d":e+"Transform"in t?"translate":"margin"};var s=function(){var t=[];function e(){var r=t.shift();r&&r(e)}return function(r){t.push(r),1==t.length&&e()}}(),a=function(){var t=["Webkit","O","Moz","ms"],e={};function r(t){return t.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,(function(t,e){return e.toUpperCase()}))}function n(e){var r=document.body.style;if(e in r)return e;var n,o=t.length,s=e.charAt(0).toUpperCase()+e.slice(1);while(o--)if(n=t[o]+s,n in r)return n;return e}function o(t){return t=r(t),e[t]||(e[t]=n(t))}function s(t,e,r){e=o(e),t.style[e]=r}return function(t,e){var r,n,o=arguments;if(2==o.length)for(r in e)n=e[r],void 0!==n&&e.hasOwnProperty(r)&&s(t,r,n);else s(t,o[1],o[2])}}();function i(t,e){var r="string"==typeof t?t:c(t);return r.indexOf(" "+e+" ")>=0}function u(t,e){var r=c(t),n=r+e;i(r,e)||(t.className=n.substring(1))}function l(t,e){var r,n=c(t);i(t,e)&&(r=n.replace(" "+e+" "," "),t.className=r.substring(1,r.length-1))}function c(t){return(" "+(t.className||"")+" ").replace(/\s+/gi," ")}function p(t){t&&t.parentNode&&t.parentNode.removeChild(t)}return t}))}}]);
-//# sourceMappingURL=353.4764f5dd.js.map
+//# sourceMappingURL=353.e5fb591c.js.map

public/dist/js/412.9897d0c7.js

@@ -1,4 +1,4 @@
 (self["webpackChunkerp"]=self["webpackChunkerp"]||[]).push([[412],{1412:function(e,t,n){"use strict";n.r(t),n.d(t,{default:function(){return f}});var s=function(){var e=this,t=e._self._c;return t("div",{staticClass:"conent"},[t("div",{staticClass:"from"},[t("el-dialog",{attrs:{title:"新增角色",visible:e.dialogVisible2,width:"30%","close-on-click-modal":!1},on:{"update:visible":function(t){e.dialogVisible2=t}}},[t("div",[t("el-form",{attrs:{"label-width":"80px"}},[t("el-form-item",{attrs:{label:"角色名称"}},[t("el-input",{model:{value:e.newrole,callback:function(t){e.newrole=t},expression:"newrole"}})],1),t("div",{staticClass:"from-btn"},[t("el-button",{attrs:{type:"danger"},on:{click:function(t){e.dialogVisible2=!1}}},[e._v("取消")]),t("el-button",{on:{click:e.onSubmit}},[e._v("确认")])],1)],1)],1)])],1),t("el-button",{attrs:{type:"primary"},on:{click:function(t){e.dialogVisible2=!0}}},[e._v("新增")]),t("div",{staticClass:"table",staticStyle:{"margin-top":"10px"}},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableList}},[t("el-table-column",{attrs:{prop:"id",label:"ID"}}),t("el-table-column",{attrs:{prop:"name",label:"角色名称"}}),t("el-table-column",{attrs:{label:"权限内容"},scopedSlots:e._u([{key:"default",fn:function(n){return e._l(n.row.permissions,(function(n){return t("span",{key:n.id},[e._v(e._s(n.name)+" ")])}))}}])}),t("el-table-column",{attrs:{label:"操作"},scopedSlots:e._u([{key:"default",fn:function(n){return[t("el-button",{on:{click:function(t){return e.onEdit(n.row)}}},[e._v("编辑")])]}}])})],1)],1),t("el-dialog",{attrs:{title:"编辑权限",visible:e.dialogVisible,width:"30%","close-on-click-modal":!1},on:{"update:visible":function(t){e.dialogVisible=t}}},[e.isShowtree?t("el-tree",{ref:"tree",attrs:{data:e.Role_Permission,"show-checkbox":"","default-expand-all":!1,"node-key":"id","highlight-current":"",props:e.defaultProps,"default-checked-keys":e.chekedKeys},model:{value:e.permissionIds,callback:function(t){e.permissionIds=t},expression:"permissionIds"}}):e._e(),t("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[t("el-button",{on:{click:function(t){return e.cancel()}}},[e._v("取 消")]),t("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.getCheckedKeys()}}},[e._v("确 定")])],1)],1)],1)},i=[],r=n(802);function o(){return(0,r.A)({url:"/api/roles",method:"get"})}function a(e){return(0,r.A)({url:"/api/roles",method:"post",data:e})}function l(){return(0,r.A)({url:"/api/permissions",method:"get"})}function u(e,t){return(0,r.A)({url:`/api/roles/${e}/permissions`,method:"post",data:t})}var c={data(){return{id:"",loading:!0,tableList:[],rolePermissions:[],newrole:"",dialogVisible:!1,dialogVisible2:!1,permissionIds:[],allpermissionIds:{},Role_Permission:[],defaultProps:{children:"children",label:"name"},isShowtree:!1,chekedKeys:[]}},mounted(){this.getroleList(),this.getJurisdiction()},methods:{getroleList(){o().then((e=>{this.tableList=e.data.data})),this.loading=!1},getJurisdiction(){l().then((e=>{this.Role_Permission=e.data.data}))},onSubmit(){let e={name:this.newrole};a(e).then((e=>{this.dialogVisible2=!1,this.getroleList(),201==e.status&&this.$message({message:"角色添加成功！",type:"success"})}))},onEdit(e){this.id=e.id;let t=e.permissions.map((e=>e.id));this.chekedKeys=t,this.dialogVisible=!0,this.isShowtree=!0},cancel(){this.dialogVisible=!1,this.isShowtree=!1},getCheckedKeys(){let e=this.id;this.permissionIds=this.$refs.tree.getCheckedKeys(),this.allpermissionIds={permissionIds:this.permissionIds},u(e,this.allpermissionIds).then((e=>{200===e.status&&(this.dialogVisible=!1,this.getroleList(),this.$message({message:"权限修改成功！",type:"success"}))}))}}},d=c,m=n(1656),p=(0,m.A)(d,s,i,!1,null,"7d26d779",null),f=p.exports},5272:function(e,t,n){"use strict";n.d(t,{eF:function(){return r},gf:function(){return i}});const s="admin_token";function i(){return localStorage.getItem("token")}function r(){return localStorage.removeItem(s)}},802:function(e,t,n){"use strict";var s=n(2505),i=n.n(s),r=n(5272),o=n(5947),a=n.n(o),l=n(1052),u=i().create({timeout:36e4});u.interceptors.request.use((e=>(e.headers.Authorization="Bearer "+(0,r.gf)(),a().start(),e)),(e=>Promise.reject(e))),u.interceptors.response.use((e=>{a().done();const t=e.status;if(200===t||201===t)return e}),(e=>(a().done(),400===e.response.status&&(0,l.Message)({message:e.response.data.errorMessage,type:"error"}),500===e.response.status&&(0,l.Message)({message:e.response.data.message,type:"error"}),Promise.reject(e)))),t.A=u},5947:function(e,t,n){var s,i;
 /* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
  * @license MIT */(function(r,o){s=o,i="function"===typeof s?s.call(t,n,t,e):s,void 0===i||(e.exports=i)})(0,(function(){var e={version:"0.2.0"},t=e.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};function n(e,t,n){return e<t?t:e>n?n:e}function s(e){return 100*(-1+e)}function i(e,n,i){var r;return r="translate3d"===t.positionUsing?{transform:"translate3d("+s(e)+"%,0,0)"}:"translate"===t.positionUsing?{transform:"translate("+s(e)+"%,0)"}:{"margin-left":s(e)+"%"},r.transition="all "+n+"ms "+i,r}e.configure=function(e){var n,s;for(n in e)s=e[n],void 0!==s&&e.hasOwnProperty(n)&&(t[n]=s);return this},e.status=null,e.set=function(s){var a=e.isStarted();s=n(s,t.minimum,1),e.status=1===s?null:s;var l=e.render(!a),u=l.querySelector(t.barSelector),c=t.speed,d=t.easing;return l.offsetWidth,r((function(n){""===t.positionUsing&&(t.positionUsing=e.getPositioningCSS()),o(u,i(s,c,d)),1===s?(o(l,{transition:"none",opacity:1}),l.offsetWidth,setTimeout((function(){o(l,{transition:"all "+c+"ms linear",opacity:0}),setTimeout((function(){e.remove(),n()}),c)}),c)):setTimeout(n,c)})),this},e.isStarted=function(){return"number"===typeof e.status},e.start=function(){e.status||e.set(0);var n=function(){setTimeout((function(){e.status&&(e.trickle(),n())}),t.trickleSpeed)};return t.trickle&&n(),this},e.done=function(t){return t||e.status?e.inc(.3+.5*Math.random()).set(1):this},e.inc=function(t){var s=e.status;return s?("number"!==typeof t&&(t=(1-s)*n(Math.random()*s,.1,.95)),s=n(s+t,0,.994),e.set(s)):e.start()},e.trickle=function(){return e.inc(Math.random()*t.trickleRate)},function(){var t=0,n=0;e.promise=function(s){return s&&"resolved"!==s.state()?(0===n&&e.start(),t++,n++,s.always((function(){n--,0===n?(t=0,e.done()):e.set((t-n)/t)})),this):this}}(),e.render=function(n){if(e.isRendered())return document.getElementById("nprogress");l(document.documentElement,"nprogress-busy");var i=document.createElement("div");i.id="nprogress",i.innerHTML=t.template;var r,a=i.querySelector(t.barSelector),u=n?"-100":s(e.status||0),c=document.querySelector(t.parent);return o(a,{transition:"all 0 linear",transform:"translate3d("+u+"%,0,0)"}),t.showSpinner||(r=i.querySelector(t.spinnerSelector),r&&d(r)),c!=document.body&&l(c,"nprogress-custom-parent"),c.appendChild(i),i},e.remove=function(){u(document.documentElement,"nprogress-busy"),u(document.querySelector(t.parent),"nprogress-custom-parent");var e=document.getElementById("nprogress");e&&d(e)},e.isRendered=function(){return!!document.getElementById("nprogress")},e.getPositioningCSS=function(){var e=document.body.style,t="WebkitTransform"in e?"Webkit":"MozTransform"in e?"Moz":"msTransform"in e?"ms":"OTransform"in e?"O":"";return t+"Perspective"in e?"translate3d":t+"Transform"in e?"translate":"margin"};var r=function(){var e=[];function t(){var n=e.shift();n&&n(t)}return function(n){e.push(n),1==e.length&&t()}}(),o=function(){var e=["Webkit","O","Moz","ms"],t={};function n(e){return e.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,(function(e,t){return t.toUpperCase()}))}function s(t){var n=document.body.style;if(t in n)return t;var s,i=e.length,r=t.charAt(0).toUpperCase()+t.slice(1);while(i--)if(s=e[i]+r,s in n)return s;return t}function i(e){return e=n(e),t[e]||(t[e]=s(e))}function r(e,t,n){t=i(t),e.style[t]=n}return function(e,t){var n,s,i=arguments;if(2==i.length)for(n in t)s=t[n],void 0!==s&&t.hasOwnProperty(n)&&r(e,n,s);else r(e,i[1],i[2])}}();function a(e,t){var n="string"==typeof e?e:c(e);return n.indexOf(" "+t+" ")>=0}function l(e,t){var n=c(e),s=n+t;a(n,t)||(e.className=s.substring(1))}function u(e,t){var n,s=c(e);a(e,t)&&(n=s.replace(" "+t+" "," "),e.className=n.substring(1,n.length-1))}function c(e){return(" "+(e.className||"")+" ").replace(/\s+/gi," ")}function d(e){e&&e.parentNode&&e.parentNode.removeChild(e)}return e}))}}]);
-//# sourceMappingURL=412.221a0095.js.map
+//# sourceMappingURL=412.9897d0c7.js.map

resources/frontend/src/views/dataCenter/salesReport.vue

@@ -3,13 +3,18 @@
         <el-card :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="日期:">
-                    <el-date-picker v-model="form.date" type="date" placeholder="日期" format="yyyy-MM-DD" value-format="yyyy-MM-DD"></el-date-picker>
+                    <el-date-picker v-model="form.date" type="date" placeholder="日期" format="yyyy-MM-DD"
+                        value-format="yyyy-MM-DD"></el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="商品名称:">
                     <el-input v-model="form.name" placeholder="商品名称"></el-input>
                 </el-form-item>
 
+                <el-form-item label="总销量大于:">
+                    <el-input v-model="form.sales_num" placeholder="总销量"></el-input>
+                </el-form-item>
+
                 <el-form-item>
                     <el-button type="primary" @click="handleChoose">筛选</el-button>
                     <el-button plain @click="handleReChoose">重置筛选</el-button>
@@ -18,53 +23,54 @@
         </el-card>
 
         <el-card style="margin-top: 10px">
-            <el-table v-loading="loading" ref="multipleTable" :data="tableData" style="width: 100%"
+            <el-table v-loading="loading" ref="multipleTable" :data="tableData" style="width: 100%" height="900"
-                @sort-change="sortChange" :default-sort="{ prop: 'sales_num', order: 'descending' }">
+                :cell-style="tableCellClassName" @sort-change="sortChange"
+                :default-sort="{ prop: 'sales_num', order: 'descending' }">
                 <el-table-column label="商品名称" prop="name" width="250"></el-table-column>
                 <el-table-column label="完整编码" prop="external_sku_id"></el-table-column>
                 <el-table-column label="入库数量" prop="stock"></el-table-column>
-                <el-table-column label="销量" prop="sales_num" sortable="custom"></el-table-column>
+                <el-table-column label="总销量" prop="sales_num" sortable="custom"></el-table-column>
                 <el-table-column label="损耗" prop="loss_num"></el-table-column>
                 <el-table-column label="目标去化率" prop="goal_rate"></el-table-column>
 
                 <el-table-column label="S1(11:00-12:00)">
-                    <el-table-column prop="S1" label="销量">
+                    <el-table-column prop="S1" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S1_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S2(11:00-13:30)">
-                    <el-table-column prop="S2" label="销量">
+                    <el-table-column prop="S2" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S2_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S3(11:00-15:00)">
-                    <el-table-column prop="S3" label="销量">
+                    <el-table-column prop="S3" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S3_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S4(15:00-16:00)">
-                    <el-table-column prop="S4" label="销量">
+                    <el-table-column prop="S4" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S4_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S5(11:00-17:30)">
-                    <el-table-column prop="S5" label="销量">
+                    <el-table-column prop="S5" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S5_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S6(11:00-20:00)">
-                    <el-table-column prop="S6" label="销量">
+                    <el-table-column prop="S6" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S6_rate" label="去化率" sortable="custom">
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="S7(11:00-09:00)">
-                    <el-table-column prop="S7" label="销量">
+                    <el-table-column prop="S7" label="销量" sortable="custom">
                     </el-table-column>
                     <el-table-column prop="S7_rate" label="去化率" sortable="custom">
                     </el-table-column>
@@ -92,12 +98,13 @@ export default {
                 name: "",
                 sort: "sales_num",
                 sortOrder: "DESC",
+                sales_num: 0,
             },
             loading: true,
             tableData: [],
             Paginationdata: {}, //分页相关数据
             current_page: 1, //当前页
-            per_page: 50, //每页显示数量
+            per_page: 100, //每页显示数量
         };
     },
     mounted() {
@@ -149,6 +156,15 @@ export default {
             this.form.sort = line.prop;
             this.form.sortOrder = ('ascending' === line.order) ? 'ASC' : 'DESC';
             this.salseReportData(this.form);
+        },
+        tableCellClassName({ row, column, rowIndex, columnIndex }) {
+            if (column.property == 'S2' || column.property == 'S4' || column.property == 'S6' || column.property == 'S2_rate' || column.property == 'S4_rate' || column.property == 'S6_rate') {
+                return {
+                    "background-color": "beige"
+                };
+            } else {
+                return '';
+            }
         }
     },
 };

resources/frontend/src/views/goods/goods.vue

@@ -217,7 +217,7 @@
                                         </el-radio-group>
                                     </el-form-item>
                                     <el-form-item>
-                                        <el-button type="primary" @click="onLoss(scope.row.id)">保存</el-button>
+                                        <el-button type="primary" @click="onLoss(scope.row)">保存</el-button>
                                     </el-form-item>
                                 </el-form>
 
@@ -264,7 +264,7 @@
             <!-- 分页功能 -->
             <div class="page">
                 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page="current_page" :page-sizes="[15, 50, 100, 150, 200]" :page-size="per_page"
+                    :current-page="current_page" :page-sizes="[100, 150, 200]" :page-size="per_page"
                     layout="total, sizes, prev, pager, next, jumper" :total="Paginationdata.total">
                 </el-pagination>
             </div>
@@ -465,7 +465,7 @@ export default {
             },
             Paginationdata: {}, //分页相关数据
             current_page: 1, //当前页
-            per_page: 10, //每页显示数量
+            per_page: 100, //每页显示数量
             multipleSelection: [], //多选框选中的id
             updateType: "", //更新类型，newest-上新, inventory-库存盘点, stock-库存
             stock: false, //点击库存显示输入框变量
@@ -980,8 +980,10 @@ export default {
                     message: "损耗添加成功！",
                     type: "success",
                 });
-                this.getList();
+                this.handleChoose();
             });
+            this.updateField = "";
+            this.editLossId = "";
         },
 
         //损耗框取消