!22 develop

Merge pull request !22 from develop

public/dist/css/chunk-14ff3ba6.56e84236.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-736dfc22]{width:50px;height:50px}.el-form-item[data-v-736dfc22]{margin-left:60px}.addto[data-v-736dfc22]{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-736dfc22]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-736dfc22]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-736dfc22]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-736dfc22]{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-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}

public/dist/css/chunk-50481dc1.e437602b.css

@@ -0,0 +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)}}.block{margin-top:30px}

public/dist/css/chunk-59f3bcab.f15bb106.css

@@ -1 +0,0 @@
-.block{margin-top:30px}

public/dist/css/chunk-84c0d1fa.47f57404.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)}}a[data-v-28cd2abf]{text-decoration:none;color:#fff}.conent[data-v-28cd2abf]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-28cd2abf]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-28cd2abf]{width:114px;height:44px;border-radius:3px}.table[data-v-28cd2abf]{margin-top:20px}.block[data-v-28cd2abf]{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)}}a[data-v-5edd565e]{text-decoration:none;color:#fff}.conent[data-v-5edd565e]{width:100%;min-height:calc(100vh - 200px);position:relative}.btn[data-v-5edd565e]{height:104px;border-radius:5px;display:flex;align-items:center}.btn .el-button[data-v-5edd565e]{width:114px;height:44px;border-radius:3px}.table[data-v-5edd565e]{margin-top:20px}.block[data-v-5edd565e]{margin-top:30px}

public/dist/css/chunk-e3a7295c.af7206a8.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-c458deb8]{position:relative}.table[data-v-c458deb8]{margin-top:40px;position:relative}.btn[data-v-c458deb8]{float:right}[data-v-c458deb8] .cell{display:flex;align-items:center}.commodityimg[data-v-c458deb8]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-c458deb8]{width:100%;height:100%}.confirmbtn[data-v-c458deb8]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-c458deb8]{margin-top:30px}.import-right a[data-v-c458deb8]{text-decoration:none;color:#000}[data-v-c458deb8] .btn11{padding:0;width:14px;height:14px}.page[data-v-c458deb8]{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-34fda096]{position:relative}.table[data-v-34fda096]{margin-top:40px;position:relative}.btn[data-v-34fda096]{float:right}[data-v-34fda096] .cell{display:flex;align-items:center}.commodityimg[data-v-34fda096]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-34fda096]{width:100%;height:100%}.confirmbtn[data-v-34fda096]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-34fda096]{margin-top:30px}.import-right a[data-v-34fda096]{text-decoration:none;color:#000}[data-v-34fda096] .btn11{padding:0;width:14px;height:14px}.page[data-v-34fda096]{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-1c29c14c.5f516208.css" rel="prefetch"><link href="css/chunk-4a36a8d0.e437602b.css" rel="prefetch"><link href="css/chunk-59f3bcab.f15bb106.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-61dfd850.94d448e7.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-75f0e99c.df77b785.css" rel="prefetch"><link href="css/chunk-8eb4b592.9e793ba8.css" rel="prefetch"><link href="css/chunk-959f9a24.ed76f224.css" rel="prefetch"><link href="css/chunk-add81472.d2951bcc.css" rel="prefetch"><link href="js/chunk-1c29c14c.c7cdcdff.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-4a36a8d0.d535bd22.js" rel="prefetch"><link href="js/chunk-59f3bcab.17babc01.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-61dfd850.db243aab.js" rel="prefetch"><link href="js/chunk-62101cb8.edf40036.js" rel="prefetch"><link href="js/chunk-7136ffb6.611618ad.js" rel="prefetch"><link href="js/chunk-75f0e99c.30bf54fd.js" rel="prefetch"><link href="js/chunk-8eb4b592.8870bff7.js" rel="prefetch"><link href="js/chunk-959f9a24.495563fb.js" rel="prefetch"><link href="js/chunk-add81472.f7c0a318.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.2e7103d0.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.2e7103d0.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-50481dc1.e437602b.css" rel="prefetch"><link href="css/chunk-5ed10db2.12c276ba.css" rel="prefetch"><link href="css/chunk-61dfd850.94d448e7.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="css/chunk-e3a7295c.af7206a8.css" rel="prefetch"><link href="js/chunk-0f67ac47.4fc64cc7.js" rel="prefetch"><link href="js/chunk-14ff3ba6.bed88b43.js" rel="prefetch"><link href="js/chunk-2d23156c.6af6d42e.js" rel="prefetch"><link href="js/chunk-50481dc1.fada9ab7.js" rel="prefetch"><link href="js/chunk-5ed10db2.f7bc8652.js" rel="prefetch"><link href="js/chunk-61dfd850.db243aab.js" rel="prefetch"><link href="js/chunk-62101cb8.edf40036.js" rel="prefetch"><link href="js/chunk-7136ffb6.611618ad.js" rel="prefetch"><link href="js/chunk-84c0d1fa.6ca8adf5.js" rel="prefetch"><link href="js/chunk-8eb4b592.8870bff7.js" rel="prefetch"><link href="js/chunk-959f9a24.495563fb.js" rel="prefetch"><link href="js/chunk-e3a7295c.a345a600.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.5baf317a.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.5baf317a.js"></script></body></html>

public/dist/js/chunk-59f3bcab.17babc01.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-59f3bcab"],{"054a":function(e,a,t){"use strict";t.r(a);var l=function(){var e=this,a=e._self._c;return a("div",[a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"goods",staticStyle:{margin:"20px"}},[a("el-form",{ref:"form",attrs:{inline:!0,model:e.form}},[a("el-form-item",{attrs:{label:"查询类别："}},[a("el-select",{attrs:{placeholder:"全部"},model:{value:e.form.name1,callback:function(a){e.$set(e.form,"name1",a)},expression:"form.name1"}},e._l(e.options,(function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),a("el-form-item",{attrs:{label:"操作用户"}},[a("el-select",{attrs:{placeholder:"输入操作用户"},model:{value:e.form.name2,callback:function(a){e.$set(e.form,"name2",a)},expression:"form.name2"}},e._l(e.options,(function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),a("el-form-item",{attrs:{label:"操作时间："}},[a("el-date-picker",{attrs:{type:"datetimerange","range-separator":"至","start-placeholder":"起","end-placeholder":"止"},model:{value:e.value1,callback:function(a){e.value1=a},expression:"value1"}})],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"}},[e._v("查询")])],1)],1)],1)]),a("el-card",{staticClass:"box-card",staticStyle:{"margin-top":"30px"}},[a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.tableData}},[a("el-table-column",{attrs:{prop:"id",label:"序号"}}),a("el-table-column",{attrs:{prop:"created_at",label:"时间"}}),a("el-table-column",{attrs:{prop:"target_field",label:"类别"}}),a("el-table-column",{attrs:{prop:"before_update",label:"操作前"}}),a("el-table-column",{attrs:{prop:"after_update",label:"操作后"}}),a("el-table-column",{attrs:{prop:"user.name",label:"操作人"}})],1)],1),a("div",{staticClass:"block"},[a("el-pagination",{attrs:{"current-page":e.current_page,"page-sizes":[15,50,100],"page-size":e.per_page,layout:"total, sizes, prev, pager, next, jumper",total:e.Paginationdata.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1)],1)},r=[],n=t("4ff3"),o=t.n(n),s={data(){return{options:[{value:"选项1",label:"黄金糕"},{value:"选项2",label:"双皮奶"},{value:"选项3",label:"蚵仔煎"},{value:"选项4",label:"龙须面"},{value:"选项5",label:"北京烤鸭"}],form:{name1:"",name2:"",name3:"",name4:"",name5:"",name6:""},input:"",value1:"",tableData:[],Paginationdata:{},current_page:1,per_page:15}},methods:{getList(){let e=localStorage.getItem("token");this.current_page,this.per_page;o.a.get("/api/logs",{headers:{Authorization:"Bearer "+e}}).then(e=>{console.log(e),this.tableData=e.data.data,this.Paginationdata=e.data.meta})},handleSizeChange(e){this.per_page=e,this.getList()},handleCurrentChange(e){this.current_page=e,this.getList()}},mounted(){this.getList()}},i=s,u=(t("5bf6"),t("0b56")),c=Object(u["a"])(i,l,r,!1,null,null,null);a["default"]=c.exports},"5bf6":function(e,a,t){"use strict";t("9c14")},"9c14":function(e,a,t){}}]);
-//# sourceMappingURL=chunk-59f3bcab.17babc01.js.map

resources/frontend/src/api/record.js

@@ -1,7 +1,6 @@
 import http from "@/util/http.js";
 
 // 单品日志记录请求
-
 export function recordList(params) {
   return http({
     url: "/api/logs",

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

@@ -5,7 +5,7 @@
       <div class="goods" style="margin: 20px">
         <el-form ref="form" :inline="true" :model="form">
           <el-form-item label="查询类别：">
-            <el-select v-model="form.name1" placeholder="全部">
+            <el-select v-model="form.targetField" placeholder="全部">
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -16,12 +16,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label="操作用户">
-            <el-select v-model="form.name2" placeholder="输入操作用户">
+            <el-select v-model="form.userId" placeholder="输入操作用户">
               <el-option
-                v-for="item in options"
+                v-for="item in options1"
-                :key="item.value"
+                :key="item.id"
-                :label="item.label"
+                :label="item.name"
-                :value="item.value"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -30,14 +30,15 @@
             <el-date-picker
               v-model="value1"
               type="datetimerange"
-              range-separator="至"
+              range-separator="-"
               start-placeholder="起"
               end-placeholder="止"
+              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary">查询</el-button>
+            <el-button type="primary" @click="query()">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -72,42 +73,39 @@
 </template>
 
 <script>
-import axios from "axios";
+import { recordList } from "../../api/record";
+import { userList } from "../../api/user";
 export default {
   data() {
     return {
       options: [
         {
-          value: "选项1",
+          value: "cost",
-          label: "黄金糕",
+          label: "成本",
         },
         {
-          value: "选项2",
+          value: "stock",
-          label: "双皮奶",
+          label: "库存",
         },
         {
-          value: "选项3",
+          value: "inventory",
-          label: "蚵仔煎",
+          label: "库存盘点",
         },
         {
-          value: "选项4",
+          value: "status",
-          label: "龙须面",
+          label: "状态",
         },
         {
-          value: "选项5",
+          value: "set",
-          label: "北京烤鸭",
+          label: "设置",
         },
-      ],
+      ], //查询类别
+      options1: [], //查询用户列表
       form: {
-        name1: "",
+        targetField: "",
-        name2: "",
+        userId: "",
-        name3: "",
-        name4: "",
-        name5: "",
-        name6: "",
       },
-      input: "",
+      value1: "", //筛选时间变量
-      value1: "",
 
       tableData: [], //列表数据
       Paginationdata: {}, //分页相关数据
@@ -118,40 +116,78 @@ export default {
   methods: {
     //请求列表数据
     getList() {
-      let token = localStorage.getItem("token");
+      // let token = localStorage.getItem("token");
-      let data = {
+      let page = {
         page: this.current_page,
         per_page: this.per_page,
       };
-      axios
+      recordList(page).then((res) => {
-        .get("/api/logs", {
+        this.tableData = res.data.data;
-          headers: {
+        this.Paginationdata = res.data.meta;
-            Authorization: `Bearer ${token}`,
+      });
-          },
+    },
-        })
+
-        .then((res) => {
+    // 获取用户列表
-          console.log(res);
+    getUser() {
-          this.tableData = res.data.data;
+      userList().then((res) => {
-          this.Paginationdata = res.data.meta;
+        this.options1 = res.data.data;
-        });
+        console.log("我是用户", this.options1);
+      });
+    },
+
+    // 查询
+    query() {
+      console.log(this.form.userId, this.form.targetField);
+      let queryData = {
+        userId: this.form.userId,
+        target_field: this.form.targetField,
+        page: this.current_page,
+        per_page: this.per_page,
+        moudule: this.moudule,
+        target_id: this.$route.query.id,
+        startTime: this.value1[0],
+        endTime: this.value1[1],
+      };
+
+      // 对象值为空清除
+      const newObj = filterParams(queryData);
+      function filterParams(obj) {
+        const _newPar = {};
+        for (const key in obj) {
+          // 如果对象属性的值不为空，就保存该属性（这里我做了限制，如果属性的值为0，保存该属性。如果属性的值全部是空格，属于为空。）
+          if (
+            (obj[key] === 0 || obj[key]) &&
+            obj[key].toString().replace(/(^\s*)|(\s*$)/g, "") !== ""
+          ) {
+            // 记录属性
+            _newPar[key] = obj[key];
+          }
+        }
+        // 返回对象
+        return _newPar;
+      }
+
+      recordList(newObj).then((res) => {
+        this.tableData = res.data.data;
+        this.Paginationdata = res.data.meta;
+      });
     },
 
     //分页功能
     handleSizeChange(val) {
       //当前条数
       this.per_page = val;
-      // console.log(1111, val);
       this.getList();
     },
     handleCurrentChange(val) {
       //当前页
       this.current_page = val;
-      // console.log(2222, val);
       this.getList();
     },
   },
   mounted() {
     this.getList();
+    this.getUser();
   },
 };
 </script>

resources/frontend/src/views/store/store.vue

@@ -21,6 +21,12 @@
                 >&nbsp;&nbsp;授&nbsp;&nbsp;&nbsp;权&nbsp;&nbsp;</a
               ></el-button
             >
+            <div v-if="scope.row.status === '已授权'">
+              <el-button type="success" :disabled="true">{{
+                scope.row.status
+              }}</el-button>
+              <el-button @click="download(scope.row)">下载商品</el-button>
+            </div>
             <div v-if="scope.row.status === '重新授权'">
               <el-button type="danger" target="_blank"
                 ><a :href="scope.row.authUrl" rel="noopener noreferrer"
@@ -31,7 +37,9 @@
             </div>
 
             <div v-if="scope.row.status === '无需授权'">
-              <el-button type="success">{{ scope.row.status }}</el-button>
+              <el-button type="success" :disabled="true">{{
+                scope.row.status
+              }}</el-button>
               <el-button @click="download(scope.row)">下载商品</el-button>
             </div>
           </template>

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

@@ -8,7 +8,12 @@
         >
           <div>
             <div style="font-size: 14px">商品列表：</div>
-            <el-select v-model="lid" placeholder="选择商品" @change="onchange">
+            <el-select
+              v-model="lid"
+              placeholder="选择商品"
+              @change="onchange"
+              filterable
+            >
               <el-option
                 v-for="item in goodschoose"
                 :key="item.id"
@@ -54,6 +59,7 @@
               <el-select
                 v-model="goodsData.goods.type_id"
                 placeholder="商品种类"
+                filterable
               >
                 <el-option
                   v-for="item in cate"
@@ -68,6 +74,7 @@
               <el-select
                 v-model="goodsData.goods.brand_id"
                 placeholder="商品品牌"
+                filterable
               >
                 <el-option
                   v-for="item in brand"
@@ -80,7 +87,6 @@
             </el-form-item>
           </div>
           <div>
-            <!-- <span style="margin-right: -15px">{{ i + 1 }}.</span> -->
             <el-form-item label="商品规格：">
               <el-input
                 placeholder="商品规格"
@@ -154,11 +160,10 @@
               ></el-input>
             </el-form-item>
             <el-form-item label="商品种类：">
-              <el-select
+              <!-- <el-select
                 v-model="form.type_id"
                 placeholder="商品种类"
                 v-if="isShow"
-                :disabled="true"
               >
                 <el-option
                   v-for="item in cate"
@@ -167,8 +172,12 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
-              <el-select v-model="form.type_id" placeholder="商品种类" v-else>
+              <el-select
+                v-model="form.type_id"
+                placeholder="商品种类"
+                filterable
+              >
                 <el-option
                   v-for="item in cate"
                   :key="item.id"
@@ -179,11 +188,10 @@
               </el-select>
             </el-form-item>
             <el-form-item label="商品品牌：">
-              <el-select
+              <!-- <el-select
                 v-model="form.brand_id"
-                placeholder="商品品牌"
+                placeholder="商品品牌1"
                 v-if="isShow"
-                :disabled="true"
               >
                 <el-option
                   v-for="item in brand"
@@ -192,8 +200,12 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
-              <el-select v-model="form.brand_id" placeholder="商品品牌" v-else>
+              <el-select
+                v-model="form.brand_id"
+                placeholder="商品品牌"
+                filterable
+              >
                 <el-option
                   v-for="item in brand"
                   :key="item.id"

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

@@ -831,9 +831,10 @@ export default {
               },
             })
             .then((res) => {
-              console.log(res);
+              if (res.status === 200) {
+                this.$message.success("模板导入成功");
+              }
             });
-          this.$message.success("模板导入成功");
           this.docImportDrawer = false;
         } finally {
           this.isLoadingDialog = false;
@@ -975,6 +976,12 @@ export default {
     },
   },
 
+  watch: {
+    $route(to, from) {
+      window.location.reload(); //监测到路由发生跳转时刷新一次页面
+    },
+  },
+
   mounted() {
     this.getList();
     this.getgoodsType();