From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改

---
 company_admin/src/views/business/goods.vue |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/company_admin/src/views/business/goods.vue b/company_admin/src/views/business/goods.vue
index 5998a93..1b081e2 100644
--- a/company_admin/src/views/business/goods.vue
+++ b/company_admin/src/views/business/goods.vue
@@ -42,6 +42,17 @@
           </el-select>
           <!-- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input> -->
         </el-form-item>
+        <el-form-item label="绫诲瀷" prop="type">
+          <el-select v-model="searchForm.type" clearable placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input> -->
+        </el-form-item>
         <section>
           <el-button type="primary" @click="search">鎼滅储</el-button>
           <el-button @click="reset">閲嶇疆</el-button>
@@ -87,7 +98,18 @@
           </el-table-column>
           <el-table-column prop="brandName" label="鍝佺墝" min-width="100px"></el-table-column>
           <el-table-column prop="categoryName" label="绫诲埆" min-width="100px"></el-table-column>
-          <el-table-column prop="baseZdPrice" label="鎸囧浠凤紙鍏冿級" min-width="100px"></el-table-column>
+          <el-table-column prop="categoryName" label="绫诲瀷" min-width="100px">
+            <template slot-scope="{row}">
+              <span v-if="row.type == 0">鑷缓</span>
+              <span v-else>鎷夊彇</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鎸囧浠凤紙鍏冿級" min-width="100px">
+            <template slot-scope="{row}">
+              <span v-if="row.type == 0">{{ row.zdPrice }}</span>
+              <span v-else>{{ row.baseZdPrice }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="basePrice" label="閲囪喘浠�(鍏�)" min-width="100px"></el-table-column>
           <el-table-column prop="price" label="鍏ユ墜浠凤紙鍏冿級" min-width="100px"></el-table-column>
           <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
@@ -150,7 +172,8 @@
           name: '',
           status: '',
           categoryId: '',
-          brandId: ''
+          brandId: '',
+          type: ''
         },
         ids: '',
         categoryList: [],
@@ -158,6 +181,10 @@
         statusList: [
           { name: '鍚敤', id: 0 },
           { name: '绂佺敤', id: 1 }
+        ],
+        typeList: [
+          { name: '鑷缓', id: 0 },
+          { name: '鎷夊彇', id: 1 }
         ]
       }
     },

--
Gitblit v1.9.3