From 487e8250da8fe16909834f7717714141a51321ef Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Wed, 20 Nov 2024 23:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=A8=BF=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draftdesigndata/vo/DraftDesignDataPageReqVO.java |  3 +++
 .../draftdesigndata/vo/DraftDesignDataRespVO.java    |  4 ++++
 .../draftdesigndata/vo/DraftDesignDataSaveReqVO.java |  4 ++++
 .../draftdesigndata/DraftDesignDataDO.java           |  5 +++++
 .../hangtag-ui-admin/src/views/oms/brand/index.vue   |  2 +-
 .../src/views/oms/draftdesigndata/detials/index.vue  |  6 ++++++
 .../src/views/oms/draftdesigndata/index.vue          | 12 ++++++++++++
 .../src/views/oms/order/createorder/index.vue        |  4 ++--
 8 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataPageReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataPageReqVO.java
index c92cd47..db5e54e 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataPageReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataPageReqVO.java
@@ -18,6 +18,9 @@ public class DraftDesignDataPageReqVO extends PageParam {
     @Schema(description = "编码")
     private String code;
 
+    @Schema(description = "封面")
+    private String cover;
+
     @Schema(description = "设计稿名称", example = "赵六")
     private String name;
 
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataRespVO.java
index b4bf329..018fb94 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataRespVO.java
@@ -22,6 +22,10 @@ public class DraftDesignDataRespVO {
     @ExcelProperty("编码")
     private String code;
 
+    @Schema(description = "封面")
+    @ExcelProperty("封面")
+    private String cover;
+
     @Schema(description = "设计稿名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @ExcelProperty("设计稿名称")
     private String name;
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataSaveReqVO.java
index a405cbc..9da669c 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/draftdesigndata/vo/DraftDesignDataSaveReqVO.java
@@ -15,6 +15,10 @@ public class DraftDesignDataSaveReqVO {
     @Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String code;
 
+
+    @Schema(description = "封面")
+    private String cover;
+
     @Schema(description = "设计稿名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @NotEmpty(message = "设计稿名称不能为空")
     private String name;
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/draftdesigndata/DraftDesignDataDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/draftdesigndata/DraftDesignDataDO.java
index e9ece33..9e33f38 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/draftdesigndata/DraftDesignDataDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/draftdesigndata/DraftDesignDataDO.java
@@ -31,6 +31,11 @@ public class DraftDesignDataDO extends BaseDO {
      * 编码
      */
     private String code;
+
+    /**
+     * 封面
+     */
+    private String cover;
     /**
      * 设计稿名称
      */
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/index.vue
index 8740810..702e47d 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/index.vue
@@ -92,7 +92,7 @@
           />
           <span v-else>-</span>
         </template>
-      </el-table-column>>
+      </el-table-column>
       <el-table-column label="品牌领域" align="center" prop="brandField">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.BRAND_INDUSTRY_FIELD" :value="scope.row.brandField" />
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/detials/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/detials/index.vue
index 1d9749b..f7cf6a8 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/detials/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/detials/index.vue
@@ -57,6 +57,9 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-form-item label="cover" prop="cover">
+        <UploadImg v-model="formData.cover" />
+      </el-form-item>
 
     </el-form>
 
@@ -82,6 +85,7 @@ const formType = ref('create') // 表单的类型：create - 新增；update - 
 const formData = ref({
   id: route.params.id,
   code: undefined,
+  cover: undefined,
   name: undefined,
   author: undefined,
   version: 1,
@@ -123,6 +127,7 @@ const open = async (type: string, id?: number) => {
         if(copyData.value){
           formData.value.id = undefined
           formData.value.code = undefined
+          formData.value.cover = undefined
           formData.value.name = formData.value.name + '(复制)'
           formData.value.version = 1;
           formType.value = 'create'
@@ -182,6 +187,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     code: undefined,
+    cover: undefined,
     name: undefined,
     author: undefined,
     version: 1,
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/index.vue
index 794c621..27b43ba 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/index.vue
@@ -90,6 +90,18 @@
   <ContentWrap>
     <el-table border v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="封面" align="center" prop="cover" >
+
+        <template #default="scope">
+          <el-image
+                    v-if="scope.row.cover"
+                    style="width: 64px; height: 64px"
+                    :src="scope.row.cover"
+                    :preview-src-list="[scope.row.cover]"
+          />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="编码" align="center" prop="code" width="200" />
       <el-table-column label="设计稿名称" align="center" prop="name" />
       <el-table-column
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
index 9a5792b..edcaa23 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
@@ -646,7 +646,7 @@ const addNewBill = () => {
         setTimeout(()=>{
           that.pageLoading.close()
           push("/")
-        },800)
+        },3000)
       })
     }else {
       SaleOrderApi.placeOrder({
@@ -660,7 +660,7 @@ const addNewBill = () => {
         setTimeout(()=>{
           that.pageLoading.close()
           push("/")
-        },800)
+        },3000)
       })
     }