From f1e4633c66459ac450ff1a1ec1531da7f381250f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <943146732@qq.com>
Date: Fri, 8 Mar 2024 23:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/richText/Index.vue            |  4 ++++
 src/views/content/richText/modules/AddForm.vue  |  3 +++
 src/views/content/richText/modules/EditForm.vue |  5 ++++-
 src/views/goods/category/modules/AddForm.vue    |  8 ++++++++
 src/views/goods/category/modules/EditForm.vue   | 10 +++++++++-
 src/views/market/presale/Index.vue              |  9 +++++++--
 src/views/market/presale/modules/AddForm.vue    |  7 +++++++
 src/views/market/presale/modules/EditForm.vue   |  9 ++++++++-
 8 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/views/content/richText/Index.vue b/src/views/content/richText/Index.vue
index ffe302e..cab3554 100644
--- a/src/views/content/richText/Index.vue
+++ b/src/views/content/richText/Index.vue
@@ -54,6 +54,10 @@ export default {
           title: 'ID',
           dataIndex: 'id'
         },
+        {
+          title: '协议名称',
+          dataIndex: 'name'
+        },
         {
           title: '协议类型',
           dataIndex: 'type'
diff --git a/src/views/content/richText/modules/AddForm.vue b/src/views/content/richText/modules/AddForm.vue
index 4928b72..2cc447a 100644
--- a/src/views/content/richText/modules/AddForm.vue
+++ b/src/views/content/richText/modules/AddForm.vue
@@ -10,6 +10,9 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
+        <a-form-item label="协议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input v-decorator="['name', { rules: [{ required: true, message: '请输入协议名称' }] }]" />
+        </a-form-item>
         <a-form-item label="协议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input v-decorator="['type', { rules: [{ required: true, message: '请输入协议类型' }] }]" />
         </a-form-item>
diff --git a/src/views/content/richText/modules/EditForm.vue b/src/views/content/richText/modules/EditForm.vue
index 9f81b05..6254cda 100644
--- a/src/views/content/richText/modules/EditForm.vue
+++ b/src/views/content/richText/modules/EditForm.vue
@@ -10,6 +10,9 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
+        <a-form-item label="协议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input v-decorator="['name', { rules: [{ required: true, message: '请输入协议名称' }] }]" />
+        </a-form-item>
         <a-form-item label="协议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input v-decorator="['type', { rules: [{ required: true, message: '请输入联系人姓名' }] }]" />
         </a-form-item>
@@ -66,7 +69,7 @@ export default {
     setFieldsValue () {
       const { record, form: { setFieldsValue } } = this
       this.$nextTick(() => {
-        setFieldsValue(pick(record, ['type', 'content']))
+        setFieldsValue(pick(record, ['name', 'type', 'content']))
       })
     },
 
diff --git a/src/views/goods/category/modules/AddForm.vue b/src/views/goods/category/modules/AddForm.vue
index 977f3f1..01164df 100644
--- a/src/views/goods/category/modules/AddForm.vue
+++ b/src/views/goods/category/modules/AddForm.vue
@@ -48,6 +48,14 @@
             <a-radio :value="1">是</a-radio>
           </a-radio-group>
         </a-form-item>
+        <a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group
+            v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]"
+          >
+            <a-radio :value="0">否</a-radio>
+            <a-radio :value="1">是</a-radio>
+          </a-radio-group>
+        </a-form-item>
 
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端是否展示">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
diff --git a/src/views/goods/category/modules/EditForm.vue b/src/views/goods/category/modules/EditForm.vue
index 3b47928..94777fa 100644
--- a/src/views/goods/category/modules/EditForm.vue
+++ b/src/views/goods/category/modules/EditForm.vue
@@ -51,6 +51,14 @@
             <a-radio :value="1">是</a-radio>
           </a-radio-group>
         </a-form-item>
+        <a-form-item label="是否大牌正品" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group
+            v-decorator="['is_brand', { initialValue: 0, rules: [{ required: true }] }]"
+          >
+            <a-radio :value="0">否</a-radio>
+            <a-radio :value="1">是</a-radio>
+          </a-radio-group>
+        </a-form-item>
 
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="用户端是否展示">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
@@ -127,7 +135,7 @@ export default {
       const { record, form: { setFieldsValue } } = this
       // 设置表单内容
       this.$nextTick(() => {
-        setFieldsValue(_.pick(record, ['name', 'parent_id', 'image_id', 'status', 'sort','is_paihang','is_hot', 'is_in_store']))
+        setFieldsValue(_.pick(record, ['name', 'parent_id', 'image_id', 'status', 'sort', 'is_paihang', 'is_hot', 'is_in_store', 'is_brand']))
       })
     },
 
diff --git a/src/views/market/presale/Index.vue b/src/views/market/presale/Index.vue
index b6e9b96..8815bd5 100644
--- a/src/views/market/presale/Index.vue
+++ b/src/views/market/presale/Index.vue
@@ -66,16 +66,21 @@ export default {
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' }
         },
+        {
+          title: '预售时间',
+          width: '180px',
+          dataIndex: 'p_time'
+        },
         {
           title: '创建时间',
           width: '180px',
           dataIndex: 'ctime'
         },
-        {
+        /* {
           title: '更新时间',
           width: '180px',
           dataIndex: 'p_time'
-        },
+        }, */
         {
           title: '操作',
           dataIndex: 'action',
diff --git a/src/views/market/presale/modules/AddForm.vue b/src/views/market/presale/modules/AddForm.vue
index 44139b6..67e3cfc 100644
--- a/src/views/market/presale/modules/AddForm.vue
+++ b/src/views/market/presale/modules/AddForm.vue
@@ -22,6 +22,13 @@
             />
           </div>
         </a-form-item>
+        <a-form-item label="预售时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            show-time
+            format="YYYY-MM-DD HH:mm:ss"
+            v-decorator="['p_time', { rules: [{ required: true, message: '请输入预售时间' }] }]"
+          />
+        </a-form-item>
 
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
diff --git a/src/views/market/presale/modules/EditForm.vue b/src/views/market/presale/modules/EditForm.vue
index f6ec468..258cfda 100644
--- a/src/views/market/presale/modules/EditForm.vue
+++ b/src/views/market/presale/modules/EditForm.vue
@@ -23,6 +23,13 @@
             />
           </div>
         </a-form-item>
+        <a-form-item label="预售时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            show-time
+            format="YYYY-MM-DD HH:mm:ss"
+            v-decorator="['p_time', { rules: [{ required: true, message: '请输入预售时间' }] }]"
+          />
+        </a-form-item>
 
         <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group v-decorator="['status', { initialValue: 1, rules: [{ required: true }] }]">
@@ -84,7 +91,7 @@ export default {
     setFieldsValue () {
       const { record, form: { setFieldsValue } } = this
       this.$nextTick(() => {
-        setFieldsValue(pick(record, ['name', 'goods_list', 'status']))
+        setFieldsValue(pick(record, ['name', 'goods_list', 'p_time', 'status']))
       })
     },