From a5e6e7061cbef6912f294dcfd2cb88f472f8ca6f Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 19 九月 2023 14:26:40 +0800
Subject: [PATCH] 企业端
---
company_admin/src/views/business/category.vue | 25 +++++++++++-
company_admin/src/components/business/OperaCategoryWindow.vue | 15 +++++++
company_admin/src/views/business/brand.vue | 31 +++++++++++++--
company_admin/.env.development | 4 +
company_admin/src/views/business/goods.vue | 24 +++++++++++
5 files changed, 90 insertions(+), 9 deletions(-)
diff --git a/company_admin/.env.development b/company_admin/.env.development
index 6c3c4c6..d53d032 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,6 +3,8 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-VUE_APP_API = 'http://192.168.0.15:10012/'
+VUE_APP_API = 'http://192.168.0.15:10022/'
+
+# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
\ No newline at end of file
diff --git a/company_admin/src/components/business/OperaCategoryWindow.vue b/company_admin/src/components/business/OperaCategoryWindow.vue
index 7b28532..decc097 100644
--- a/company_admin/src/components/business/OperaCategoryWindow.vue
+++ b/company_admin/src/components/business/OperaCategoryWindow.vue
@@ -9,7 +9,7 @@
<h3 style="margin: 20px 0 10px 0;">鍩烘湰淇℃伅</h3>
<el-form :model="form" ref="form" :rules="rules">
<el-form-item label="绫诲埆鏉ユ簮" prop="type">
- <el-radio-group v-model="form.type" @change="changeRadio">
+ <el-radio-group v-model="form.type" :disabled="form.id ? true : false" @change="changeRadio">
<el-radio :label="1">浠庡钩鍙板簱閫夋嫨</el-radio>
<el-radio :label="0">浼佷笟鑷缓</el-radio>
</el-radio-group>
@@ -65,6 +65,7 @@
v-model="scope.row.isselect"
active-color="#13ce66"
inactive-color="#ff4949"
+ @change="changeIsselect($event, scope.row)"
:active-value="1"
:inactive-value="0">
</el-switch>
@@ -187,6 +188,18 @@
})
},
methods: {
+ changeIsselect(e, item) {
+ let num = 0
+ this.form.tableData.forEach(row => {
+ if (row.isselect === 1) {
+ num += 1
+ }
+ })
+ if (num > 2) {
+ item.isselect = 0
+ this.$message.warning({ message: '鍙兘璁剧疆涓や釜閫夐」' })
+ }
+ },
addItem() {
this.form.tableData.push({ name: '', isselect: 0, isshow: 1 })
},
diff --git a/company_admin/src/views/business/brand.vue b/company_admin/src/views/business/brand.vue
index eb27ae8..4657dc0 100644
--- a/company_admin/src/views/business/brand.vue
+++ b/company_admin/src/views/business/brand.vue
@@ -5,6 +5,16 @@
<el-form-item label="鍝佺墝鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ搧鐗屽悕绉�" @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-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:brand:exportExcel']" @click="exportExcel">瀵煎嚭</el-button> -->
@@ -35,6 +45,12 @@
fit="cover"></el-image>
</template>
</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 prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
@@ -44,8 +60,10 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">鍒犻櫎</el-button>
+ <template v-if="row.type == 0">
+ <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">鍒犻櫎</el-button>
+ </template>
</template>
</el-table-column>
</el-table>
@@ -74,8 +92,13 @@
return {
// 鎼滅储
searchForm: {
- name: ''
- }
+ name: '',
+ type: ''
+ },
+ typeList: [
+ { name: '鑷缓', id: 0 },
+ { name: '鎷夊彇', id: 1 }
+ ]
}
},
created () {
diff --git a/company_admin/src/views/business/category.vue b/company_admin/src/views/business/category.vue
index 9833d20..a4314ff 100644
--- a/company_admin/src/views/business/category.vue
+++ b/company_admin/src/views/business/category.vue
@@ -5,6 +5,16 @@
<el-form-item label="绫诲埆鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ被鍒悕绉�" @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-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:category:exportExcel']" @click="exportExcel">瀵煎嚭</el-button> -->
@@ -35,6 +45,12 @@
</template>
</el-table-column>
<el-table-column prop="name" 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 prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
@@ -87,8 +103,13 @@
return {
// 鎼滅储
searchForm: {
- name: ''
- }
+ name: '',
+ type: ''
+ },
+ typeList: [
+ { name: '鑷缓', id: 0 },
+ { name: '鎷夊彇', id: 1 }
+ ]
}
},
created () {
diff --git a/company_admin/src/views/business/goods.vue b/company_admin/src/views/business/goods.vue
index 869907a..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,6 +98,12 @@
</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="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>
@@ -155,7 +172,8 @@
name: '',
status: '',
categoryId: '',
- brandId: ''
+ brandId: '',
+ type: ''
},
ids: '',
categoryList: [],
@@ -163,6 +181,10 @@
statusList: [
{ name: '鍚敤', id: 0 },
{ name: '绂佺敤', id: 1 }
+ ],
+ typeList: [
+ { name: '鑷缓', id: 0 },
+ { name: '鎷夊彇', id: 1 }
]
}
},
--
Gitblit v1.9.3