From 7152cd065db274cd0d09050950906c2c20d67580 Mon Sep 17 00:00:00 2001
From: zchengo <1933757688@qq.com>
Date: Thu, 26 Jan 2023 11:22:12 +0800
Subject: [PATCH] ui: replace tag to spot component

---
 web/src/views/Contract.vue |  5 +++--
 web/src/views/Customer.vue | 14 ++++++++++----
 web/src/views/Product.vue  | 22 ++++++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/web/src/views/Contract.vue b/web/src/views/Contract.vue
index 53d2956..fec193b 100644
--- a/web/src/views/Contract.vue
+++ b/web/src/views/Contract.vue
@@ -32,8 +32,8 @@
                     <span style="color: #ff991f">{{ text }}</span>
                 </template>
                 <template v-if="column.dataIndex === 'status'">
-                    <a-tag v-if="text == 1" color="green">已签约</a-tag>
-                    <a-tag v-if="text == 2" color="red">未签约</a-tag>
+                    <Spot v-if="text == 1" type="success" title="已签约" />
+                    <Spot v-if="text == 2" type="danger" title="未签约" />
                 </template>
             </template>
         </a-table>
@@ -178,6 +178,7 @@ import { createContract, updateContract, queryContractList, queryContractInfo, d
 import { queryProductList } from "../api/product";
 import { queryCustomerOption } from "../api/customer";
 import { message, Modal } from 'ant-design-vue';
+import Spot from '../components/Spot.vue';
 
 // 合同表格字段
 const columns = [{
diff --git a/web/src/views/Customer.vue b/web/src/views/Customer.vue
index 423d810..49a7bf9 100644
--- a/web/src/views/Customer.vue
+++ b/web/src/views/Customer.vue
@@ -33,8 +33,8 @@
                         </template></a-button>
                 </template>
                 <template v-if="column.dataIndex === 'status'">
-                    <a-tag v-if="text == 1" color="green">已成交</a-tag>
-                    <a-tag v-if="text == 2" color="blue">未成交</a-tag>
+                    <Spot v-if="text == 1" type="success" title="已成交" />
+                    <Spot v-if="text == 2" type="danger" title="未成交" />
                 </template>
                 <template v-if="column.dataIndex === 'address'">
                     <span>{{ record.region + " " + record.address }}</span>
@@ -166,6 +166,7 @@ import { SearchOutlined, ExclamationCircleOutlined, ExportOutlined, MailTwoTone
 import moment from 'moment'
 import { createCustomer, updateCustomer, sendMailToCustomer, queryCustomerList, queryCustomerInfo, deleteCustomer, customerExport } from '../api/customer';
 import { message, Modal } from 'ant-design-vue';
+import Spot from '../components/Spot.vue';
 import regionData from '../assets/region';
 
 // 表格字段
@@ -344,20 +345,25 @@ const onSave = () => {
             createCustomer(customer).then((res) => {
                 if (res.data.code == 0) {
                     message.success('保存成功')
+                    customerFormRef.value.resetFields()
+                    visible.value = false;
                     getCustomerList()
                 }
+                if (res.data.code == 20001) {
+                    message.error('客户名称已经存在')
+                }
             })
         }
         if (operation.value == 2) {
             updateCustomer(customer).then((res) => {
                 if (res.data.code == 0) {
                     message.success('保存成功')
+                    customerFormRef.value.resetFields()
+                    visible.value = false;
                     getCustomerList()
                 }
             })
         }
-        customerFormRef.value.resetFields()
-        visible.value = false;
     });
 };
 
diff --git a/web/src/views/Product.vue b/web/src/views/Product.vue
index 8f1e443..e49d59e 100644
--- a/web/src/views/Product.vue
+++ b/web/src/views/Product.vue
@@ -28,8 +28,8 @@
                     <a @click="onEdit(record)">{{ text }}</a>
                 </template>
                 <template v-if="column.dataIndex === 'status'">
-                    <a-tag v-if="text == 1" color="green">上架</a-tag>
-                    <a-tag v-if="text == 2" color="blue">下架</a-tag>
+                    <Spot v-if="text == 1" type="success" title="上架" />
+                    <Spot v-if="text == 2" type="danger" title="下架" />
                 </template>
                 <template v-if="column.dataIndex === 'type'">
                     <span v-if="text == 1">默认</span>
@@ -88,8 +88,12 @@
                         <a-col :span="12">
                             <a-form-item label="是否上下架" name="status">
                                 <a-select v-model:value="product.status" placeholder="请选择">
-                                    <a-select-option :value="1">上架</a-select-option>
-                                    <a-select-option :value="2">下架</a-select-option>
+                                    <a-select-option :value="1">
+                                        <Spot type="success" title="上架" />
+                                    </a-select-option>
+                                    <a-select-option :value="2">
+                                        <Spot type="danger" title="下架" />
+                                    </a-select-option>
                                 </a-select>
                             </a-form-item>
                         </a-col>
@@ -112,6 +116,7 @@ import { ref, reactive, onMounted, createVNode } from 'vue';
 import { SearchOutlined, ExclamationCircleOutlined, ExportOutlined } from '@ant-design/icons-vue';
 import moment from 'moment'
 import { createProduct, updateProduct, queryProductList, deleteProduct, queryProductInfo, productExport } from '../api/product';
+import Spot from '../components/Spot.vue';
 import { message, Modal } from 'ant-design-vue';
 
 // 表格字段
@@ -260,20 +265,25 @@ const onSave = () => {
             createProduct(product).then((res) => {
                 if (res.data.code == 0) {
                     message.success('保存成功')
+                    productFormRef.value.resetFields()
+                    visible.value = false;
                     getProductList()
                 }
+                if (res.data.code == 40001) {
+                    message.error('产品名称已经存在')
+                }
             })
         }
         if (operation.value == 2) {
             updateProduct(product).then((res) => {
                 if (res.data.code == 0) {
+                    productFormRef.value.resetFields()
+                    visible.value = false;
                     message.success('保存成功')
                     getProductList()
                 }
             })
         }
-        productFormRef.value.resetFields()
-        visible.value = false;
     });
 };