From bd0d9874689d91d3515cae961a065b14bc79de88 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 21 Mar 2025 14:26:58 +0800
Subject: [PATCH] update

---
 src/views/merchant/ProductList.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/merchant/ProductList.vue b/src/views/merchant/ProductList.vue
index 75d650d..5bf41dd 100644
--- a/src/views/merchant/ProductList.vue
+++ b/src/views/merchant/ProductList.vue
@@ -140,6 +140,13 @@
                 />
               </a-form-item>
 
+              <a-form-item label="营业类型" name="operation_type" required>
+                <a-radio-group v-model:value="formState.operation_type">
+                  <a-radio value="SELF_OPERATED">自营</a-radio>
+                  <a-radio value="MERCHANT">商家</a-radio>
+                </a-radio-group>
+              </a-form-item>
+
               <a-form-item label="商品名称" name="name" required>
                 <a-input v-model:value="formState.name" placeholder="请输入商品名称" />
               </a-form-item>
@@ -347,6 +354,13 @@
                 </div>
               </a-form-item>
               
+              <a-form-item label="营业类型" name="operation_type" required>
+                <a-radio-group v-model:value="editFormState.operation_type">
+                  <a-radio value="SELF_OPERATED">自营</a-radio>
+                  <a-radio value="MERCHANT">商家</a-radio>
+                </a-radio-group>
+              </a-form-item>
+
               <a-form-item label="商品名称" name="name" required>
                 <a-input v-model:value="editFormState.name" placeholder="请输入商品名称" />
               </a-form-item>
@@ -561,6 +575,7 @@ export default defineComponent({
 
     const formState = ref({
       merchant_id: undefined,
+      operation_type: 'MERCHANT',
       name: '',
       image_url: '',
       product_price: null,
@@ -717,6 +732,7 @@ export default defineComponent({
     const currentEditId = ref(null)
 
     const editFormState = ref({
+      operation_type: 'MERCHANT',
       name: '',
       image_url: '',
       product_price: null,
@@ -778,6 +794,7 @@ export default defineComponent({
     const handleEdit = (record) => {
       currentEditId.value = record.id
       editFormState.value = {
+        operation_type: record.operation_type || 'MERCHANT',
         name: record.name,
         image_url: record.image_url,
         product_price: record.product_price,
@@ -873,6 +890,7 @@ export default defineComponent({
     const handleEditCancel = () => {
       editFormRef.value?.resetFields()
       editFormState.value = {
+        operation_type: 'MERCHANT',
         name: '',
         image_url: '',
         product_price: null,
@@ -901,6 +919,7 @@ export default defineComponent({
 
     const rules = {
       merchant_id: [{ required: true, message: '请选择所属商家' }],
+      operation_type: [{ required: true, message: '请选择营业类型' }],
       name: [{ required: true, message: '请输入商品名称' }],
       image_url: [{ required: true, message: '请上传商品图片' }],
       product_price: [{ required: true, message: '请输入商品原价' }],
@@ -1018,6 +1037,7 @@ export default defineComponent({
       formRef.value?.resetFields()
       formState.value = {
         merchant_id: undefined,
+        operation_type: 'MERCHANT',
         name: '',
         image_url: '',
         product_price: null,