From 993ddc82ba6a2b0f7b094f4e9cb7c704608522c4 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Sun, 19 May 2024 19:56:35 +0800
Subject: [PATCH] edit

---
 src/views/merchant/application/index.vue      | 34 +++++++++++++++++++
 .../product/productExamine/proDetails.vue     |  4 +--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 14edd45..d314f2b 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -28,6 +28,18 @@
             style="width: 280px"
           />
         </el-form-item>
+        <el-form-item label="审核时间：">
+          <el-date-picker
+            v-model="timeVals"
+            type="daterange"
+            placeholder="选择日期"
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd"
+            :picker-options="pickerOptions"
+            @change="onchangeTimes"
+            style="width: 280px"
+          />
+        </el-form-item>
         <el-form-item label="店铺类型：" prop="type_id">
           <el-select
             v-model="tableFrom.type_id"
@@ -62,6 +74,15 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label="审核人：" prop="audit_name">
+          <el-input
+            v-model="tableFrom.audit_name"
+            @keyup.enter.native="getList(1)"
+            placeholder="请输入审核人"
+            class="selWidth"
+            clearable
+          />
+        </el-form-item>
         <el-form-item label="备注：" prop="mark">
           <el-input
             v-model="tableFrom.mark"
@@ -123,6 +144,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="audit_name" label="审核人" min-width="80" />
+        <el-table-column prop="audit_time" label="审核时间" min-width="150" />
         <el-table-column prop="mark" label="备注" min-width="150" />
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
@@ -218,6 +240,8 @@ export default {
       tableFrom: {
         page: 1,
         limit: 20,
+        audit_name:'',
+        audit_time:'',
         date: "",
         status: this.$route.query.status ? this.$route.query.status : "",
         keyword: "",
@@ -228,6 +252,7 @@ export default {
       mer_id: this.$route.query.id ? this.$route.query.id : "",
       autoUpdate: true,
       timeVal: [],
+      timeVals: [],
       drawer: false
     };
   },
@@ -273,7 +298,9 @@ export default {
     /**重置 */
     searchReset(){
       this.timeVal = []
+      this.timeVals = []
       this.tableFrom.date = ""
+      this.tableFrom.audit_time = ""
       this.$refs.searchForm.resetFields()
       this.getList(1)
     },
@@ -289,6 +316,13 @@ export default {
       this.tableFrom.page = 1;
       this.getList("");
     },
+    // 具体日期
+    onchangeTimes(e) {
+      this.timeVals = e;
+      this.tableFrom.audit_time = this.timeVals ? this.timeVals.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getList("");
+    },
     // 商户分类；
     getMerCategory() {
       getMerCateApi().then(res => {
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index 32544f8..789cdeb 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -221,7 +221,7 @@
           <el-tab-pane label="规格与价格" name="goods">
             <div class="section">
               <ul class="list">
-                <li class="item">
+                <!-- <li class="item">
                   <div class="item-title">佣金设置：</div>
                   <div class="value">
                     {{
@@ -240,7 +240,7 @@
                         : "自定义设置会员价"
                     }}
                   </div>
-                </li>
+                </li> -->
                 <li class="item">
                   <div class="item-title">规格：</div>
                   <div class="value">