From 85e3d118a733d641fe099736a1b7609196642616 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 5 Feb 2025 17:55:03 +0800
Subject: [PATCH] init

---
 src/views/Product/Product.vue                | 1152 ++++++++++--------
 src/views/Product/components/AddProduct.vue  |  167 ++-
 src/views/Product/components/ShowProduct.vue |  168 ++-
 3 files changed, 893 insertions(+), 594 deletions(-)

diff --git a/src/views/Product/Product.vue b/src/views/Product/Product.vue
index 66e48fd..70c842d 100644
--- a/src/views/Product/Product.vue
+++ b/src/views/Product/Product.vue
@@ -1,541 +1,711 @@
 
 <template>
-    <div>
-        <el-card shadow="never" style="margin-top: 20px;">
-            <template #header>
-                <slot name="header">
-                    <vxe-toolbar :export="isHasAuth('export')" :print="isHasAuth('print')" custom ref="toolbar">
-                        <template #buttons>
-                            <el-button
-                                    v-if="isHasAuth('create')"
-                                    icon="el-icon-plus"
-                                    type="primary"
-                                    size="small"
-                                    @click="isShowAdd = true"
-                            >新增</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('search')"
-                                    icon="el-icon-search"
-                                    type="primary"
-                                    plain
-                                    size="small"
-                                    @click="getList"
-                            >搜索</el-button
-                            >
-                        </template>
-                    </vxe-toolbar>
-                </slot>
+  <div>
+    <el-card shadow="never" style="margin-top: 20px;">
+      <template #header>
+        <slot name="header">
+          <vxe-toolbar ref="toolbar" :export="isHasAuth('export')" :print="isHasAuth('print')" custom>
+            <template #buttons>
+              <el-button
+                v-if="isHasAuth('create')"
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                @click="isShowAdd = true"
+              >新增</el-button>
+              <el-button
+                v-if="isHasAuth('search')"
+                icon="el-icon-search"
+                type="primary"
+                plain
+                size="small"
+                @click="getList"
+              >搜索</el-button>
             </template>
+          </vxe-toolbar>
+        </slot>
+      </template>
 
-            <vxe-table
-                    ref="table"
-                    stripe
-                    style="margin-top: 10px"
-                    :loading="loading"
-                    :height="tableHeight"
-                    keep-source
-                    show-overflow
-                    :menu-config="{
-                      className: 'my-menus',
-                      body: {
-                        options: [
-                          [
-                            { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
-                            { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
-                          ],
-                        ]
-                      }
-                    }"
-                    @menu-click="contextMenuClickEvent"
-                    :row-config="{ isCurrent: true, isHover: true }"
-                    :column-config="{ resizable: true }"
-                    :export-config="{}"
-                    :edit-rules="validRules"
-                    :edit-config="{
+      <vxe-table
+        ref="table"
+        stripe
+        style="margin-top: 10px"
+        :loading="loading"
+        :height="tableHeight"
+        keep-source
+        show-overflow
+        :menu-config="{
+          className: 'my-menus',
+          body: {
+            options: [
+              [
+                { code: 'copy', name: '复制', prefixConfig: { icon: 'vxe-icon-copy' }, suffixConfig: { content: 'Ctrl+C' } },
+                { code: 'remove', name: '删除', prefixConfig: { icon: 'vxe-icon-delete-fill', className: 'color-red' } }
+              ],
+            ]
+          }
+        }"
+        :row-config="{ isCurrent: true, isHover: true }"
+        :column-config="{ resizable: true }"
+        :export-config="{}"
+        :edit-rules="validRules"
+        :edit-config="{
           trigger: 'manual',
           mode: 'row',
-          showStatus: true,
+          showStatus: false,
           isHover: true,
           autoClear: false,
         }"
-                    
-                    :align="allAlign"
-                    :data="tableData"
-            >
-                <vxe-column type="seq" width="58" align="center"  />
-                
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                field="product_category_id"
-                                width="160"
-                                title="分类选择"
-                                :edit-render="{ name: 'VxeTreeSelect', options: productCategory, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="name"
-                                width="160"
-                                title="商品名称"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                align="right"
-                                field="price"
-                                width="160"
-                                title="商品价格"
-                                :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                field="image_id"
-                                min-width="180"
-                                title="封面图片"
-                                header-align="center"
-                                align="left"
-                                :edit-render="{}"
-                        >
-                            <template #default="{ row }">
-                                <vxe-upload v-model="row['image']" name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
-                            </template>
-                            <template #edit="{ row }">
-                                <vxe-upload
-                                        name-field="original_name"
-                                        v-model="row['image']"
-                                        progress-text="{percent}%"
-                                        :more-config="{ maxCount: 1, layout: 'horizontal' }"
-                                        :limit-size="uploadSize / 1024 / 1024"
-                                        :show-button-text="false"
-                                        :upload-method="({file}) => uploadMethod(file)" />
-                            </template>
-                        </vxe-column>
-                
-                    
-                    
-                        
-                        <vxe-column
-                                align="center"
-                                header-align="center"
-                                field="content"
-                                width="120"
-                                title="内容"
-                                :edit-render="{}"
-                        >
-                            <template #default="{ row }">
-                                <el-button slot="reference" size="small" type="primary" icon="el-icon-search" @click="$refs['RichTextModal'].open({ text: row['content'], readonly: true, fieldName: 'content', row })">查看</el-button>
-                            </template>
-                            <template #edit="{ row }">
-                                <el-button slot="reference" size="small" type="primary" icon="el-icon-edit" @click="$refs['RichTextModal'].open({ text: row['content'], readonly: false, fieldName: 'content', row })">编辑</el-button>
-                            </template>
-                        </vxe-column>
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                field="product_images"
-                                min-width="180"
-                                title="商品轮播图"
-                                header-align="center"
-                                align="left"
-                                :edit-render="{}"
-                        >
-                            <template #default="{ row }">
-                                <vxe-upload v-model="row['product_image']" name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
-                            </template>
-                            <template #edit="{ row }">
-                                <vxe-upload
-                                        name-field="original_name"
-                                        v-model="row['product_image']"
-                                        progress-text="{percent}%"
-                                        :more-config="{ maxCount: 1, layout: 'horizontal' }"
-                                        :limit-size="uploadSize / 1024 / 1024"
-                                        :show-button-text="false"
-                                        :upload-method="({file}) => uploadMethod(file)" />
-                            </template>
-                        </vxe-column>
-                
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                field="product_skus"
-                                width="160"
-                                title="商品"
-                                :edit-render="{ name: 'input', attrs: { type: 'text' } }"
-                        />
-                        
-                    
-                    
-                        
-                        <vxe-column
-                                header-align="center"
-                                align="right"
-                                field="sort"
-                                width="160"
-                                title="排序"
-                                :edit-render="{ name: 'input', attrs: { type: 'number' } }"
-                        />
-                        
-                <vxe-column field="operate" header-align="center" title="操作" min-width="220">
-                    <template #default="{ row }">
-                        <template v-if="isActiveStatus(row)">
-                            <el-button size="small" type="primary" @click="saveRowEvent(row)"
-                            >保存</el-button
-                            >
-                            <el-button
-                                    size="small"
-                                    type="primary"
-                                    plain
-                                    @click="cancelRowEvent(row)"
-                            >取消</el-button
-                            >
-                        </template>
-                        <template v-else>
-                            <el-button v-if="isHasAuth('detail')" size="small" type="primary" plain @click="detail(row)"
-                            >查看</el-button
-                            >
-                            <el-button v-if="isHasAuth('edit')" size="small" type="warning" @click="editRowEvent(row)"
-                            >编辑</el-button
-                            >
-                            <el-button
-                                    v-if="isHasAuth('delete')"
-                                    size="small"
-                                    type="danger"
-                                    @click="destroyRowEvent(row)"
-                            >删除</el-button
-                            >
-                        </template>
+        :expand-config="{
+          padding: true
+        }"
+        :align="allAlign"
+        :data="tableData"
+        @menu-click="contextMenuClickEvent"
+      >
+        <vxe-column type="expand" :visible="false" width="0" align="center">
+          <template #content="{ row }">
+            <div>
+              <el-button
+                size="mini"
+                icon="el-icon-plus"
+                type="primary"
+                @click="_ => {
+                  const newRecord = {
+                    name: '',
+                    stock_num: 1,
+                    price: 0.00,
+                    image_id: '',
+                    image: '',
+                    is_default: 0
+                  }
+                  row.product_skus.unshift(newRecord)
+                  $nextTick(_ => {
+                    const $subTable = $refs['subTable_' + row.id]
+                    if ($subTable) {
+                      $subTable.setEditRow(newRecord)
+                    }
+                  })
+                }"
+              >新增</el-button>
+
+              <vxe-table
+                :ref="'subTable_' + row.id"
+                style="margin-top: 10px;"
+                stripe
+                size="small"
+                border
+                keep-source
+                show-overflow
+                :max-height="300"
+                :column-config="{ resizable: true }"
+                :edit-config="{
+                  trigger: 'manual',
+                  mode: 'row',
+                  showStatus: false,
+                  isHover: true,
+                  autoClear: false,
+                }"
+                :edit-rules="validSubRules"
+                :data="row.product_skus"
+              >
+                <vxe-column type="seq" width="58" align="center" />
+                <vxe-column
+                  header-align="center"
+                  field="name"
+                  width="160"
+                  title="名称"
+                  :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+                />
+                <vxe-column
+                  header-align="center"
+                  field="price"
+                  width="160"
+                  title="价格"
+                  :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+                />
+                <vxe-column
+                  header-align="center"
+                  field="stock_num"
+                  width="140"
+                  title="库存"
+                  :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+                />
+                <vxe-column
+                  field="image_id"
+                  min-width="180"
+                  title="图片"
+                  width="160"
+                  header-align="center"
+                  align="left"
+                  :edit-render="{}"
+                >
+                  <template #default="{ row: row1 }">
+                    <vxe-upload v-model="row1['image']" single-mode name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
+                  </template>
+                  <template #edit="{ row: row1 }">
+                    <vxe-upload
+                      v-model="row1['image']"
+                      single-mode
+                      name-field="original_name"
+                      progress-text="{percent}%"
+                      :more-config="{ maxCount: 1, layout: 'horizontal' }"
+                      :limit-size="uploadSize / 1024 / 1024"
+                      :show-button-text="false"
+                      :upload-method="({file}) => uploadMethod(file)"
+                    />
+                  </template>
+                </vxe-column>
+                <vxe-column
+                  field="is_default"
+                  align="center"
+                  title="是否默认"
+                  width="120"
+                  :edit-render="{
+                    name: 'select',
+                    options: [
+                      { label: '是', value: 1 },
+                      { label: '否', value: 0 }
+                    ]
+                  }"
+                />
+                <vxe-column field="action" title="操作" width="160" header-align="center">
+                  <template #default="{ row: row1 }">
+                    <template v-if="isActiveStatus(row1, 'subTable_' + row.id)">
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        @click="saveSubRowEvent(row1, 'subTable_' + row.id, row)"
+                      >确认</el-button>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        plain
+                        @click="cancelRowEvent(row1, 'subTable_' + row.id)"
+                      >取消</el-button>
                     </template>
+                    <template v-else>
+                      <el-button
+                        size="mini"
+                        type="warning"
+                        @click="editRowEvent(row1, 'subTable_' + row.id)"
+                      >编辑</el-button>
+                      <el-button
+                        size="mini"
+                        type="danger"
+                        @click="_ => {
+                          $confirm('确认删除？', '提示').then(_ => {
+                            row.product_skus = row.product_skus.filter(i => i !== row1)
+                            saveRow(row)
+                          })
+                        }"
+                      >删除</el-button>
+                    </template>
+                  </template>
                 </vxe-column>
-            </vxe-table>
-
-            
-                <el-pagination
-                        style="margin-top: 10px;display: flex;justify-content: flex-end;"
-                        :current-page.sync="select.page"
-                        :page-sizes="[20, 30, 40, 50]"
-                        :page-size.sync="select.page_size"
-                        layout="total, sizes, prev, pager, next, jumper"
-                        :total="total"
-                        @size-change="
+              </vxe-table>
+            </div>
+          </template>
+        </vxe-column>
+        <vxe-column type="seq" width="58" align="center" />
+
+        <vxe-column
+          header-align="center"
+          field="product_skus"
+          width="120"
+          align="center"
+          title="商品"
+        >
+          <template #default="{ row }">
+            <el-button size="small" type="primary" icon="el-icon-search" @click="$refs.table.toggleRowExpand(row)">查看</el-button>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          align="center"
+          field="product_category_id"
+          width="160"
+          title="分类选择"
+          :edit-render="{ name: 'VxeTreeSelect', options: productCategory, props: { multiple: false }, optionProps: { value: 'id', label: 'name' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          field="name"
+          width="160"
+          title="商品名称"
+          :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+        />
+
+        <vxe-column
+          header-align="center"
+          align="right"
+          field="price"
+          width="160"
+          title="商品价格"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+        />
+
+        <vxe-column
+          field="image_id"
+          min-width="180"
+          title="封面图片"
+          header-align="center"
+          align="left"
+          :edit-render="{}"
+        >
+          <template #default="{ row }">
+            <vxe-upload v-model="row['image']" name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
+          </template>
+          <template #edit="{ row }">
+            <vxe-upload
+              v-model="row['image']"
+              name-field="original_name"
+              progress-text="{percent}%"
+              :more-config="{ maxCount: 1, layout: 'horizontal' }"
+              :limit-size="uploadSize / 1024 / 1024"
+              :show-button-text="false"
+              :upload-method="({file}) => uploadMethod(file)"
+            />
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          align="center"
+          header-align="center"
+          field="content"
+          width="120"
+          title="内容"
+          :edit-render="{}"
+        >
+          <template #default="{ row }">
+            <el-button slot="reference" size="small" type="primary" icon="el-icon-search" @click="$refs['RichTextModal'].open({ text: row['content'], readonly: true, fieldName: 'content', row })">查看</el-button>
+          </template>
+          <template #edit="{ row }">
+            <el-button slot="reference" size="small" type="primary" icon="el-icon-edit" @click="$refs['RichTextModal'].open({ text: row['content'], readonly: false, fieldName: 'content', row })">编辑</el-button>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          field="product_images"
+          min-width="180"
+          title="商品轮播图"
+          header-align="center"
+          align="left"
+          :edit-render="{}"
+        >
+          <template #default="{ row }">
+            <vxe-upload :value="row['product_images'].map(i => i.hasOwnProperty('image') ? i['image'] : i)" name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
+          </template>
+          <template #edit="{ row }">
+            <vxe-upload
+              multiple
+              :value="row['product_images'].map(i => i.hasOwnProperty('image') ? i['image'] : i)"
+              name-field="original_name"
+              progress-text="{percent}%"
+              :more-config="{ maxCount: 1, layout: 'horizontal' }"
+              :limit-size="uploadSize / 1024 / 1024"
+              :show-button-text="false"
+              :upload-method="({file}) => uploadMethod(file)"
+              @upload-success="e => uploadSuccess(e, row)"
+              @remove="e => uploadRemove(e, row)"
+            />
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          header-align="center"
+          align="right"
+          field="sort"
+          width="160"
+          title="排序"
+          :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+        />
+
+        <vxe-column field="operate" header-align="center" title="操作" min-width="220">
+          <template #default="{ row }">
+            <template v-if="isActiveStatus(row)">
+              <el-button
+                size="small"
+                type="primary"
+                @click="saveRowEvent(row)"
+              >保存</el-button>
+              <el-button
+                size="small"
+                type="primary"
+                plain
+                @click="cancelRowEvent(row)"
+              >取消</el-button>
+            </template>
+            <template v-else>
+              <el-button
+                v-if="isHasAuth('detail')"
+                size="small"
+                type="primary"
+                plain
+                @click="detail(row)"
+              >查看</el-button>
+              <el-button
+                v-if="isHasAuth('edit')"
+                size="small"
+                type="warning"
+                @click="editRowEvent(row)"
+              >编辑</el-button>
+              <el-button
+                v-if="isHasAuth('delete')"
+                size="small"
+                type="danger"
+                @click="destroyRowEvent(row)"
+              >删除</el-button>
+            </template>
+          </template>
+        </vxe-column>
+      </vxe-table>
+
+      <el-pagination
+        style="margin-top: 10px;display: flex;justify-content: flex-end;"
+        :current-page.sync="select.page"
+        :page-sizes="[20, 30, 40, 50]"
+        :page-size.sync="select.page_size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="
           (e) => {
             select.page_size = e;
             select.page = 1;
             getList();
           }
         "
-                        @current-change="
+        @current-change="
           (e) => {
             select.page = e;
             getList();
           }
         "
-                />
-            
-        </el-card>
-
-        <AddProduct
-                ref="AddProduct"
-                
-                    :product-category="productCategory"
-                  
-                :is-show.sync="isShowAdd"
-                @refresh="getList"
-        />
-        <ShowProduct
-                ref="ShowProduct"
-        
-                :product-category="productCategory"
-                
-                :is-show.sync="isShowDetail"
-        />
-        
-            <rich-text-modal ref="RichTextModal" @confirm="({ row, fieldName, text }) => row[fieldName] = text"></rich-text-modal>
-        
-    </div>
+      />
+
+    </el-card>
+
+    <AddProduct
+      ref="AddProduct"
+      :upload-method="uploadMethod"
+      :product-category="productCategory"
+      :is-show.sync="isShowAdd"
+      @refresh="getList"
+    />
+    <ShowProduct
+      ref="ShowProduct"
+      :product-category="productCategory"
+      :is-show.sync="isShowDetail"
+    />
+
+    <rich-text-modal ref="RichTextModal" @confirm="({ row, fieldName, text }) => row[fieldName] = text" />
+
+  </div>
 </template>
 
 <script>
-  import VxeUI from "vxe-pc-ui";
-  
-  import RichTextModal from "@/components/RichTextModal/index.vue";
-  
-  import { authMixin } from "@/mixin/authMixin"
-  import { uploadSize } from "@/settings";
-  import { deepCopy } from "@/utils";
-  import { destroy, index, save } from "@/api/product/product";
-  import AddProduct from "./components/AddProduct.vue";
-  import ShowProduct from "./components/ShowProduct.vue";
-  import axios from "axios";
-  import { getToken } from "@/utils/auth";
-  
-        import { index as productCategoryIndex } from '@/api/product-category/product-category';
-      
-  export default {
-    name: "Product",
-    mixins: [authMixin],
-    components: {
-        
-      RichTextModal,
-        
-      AddProduct,
-      ShowProduct,
-    },
-    data() {
-      return {
-        uploadSize,
-        examineKey: 0,
-        isShowAdd: false,
-        isShowDetail: false,
-
-        loading: false,
-        tableHeight: 400,
-        select: {
-          page: 1,
-          page_size: 20,
-          keyword: '',
-          show_relation: ["image","product_image"],
-          
-        },
-        total: 0,
-        allAlign: null,
-        tableData: [],
-        form: {
-          id: '',
-          
-            product_category_id: '',
-          
-            name: '',
-          
-            price: '',
-          
-            image_id: [],
-          
-            content: '',
-          
-            product_images: [],
-          
-            product_skus: [],
-          
-            sort: '',
-          
-        },
-      validRules: {
-          
+import VxeUI from 'vxe-pc-ui'
+
+import RichTextModal from '@/components/RichTextModal/index.vue'
+
+import { authMixin } from '@/mixin/authMixin'
+import { uploadSize } from '@/settings'
+import { deepCopy } from '@/utils'
+import { destroy, index, save } from '@/api/product/product'
+import AddProduct from './components/AddProduct.vue'
+import ShowProduct from './components/ShowProduct.vue'
+import axios from 'axios'
+import { getToken } from '@/utils/auth'
+
+import { index as productCategoryIndex } from '@/api/product-category/product-category'
+
+export default {
+  name: 'Product',
+  components: {
+
+    RichTextModal,
+
+    AddProduct,
+    ShowProduct
+  },
+  mixins: [authMixin],
+  data() {
+    return {
+      uploadSize,
+      examineKey: 0,
+      isShowAdd: false,
+      isShowDetail: false,
+
+      loading: false,
+      tableHeight: 400,
+      select: {
+        page: 1,
+        page_size: 20,
+        keyword: '',
+        show_relation: ['image', 'productImages.image', 'productCategory', 'productSkus.image']
+
+      },
+      total: 0,
+      allAlign: null,
+      tableData: [],
+      form: {
+        id: '',
+        product_category_id: '',
+        name: '',
+        price: '',
+        image_id: '',
+        content: '',
+        product_images: [],
+        product_skus: [],
+        sort: ''
       },
+      validRules: {
 
-        
-               productCategory: [],
-             
-      };
-    },
-    computed: {
-      isActiveStatus() {
-        return function (row) {
-          if (this.$refs["table"]) {
-            return this.$refs["table"].isEditByRow(row);
+      },
+      validSubRules: {
+        name: [
+          {
+            required: true,
+            message: '名称' + '必填'
           }
-        };
+        ]
       },
-      isHasAuth() {
-        return function (auth) {
-          return this.auths_auth_mixin.indexOf(auth) !== -1
+
+      productCategory: []
+
+    }
+  },
+  computed: {
+    isActiveStatus() {
+      return function(row, ref = 'table') {
+        if (this.$refs[ref]) {
+          return this.$refs[ref].isEditByRow(row)
         }
       }
     },
-    created() {
-      
-         this.getProductCategory()
-         
-      this.getList();
+    isHasAuth() {
+      return function(auth) {
+        return this.auths_auth_mixin.indexOf(auth) !== -1
+      }
+    }
+  },
+  created() {
+    this.getProductCategory()
+
+    this.getList()
+  },
+  mounted() {
+    this.bindToolbar()
+    this.calcTableHeight()
+  },
+  methods: {
+    uploadRemove({ option, $event }, row) {
+      const temp = row['product_images'].findIndex(i => i?.response?.id === option?.id || i?.image?.id === option?.id)
+      if (temp !== -1) {
+        row['product_images'].splice(temp, 1)
+      }
     },
-    mounted() {
-      this.bindToolbar()
-      this.calcTableHeight()
+    uploadSuccess({ data, $event }, row) {
+      const temp = row['product_images'].findIndex(i => i?.response?.id === data.response?.id || i?.image?.id === data.response?.id)
+      if (temp === -1) {
+        row['product_images'].push(data)
+      }
     },
-    methods: {
-      calcTableHeight() {
-        let clientHeight = document.documentElement.clientHeight;
-        let cardTitle = document.querySelector(".el-card__header")?.getBoundingClientRect()?.height;
-        let search = document.querySelector(".vxe-toolbar")?.getBoundingClientRect()?.height;
-        let paginationHeight = (document.querySelector(".el-pagination")?.getBoundingClientRect()?.height ?? 0) + 10; //分页的高度
-        let topHeight = 50; //页面 头部
-        let padding = 80;
-        let margin = 20;
-        this.tableHeight =
-          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin;
-      },
-      contextMenuClickEvent ({ menu, row, column }) {
-        switch (menu.code) {
-          case 'copy':
-            // 示例
-            if (row && column) {
-              if (VxeUI.clipboard.copy(row[column.field])) {
-                this.$message.success('已复制到剪贴板！')
-              }
-            }
-            break
-          case 'remove':
-            if (row && column) {
-              this.destroyRowEvent(row)
-            }
-          default:
-        }
-      },
-      async detail (row) {
-        await this.$refs["ShowProduct"].getDetail(row.id)
-        this.isShowDetail = true
-      },
-
-      
-           async getProductCategory() {
-             try {
-               const res = await productCategoryIndex({
-                 page: 1,
-                 page_size: 999,
-                 is_tree: 1,
-               }, false)
-               this.productCategory = res
-             } catch(err) {
-               console.error(err)
-             }
-           },
-         
-
-      uploadMethod(file) {
-        const formData = new FormData()
-        formData.append('file', file)
-        window.$_uploading = true
-        return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
-          headers: {
-            Authorization: `Bearer ${getToken()}`,
-          }
-        }).then((response) => {
-          window.$_uploading = false
-          if (response.status === 200 && !response.data.code) {
-            return {
-              response: response.data,
-              name: response.data.original_name,
-              url: response.data.url
+    calcTableHeight() {
+      const clientHeight = document.documentElement.clientHeight
+      const cardTitle = document.querySelector('.el-card__header')?.getBoundingClientRect()?.height
+      const search = document.querySelector('.vxe-toolbar')?.getBoundingClientRect()?.height
+      const paginationHeight = (document.querySelector('.el-pagination')?.getBoundingClientRect()?.height ?? 0) + 10 // 分页的高度
+      const topHeight = 50 // 页面 头部
+      const padding = 80
+      const margin = 20
+      this.tableHeight =
+          clientHeight - cardTitle - search - paginationHeight - topHeight - padding - margin
+    },
+    contextMenuClickEvent({ menu, row, column }) {
+      switch (menu.code) {
+        case 'copy':
+          // 示例
+          if (row && column) {
+            if (VxeUI.clipboard.copy(row[column.field])) {
+              this.$message.success('已复制到剪贴板！')
             }
-          } else {
-            this.$message.error("上传失败")
           }
-        }).catch(_ => {
-          window.$_uploading = false
-        })
-      },
-      bindToolbar() {
-        this.$nextTick(() => {
-          if (this.$refs["table"] && this.$refs["toolbar"]) {
-            this.$refs["table"].connect(this.$refs["toolbar"]);
+          break
+        case 'remove':
+          if (row && column) {
+            this.destroyRowEvent(row)
           }
-        });
-      },
+        default:
+      }
+    },
+    async detail(row) {
+      await this.$refs['ShowProduct'].getDetail(row.id)
+      this.isShowDetail = true
+    },
 
-      editRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].setEditRow(row);
+    async getProductCategory() {
+      try {
+        const res = await productCategoryIndex({
+          page: 1,
+          page_size: 999,
+          is_tree: 1
+        }, false)
+        this.productCategory = res
+      } catch (err) {
+        console.error(err)
+      }
+    },
+
+    uploadMethod(file) {
+      const formData = new FormData()
+      formData.append('file', file)
+      window.$_uploading = true
+      return axios.post(process.env.VUE_APP_UPLOAD_API, formData, {
+        headers: {
+          Authorization: `Bearer ${getToken()}`
         }
-      },
-      cancelRowEvent(row) {
-        if (this.$refs["table"]) {
-          this.$refs["table"].clearEdit().then(() => {
-            // 还原行数据
-            this.$refs["table"].revertData(row);
-          });
+      }).then((response) => {
+        window.$_uploading = false
+        if (response.status === 200 && !response.data.code) {
+          return {
+            response: response.data,
+            name: response.data.original_name,
+            url: response.data.url,
+            original_name: response.data.original_name
+          }
+        } else {
+          this.$message.error('上传失败')
         }
-      },
-
-      async getList() {
-        this.loading = true;
-        try {
-          const res = await index(this.select, false);
-          this.tableData = res.data;
-          this.total = res.total;
-          this.loading = false;
-        } catch (err) {
-          console.error(err);
-          this.loading = false;
+      }).catch(_ => {
+        window.$_uploading = false
+      })
+    },
+    bindToolbar() {
+      this.$nextTick(() => {
+        if (this.$refs['table'] && this.$refs['toolbar']) {
+          this.$refs['table'].connect(this.$refs['toolbar'])
         }
-      },
+      })
+    },
 
-      async saveRowEvent(row) {
-        if (window.$_uploading) {
-          this.$message.warning("文件正在上传中")
-          return
+    editRowEvent(row, ref = 'table') {
+      if (this.$refs[ref]) {
+        this.$refs[ref].setEditRow(row)
+      }
+    },
+    cancelRowEvent(row, ref = 'table') {
+      if (this.$refs[ref]) {
+        this.$refs[ref].clearEdit().then(() => {
+          // 还原行数据
+          this.$refs[ref].revertData(row)
+        })
+      }
+    },
+
+    async getList() {
+      this.loading = true
+      try {
+        const res = await index(this.select, false)
+        this.tableData = res.data
+        this.total = res.total
+        this.loading = false
+      } catch (err) {
+        console.error(err)
+        this.loading = false
+      }
+    },
+
+    async saveRow(row) {
+      row['image_id'] = (row['image']?.response?.id || row['image_id']) ?? ''
+      row['product_images'] = row['product_images'].map((i, index) => ({
+        image_id: i.hasOwnProperty('image') ? i.image.id : (i.hasOwnProperty('response') ? i.response.id : i.id),
+        sort: index
+      })).filter(i => i.image_id)
+      row['product_skus'].forEach(sku => {
+        sku['image_id'] = (sku['image']?.response?.id || sku['image_id']) ?? ''
+        delete sku['image']
+      })
+      await save(row)
+    },
+    async saveSubRowEvent(row, ref, prow) {
+      if (window.$_uploading) {
+        this.$message.warning('文件正在上传中')
+        return
+      }
+      try {
+        const errMap = await this.$refs[ref].validate(true)
+        if (errMap) {
+          throw new Error(errMap)
         }
-        try {
-          const errMap = await this.$refs["table"].validate();
-          if (errMap) {
-            throw new Error(errMap);
-          }
-          await this.$confirm("确认保存？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          await this.$refs["table"].clearEdit();
-          let form = deepCopy(this.form);
-          for (const key in form) {
-            form[key] = row[key];
-          }
-          
-                   form['image_id'] = row['image'][0]?.response?.id ?? ''
-          
-                   form['product_images'] = row['product_image'].map(i => i.response?.id).filter(i => i)
-            
-          this.loading = true;
-          await save(form, false);
-          await this.getList();
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$refs[ref].clearEdit()
+        await this.saveRow(prow)
+      } catch (err) {
+        console.error(err)
+      }
+    },
+    async saveRowEvent(row) {
+      if (window.$_uploading) {
+        this.$message.warning('文件正在上传中')
+        return
+      }
+      try {
+        const errMap = await this.$refs['table'].validate()
+        if (errMap) {
+          throw new Error(errMap)
         }
-      },
-      async destroyRowEvent(row) {
-        try {
-          await this.$confirm("确认删除？", "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "取消",
-          });
-          this.loading = true;
-          if (row.id) {
-            await destroy({
-              id: row.id,
-            },false);
-            await this.getList();
-          } else {
-            console.log(row);
-            this.tableData.splice(
-              this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
-              1
-            );
-          }
-          this.loading = false;
-        } catch (err) {
-          this.loading = false;
+        await this.$confirm('确认保存？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消'
+        })
+        await this.$refs['table'].clearEdit()
+        const form = deepCopy(this.form)
+        for (const key in form) {
+          form[key] = row[key]
         }
-      },
 
+        form['image_id'] = (row['image'][0]?.response?.id || row['image_id']) ?? ''
+        form['product_images'] = row['product_images'].map((i, index) => ({
+          image_id: i.hasOwnProperty('image') ? i.image.id : (i.hasOwnProperty('response') ? i.response.id : i.id),
+          sort: index
+        })).filter(i => i.image_id)
+
+        this.loading = true
+        await save(form, false)
+        await this.getList()
+        this.loading = false
+      } catch (err) {
+        this.loading = false
+      }
     },
-  };
+    async destroyRowEvent(row) {
+      try {
+        await this.$confirm('确认删除？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消'
+        })
+        this.loading = true
+        if (row.id) {
+          await destroy({
+            id: row.id
+          }, false)
+          await this.getList()
+        } else {
+          console.log(row)
+          this.tableData.splice(
+            this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
+            1
+          )
+        }
+        this.loading = false
+      } catch (err) {
+        this.loading = false
+      }
+    }
+
+  }
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Product/components/AddProduct.vue b/src/views/Product/components/AddProduct.vue
index 3d240c2..19be1d5 100644
--- a/src/views/Product/components/AddProduct.vue
+++ b/src/views/Product/components/AddProduct.vue
@@ -118,13 +118,125 @@
               </el-upload>
             </el-form-item>
 
-            <el-form-item label="商品" prop="product_skus">
-              <el-input
-                v-model="form['product_skus']"
-                clearable
-                placeholder="请填写商品"
-                style="width: 100%"
-              />
+            <el-form-item class="span2" label="商品" prop="product_skus">
+              <div>
+                <el-button
+                  size="mini"
+                  icon="el-icon-plus"
+                  type="primary"
+                  @click="_ => {
+                    const newRecord = {
+                      name: '',
+                      stock_num: 1,
+                      price: 0.00,
+                      image_id: '',
+                      image: '',
+                      is_default: 0
+                    }
+                    form.product_skus.unshift(newRecord)
+                    $nextTick(_ => {
+                      const $subTable = $refs['subTable']
+                      if ($subTable) {
+                        $subTable.setEditRow(newRecord)
+                      }
+                    })
+                  }"
+                >新增</el-button>
+                <vxe-table
+                  ref="subTable"
+                  style="margin-top: 10px;"
+                  stripe
+                  size="small"
+                  border
+                  keep-source
+                  show-overflow
+                  :max-height="300"
+                  :column-config="{ resizable: true }"
+                  :edit-config="{
+                    trigger: 'click',
+                    mode: 'row',
+                    showStatus: false,
+                    isHover: true,
+                    autoClear: false,
+                  }"
+                  :edit-rules="validSubRules"
+                  :data="form.product_skus"
+                >
+                  <vxe-column type="seq" width="58" align="center" />
+                  <vxe-column
+                    header-align="center"
+                    field="name"
+                    width="160"
+                    title="名称"
+                    :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+                  />
+                  <vxe-column
+                    header-align="center"
+                    field="price"
+                    width="160"
+                    title="价格"
+                    :edit-render="{ name: 'input', attrs: { type: 'number' } }"
+                  />
+                  <vxe-column
+                    header-align="center"
+                    field="stock_num"
+                    width="140"
+                    title="库存"
+                    :edit-render="{ name: 'input', attrs: { type: 'text' } }"
+                  />
+                  <vxe-column
+                    field="image_id"
+                    min-width="180"
+                    title="图片"
+                    width="160"
+                    header-align="center"
+                    align="left"
+                    :edit-render="{}"
+                  >
+                    <template #default="{ row: row1 }">
+                      <vxe-upload v-model="row1['image']" single-mode name-field="original_name" readonly progress-text="{percent}%" :more-config="{ maxCount: 1, layout: 'horizontal' }" :show-button-text="false" />
+                    </template>
+                    <template #edit="{ row: row1 }">
+                      <vxe-upload
+                        v-model="row1['image']"
+                        single-mode
+                        name-field="original_name"
+                        progress-text="{percent}%"
+                        :more-config="{ maxCount: 1, layout: 'horizontal' }"
+                        :limit-size="uploadSize / 1024 / 1024"
+                        :show-button-text="false"
+                        :upload-method="({file}) => uploadMethod(file)"
+                      />
+                    </template>
+                  </vxe-column>
+                  <vxe-column
+                    field="is_default"
+                    align="center"
+                    title="是否默认"
+                    width="120"
+                    :edit-render="{
+                      name: 'select',
+                      options: [
+                        { label: '是', value: 1 },
+                        { label: '否', value: 0 }
+                      ]
+                    }"
+                  />
+                  <vxe-column field="action" title="操作" width="160" header-align="center">
+                    <template #default="{ row: row1 }">
+                      <el-button
+                        size="mini"
+                        type="danger"
+                        @click="_ => {
+                          $confirm('确认删除？', '提示').then(_ => {
+                            form.product_skus = form.product_skus.filter(i => i !== row1)
+                          })
+                        }"
+                      >删除</el-button>
+                    </template>
+                  </vxe-column>
+                </vxe-table>
+              </div>
             </el-form-item>
 
             <el-form-item label="排序" prop="sort">
@@ -170,6 +282,10 @@ export default {
     productCategory: {
       type: Array,
       default: () => []
+    },
+    uploadMethod: {
+      type: Function,
+      default: () => {}
     }
   },
   data() {
@@ -180,22 +296,32 @@ export default {
       visible: false,
       form: {
         product_category_id: '',
-
         name: '',
-
         price: 0,
-
         image_id: [],
-
         content: '',
-
         product_images: [],
-
         product_skus: [],
-
         sort: 0
       },
-      rules: {}
+      rules: {},
+      validSubRules: {
+        name: [
+          {
+            required: true,
+            message: '名称' + '必填'
+          }
+        ]
+      }
+    }
+  },
+  computed: {
+    isActiveStatus() {
+      return function(row, ref = 'table') {
+        if (this.$refs[ref]) {
+          return this.$refs[ref].isEditByRow(row)
+        }
+      }
     }
   },
   watch: {
@@ -276,8 +402,15 @@ export default {
       this.form['image_id'] = this.form['image_id'][0]?.response?.id ?? ''
 
       this.form['product_images'] = this.form['product_images']
-        .map((i) => i.response?.id)
-        .filter((i) => i)
+        .map((i, index) => ({
+          image_id: i.response?.id,
+          sort: index
+        }))
+        .filter((i) => i.image_id)
+      this.form['product_skus'].forEach(sku => {
+        sku['image_id'] = (sku['image']?.response?.id || sku['image_id']) ?? ''
+        delete sku['image']
+      })
 
       this.$refs['elForm'].validate(async(valid) => {
         if (valid) {
diff --git a/src/views/Product/components/ShowProduct.vue b/src/views/Product/components/ShowProduct.vue
index 394a3ae..fe5ca8b 100644
--- a/src/views/Product/components/ShowProduct.vue
+++ b/src/views/Product/components/ShowProduct.vue
@@ -1,98 +1,93 @@
 
 <template>
-    <div>
-        <el-drawer
-                :title="$route.meta.title"
-                direction="rtl"
-                size="68%"
-                :visible.sync="visible"
-                append-to-body
-                @close="$emit('update:isShow',false)">
-            <section class="drawer-container">
-                <el-descriptions class="drawer-container__desc" size="small" border ref="elDesc" :column="2" direction="vertical" :labelStyle="{ 'font-weight': '500', 'font-size': '15px' }">
-                    
-                    <el-descriptions-item label="商品名称">
-                        {{ form['name'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="商品价格">
-                        {{ typeof form['price'] === 'number' ? form['price'].toFixed(2) : form['price'] }}
-                    </el-descriptions-item>
-                    
-                    <el-form-item label="封面图片" prop="image_id">
-                        <el-upload
-                          :file-list="form['image_id']"
-                          accept="application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document">
-                        </el-upload>
-                    </el-form-item>
-                    
-                    <el-descriptions-item label="内容" span="2">
-                        {{ form['content'] }}
-                    </el-descriptions-item>
-                    
-                    <el-form-item label="商品轮播图" prop="product_images">
-                        <el-upload
-                          :file-list="form['product_images']"
-                          accept="application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document">
-                        </el-upload>
-                    </el-form-item>
-                    
-                    <el-descriptions-item label="商品">
-                        {{ form['product_skus'] }}
-                    </el-descriptions-item>
-                    
-                    <el-descriptions-item label="排序">
-                        {{ typeof form['sort'] === 'number' ? form['sort'].toFixed(2) : form['sort'] }}
-                    </el-descriptions-item>
-                    
-                </el-descriptions>
-            </section>
-        </el-drawer>
-    </div>
+  <div>
+    <el-drawer
+      :title="$route.meta.title"
+      direction="rtl"
+      size="68%"
+      :visible.sync="visible"
+      append-to-body
+      @close="$emit('update:isShow',false)"
+    >
+      <section class="drawer-container">
+        <el-descriptions ref="elDesc" class="drawer-container__desc" size="small" border :column="2" direction="vertical" :label-style="{ 'font-weight': '500', 'font-size': '15px' }">
+
+          <el-descriptions-item label="商品名称">
+            {{ form['name'] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="商品价格">
+            {{ typeof form['price'] === 'number' ? form['price'].toFixed(2) : form['price'] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="封面图片">
+            <el-image
+              style="width: 100px;"
+              fit="contain"
+              :src="form['image']['url']"
+              :preview-src-list="[form['image']['url']]"
+            />
+          </el-descriptions-item>
+
+          <el-descriptions-item label="内容" span="2">
+            <div v-html="form['content']" />
+          </el-descriptions-item>
+
+          <el-form-item label="商品轮播图" prop="product_images">
+            <el-upload
+              :file-list="form['product_images']"
+              accept="application/msword,image/jpeg,application/pdf,image/png,application/vnd.ms-powerpoint,text/plain,application/x-zip-compressed,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            />
+          </el-form-item>
+
+          <el-descriptions-item label="商品">
+            {{ form['product_skus'] }}
+          </el-descriptions-item>
+
+          <el-descriptions-item label="排序">
+            {{ typeof form['sort'] === 'number' ? form['sort'].toFixed(2) : form['sort'] }}
+          </el-descriptions-item>
+
+        </el-descriptions>
+      </section>
+    </el-drawer>
+  </div>
 </template>
 
 <script>
-  import { show } from "@/api/product/product";
+import { show } from '@/api/product/product'
+
+export default {
+  name: 'ProductShow',
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false,
+      required: true
+    },
+
+    productCategory: {
+      type: Array,
+      default: () => []
+    }
 
-  export default {
-    name: "ProductShow",
-    props: {
-      isShow: {
-        type: Boolean,
-        default: false,
-        required: true
-      },
-  
-  productCategory : {
-    type: Array,
-  default: () => []
-  },
-  
   },
   data() {
     return {
       loading: false,
       visible: false,
       form: {
-      
-      product_category_id: '',
-      
-      name: '',
-      
-      price: '',
-      
-      image_id: [],
-      
-      content: '',
-      
-      product_images: [],
-      
-      product_skus: [],
-      
-      sort: '',
-      
-  },
-  }
+        product_category_id: '',
+        name: '',
+        price: '',
+        image_id: [],
+        image: {},
+        content: '',
+        product_images: [],
+        product_skus: [],
+        sort: ''
+      }
+    }
   },
   watch: {
     isShow(newVal) {
@@ -100,15 +95,16 @@
     },
     visible(newVal) {
       this.$emit('update:isShow', newVal)
-    },
+    }
   },
   methods: {
     async getDetail(id) {
       try {
         const detail = await show({
-          id
+          id,
+          show_relation: ['image']
         })
-        for (let key in this.form) {
+        for (const key in this.form) {
           if (detail.hasOwnProperty(key)) {
             this.form[key] = detail[key]
           }