From 9db90e62c23d5ab8418c6f1e23a4ce04c5bf66fd Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Tue, 5 Nov 2024 16:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/goods/combination.vue  |  9 +++---
 resources/frontend/src/views/goods/goods.vue  |  9 +++---
 resources/frontend/src/views/logs/logs.vue    | 28 ++++++++++++-------
 .../src/views/plat/afterSaleOrder.vue         | 11 ++++----
 .../frontend/src/views/plat/goodsList.vue     |  6 ++--
 .../frontend/src/views/plat/orderList.vue     | 20 ++++++-------
 .../src/views/supplyChain/dailyStock.vue      |  7 +++--
 .../src/views/supplyChain/lossRecord.vue      |  7 +++--
 .../src/views/supplyChain/procureCheck.vue    |  9 +++---
 .../src/views/supplyChain/procureLog.vue      |  9 +++---
 10 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/resources/frontend/src/views/goods/combination.vue b/resources/frontend/src/views/goods/combination.vue
index 5f09a89..61ad12b 100644
--- a/resources/frontend/src/views/goods/combination.vue
+++ b/resources/frontend/src/views/goods/combination.vue
@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="searchForm.sku_title" clearable></el-input>
+          <el-input v-model="searchForm.sku_title" @keyup.enter.native="handleChoose" clearable></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="searchForm.external_sku_id" clearable></el-input>
+          <el-input v-model="searchForm.external_sku_id" @keyup.enter.native="handleChoose" clearable></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -21,11 +21,12 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             clearable
-            style="width: 250px;">
+            style="width: 250px;"
+            @change="handleChoose()">
           </el-date-picker>
         </div>
         <div class="row">
-          <el-button type="primary" @click="handleChoose(1)" icon="el-icon-search">筛选</el-button>
+          <el-button type="primary" @click="handleChoose()" icon="el-icon-search">筛选</el-button>
         </div>
       </div>
     </div>
diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index fd78913..380f406 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -5,7 +5,7 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="form.goods_title" placeholder="商品名称" clearable></el-input>
+          <el-input v-model="form.goods_title" @keyup.enter.native="handleChoose" placeholder="商品名称" clearable></el-input>
         </div>
         <div class="row">
           <span>商品品种/品类：</span>
@@ -22,11 +22,11 @@
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="form.external_sku_id" placeholder="商品编码" clearable></el-input>
+          <el-input v-model="form.external_sku_id" @keyup.enter.native="handleChoose" placeholder="商品编码" clearable></el-input>
         </div>
         <div class="row">
           <span>商品状态：</span>
-          <el-select v-model="form.status" placeholder="商品状态" clearable>
+          <el-select v-model="form.status" placeholder="商品状态" clearable @change="handleChoose()">
             <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
             </el-option>
           </el-select>
@@ -42,7 +42,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             clearable
-            style="width: 250px;">
+            style="width: 250px;"
+            @change="handleChoose()">
           </el-date-picker>
         </div>
         <div class="row">
diff --git a/resources/frontend/src/views/logs/logs.vue b/resources/frontend/src/views/logs/logs.vue
index 3a04896..89deafe 100644
--- a/resources/frontend/src/views/logs/logs.vue
+++ b/resources/frontend/src/views/logs/logs.vue
@@ -4,42 +4,42 @@
         <el-card class="box-card" :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="模块:" style="margin-right: 40px">
-                    <el-select v-model="form.module" clearable>
+                    <el-select v-model="form.module" clearable @change="query(1)">
                         <el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作:" style="margin-right: 40px">
-                    <el-select v-model="form.action" clearable>
+                    <el-select v-model="form.action" clearable @change="query(1)">
                         <el-option v-for="item in actionOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="目标类型:" style="margin-right: 40px">
-                    <el-select v-model="form.target_type" clearable>
+                    <el-select v-model="form.target_type" clearable @change="query(1)">
                         <el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="类别:" style="margin-right: 40px">
-                    <el-select v-model="form.targetField" clearable>
+                    <el-select v-model="form.targetField" clearable @change="query(1)">
                         <el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作人:" style="margin-right: 40px">
-                    <el-select v-model="form.userId" placeholder="输入操作人" clearable>
+                    <el-select v-model="form.userId" placeholder="输入操作人" clearable @change="query(1)">
                         <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="时间:">
                     <el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss" style="width: 340px;">
+                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss" style="width: 340px;" @change="query(1)">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
@@ -307,7 +307,7 @@ export default {
                 userId: "",//操作人id(用户列表)
             },
             value1: "", //筛选时间变量
-            loading: true,
+            loading: false,
             tableData: [], //列表数据
             Paginationdata: {}, //分页相关数据
             current_page: 1, //当前页
@@ -317,6 +317,7 @@ export default {
     methods: {
         //请求列表数据
         getList() {
+            this.loading = true;
             let page = {
                 page: this.current_page,
                 per_page: this.per_page,
@@ -324,8 +325,11 @@ export default {
             recordList(page).then((res) => {
                 this.tableData = res.data.data;
                 this.Paginationdata = res.data.meta;
-            });
-            this.loading = false;
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            })
+            
         },
 
         // 获取用户列表
@@ -337,6 +341,7 @@ export default {
 
         // 查询
         query(page) {
+            this.loading = true;
             let queryData = {
                 page: page,
                 per_page: this.per_page,
@@ -353,7 +358,10 @@ export default {
             recordList(queryData).then((res) => {
                 this.tableData = res.data.data;
                 this.Paginationdata = res.data.meta;
-            });
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            })
         },
 
         //分页功能
diff --git a/resources/frontend/src/views/plat/afterSaleOrder.vue b/resources/frontend/src/views/plat/afterSaleOrder.vue
index afa03da..76ed166 100644
--- a/resources/frontend/src/views/plat/afterSaleOrder.vue
+++ b/resources/frontend/src/views/plat/afterSaleOrder.vue
@@ -4,25 +4,25 @@
       <div class="searchBox">
         <div class="row">
           <span>店铺：</span>
-          <el-select v-model="filter.shop_id" placeholder="店铺">
+          <el-select v-model="filter.shop_id" placeholder="店铺" @change="handleSearch()">
             <el-option v-for="item in shopsList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </div>
         <div class="row">
           <span>售后单状态：</span>
-          <el-select v-model="filter.after_sales_status" placeholder="请选择">
+          <el-select v-model="filter.after_sales_status" placeholder="请选择" @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </div>
         <div class="row">
           <span>订单编号：</span>
-          <el-input v-model="filter.order_sn" clearable></el-input>
+          <el-input v-model="filter.order_sn" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>售后单编号：</span>
-          <el-input v-model="filter.after_sales_biz_sn" clearable></el-input>
+          <el-input v-model="filter.after_sales_biz_sn" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -33,7 +33,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
diff --git a/resources/frontend/src/views/plat/goodsList.vue b/resources/frontend/src/views/plat/goodsList.vue
index 9fa756b..34aff01 100644
--- a/resources/frontend/src/views/plat/goodsList.vue
+++ b/resources/frontend/src/views/plat/goodsList.vue
@@ -3,19 +3,19 @@
         <el-card :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="店铺:">
-                    <el-select v-model="form.shop_id" placeholder="店铺">
+                    <el-select v-model="form.shop_id" placeholder="店铺" @change="handleChoose()">
                         <el-option v-for="item in shops" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="商品名称:">
-                    <el-input v-model="form.goods_name" placeholder="商品名称">
+                    <el-input v-model="form.goods_name" placeholder="商品名称" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="商品编码:">
-                    <el-input v-model="form.external_sku_id" placeholder="商品编码">
+                    <el-input v-model="form.external_sku_id" placeholder="商品编码" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 
diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index a0722e5..067c95d 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -3,14 +3,14 @@
         <el-card>
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="所属店铺:">
-                    <el-select v-model="form.shop_id" placeholder="店铺">
+                    <el-select v-model="form.shop_id" placeholder="店铺" @change="handleChoose()">
                         <el-option v-for="item in shops" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="发货状态:">
-                    <el-select v-model="form.shipping_status" placeholder="发货状态">
+                    <el-select v-model="form.shipping_status" placeholder="发货状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未发货"></el-option>
                         <el-option value="2" label="部分发货"></el-option>
@@ -19,7 +19,7 @@
                 </el-form-item>
 
                 <el-form-item label="订单类型:">
-                    <el-select v-model="form.is_supplier" placeholder="订单类型">
+                    <el-select v-model="form.is_supplier" placeholder="订单类型" @change="handleChoose()">
                         <el-option value="" label="全部订单"></el-option>
                         <el-option value="1" label="自卖团订单"></el-option>
                         <el-option value="0" label="帮卖团订单"></el-option>
@@ -27,7 +27,7 @@
                 </el-form-item>
 
                 <el-form-item label="订单状态:">
-                    <el-select v-model="form.cancel_status" placeholder="订单状态">
+                    <el-select v-model="form.cancel_status" placeholder="订单状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未取消"></el-option>
                         <el-option value="1" label="已取消"></el-option>
@@ -35,7 +35,7 @@
                 </el-form-item>
 
                 <el-form-item label="售后状态:">
-                    <el-select v-model="form.after_sales_status" placeholder="售后状态">
+                    <el-select v-model="form.after_sales_status" placeholder="售后状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未售后"></el-option>
                         <el-option value="1" label="有售后"></el-option>
@@ -43,7 +43,7 @@
                 </el-form-item>
 
                 <el-form-item label="商品数量:">
-                    <el-select v-model="form.goods_sku_num" placeholder="商品数量">
+                    <el-select v-model="form.goods_sku_num" placeholder="商品数量" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="1" label="1个商品"></el-option>
                         <el-option value="2" label="2-5个商品"></el-option>
@@ -70,12 +70,12 @@
 
                 <el-form-item label="下单时间:">
                     <el-date-picker v-model="confirmAt" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="handleChoose()">
                     </el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="跟团号:">
-                    <el-input v-model="form.pno" placeholder="跟团号">
+                    <el-input v-model="form.pno" placeholder="跟团号" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 
@@ -266,8 +266,8 @@ export default {
                 ...this.form,
                 page: 1,
                 per_page: this.per_page,
-                confirm_at_start: this.confirmAt[0] ? this.confirmAt[0] : '',
-                confirm_at_end: this.confirmAt[1] ? this.confirmAt[1] : ''
+                confirm_at_start: this.confirmAt ? this.confirmAt[0] : '',
+                confirm_at_end: this.confirmAt ? this.confirmAt[1] : ''
             };
             this.getPlatOrderList(params)
         },
diff --git a/resources/frontend/src/views/supplyChain/dailyStock.vue b/resources/frontend/src/views/supplyChain/dailyStock.vue
index 07cf59f..adc202b 100644
--- a/resources/frontend/src/views/supplyChain/dailyStock.vue
+++ b/resources/frontend/src/views/supplyChain/dailyStock.vue
@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,7 +19,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
diff --git a/resources/frontend/src/views/supplyChain/lossRecord.vue b/resources/frontend/src/views/supplyChain/lossRecord.vue
index cba7113..b58791b 100644
--- a/resources/frontend/src/views/supplyChain/lossRecord.vue
+++ b/resources/frontend/src/views/supplyChain/lossRecord.vue
@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,7 +19,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
diff --git a/resources/frontend/src/views/supplyChain/procureCheck.vue b/resources/frontend/src/views/supplyChain/procureCheck.vue
index 73bab56..1d83b1a 100644
--- a/resources/frontend/src/views/supplyChain/procureCheck.vue
+++ b/resources/frontend/src/views/supplyChain/procureCheck.vue
@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,12 +19,13 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
           <span>审核状态：</span>
-          <el-select v-model="filter.status" placeholder="请选择" clearable>
+          <el-select v-model="filter.status" placeholder="请选择" clearable @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
diff --git a/resources/frontend/src/views/supplyChain/procureLog.vue b/resources/frontend/src/views/supplyChain/procureLog.vue
index 1dddb95..15e4b4a 100644
--- a/resources/frontend/src/views/supplyChain/procureLog.vue
+++ b/resources/frontend/src/views/supplyChain/procureLog.vue
@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,12 +19,13 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
           <span>审核状态：</span>
-          <el-select v-model="filter.status" placeholder="请选择" clearable>
+          <el-select v-model="filter.status" placeholder="请选择" clearable @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>