From 018f89c05008a01da4768fd4216353dc3fbd73f5 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Thu, 10 Oct 2024 20:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hangtag-ui-admin/src/styles/index.scss    | 10 +++
 .../src/views/oms/brand/BrandForm.vue         | 61 ++++++++++++-------
 .../src/views/oms/brand/index.vue             |  9 ++-
 .../src/views/oms/draftdesigndata/index.vue   | 22 +------
 .../src/views/oms/productcareitem/index.vue   |  8 +--
 .../views/oms/productinfo/ProductInfoForm.vue | 24 ++++----
 .../src/views/oms/productinfo/index.vue       | 11 +---
 .../hangtag-ui-front/src/styles/index.scss    |  5 +-
 8 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/styles/index.scss b/hangtag-ui/hangtag-ui-admin/src/styles/index.scss
index fbe76f2..28c4f61 100644
--- a/hangtag-ui/hangtag-ui-admin/src/styles/index.scss
+++ b/hangtag-ui/hangtag-ui-admin/src/styles/index.scss
@@ -34,3 +34,13 @@
     border-left-color: var(--el-color-primary);
   }
 }
+// 单元格样式
+.el-table__cell {
+  position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+}
+.line-clamp-1 {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
\ No newline at end of file
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/BrandForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/BrandForm.vue
index 1fbaa31..8292fc7 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/BrandForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/brand/BrandForm.vue
@@ -1,5 +1,8 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog
+    :title="dialogTitle"
+    width="60vw"
+    v-model="dialogVisible">
     <el-form
       ref="formRef"
       :model="formData"
@@ -15,34 +18,48 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入名称" />
-      </el-form-item>
-
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="品牌领域" prop="brandField">
+            <el-select v-model="formData.brandField" placeholder="请选择品牌领域">
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.BRAND_INDUSTRY_FIELD)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="logo" prop="logo">
         <UploadImg v-model="formData.logo" />
       </el-form-item>
-      <el-form-item label="品牌领域" prop="brandField">
-        <el-select v-model="formData.brandField" placeholder="请选择品牌领域">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.BRAND_INDUSTRY_FIELD)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="官网" prop="website">
-        <el-input v-model="formData.website" placeholder="请输入官网" />
-      </el-form-item>
-      <el-form-item label="品牌介绍 富文本内容" prop="intro">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="官网" prop="website">
+            <el-input v-model="formData.website" placeholder="请输入官网" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-form-item label="品牌介绍" prop="intro">
         <Editor v-model="formData.intro" height="150px" />
       </el-form-item>
 
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
+
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
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 1df6936..b865790 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
@@ -79,12 +79,17 @@
   <!-- 列表 -->
   <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="code" width="200"/>
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="logo" align="center" prop="logo" >
+
         <template #default="scope">
-          <img v-if="scope.row.logo" :src="scope.row.logo" width="50" height="50" />
+          <el-image
+                    v-if="scope.row.logo"
+                    style="width: 50px; height: 50px"
+                    :src="scope.row.logo"
+                    :preview-src-list="[scope.row.logo]"
+          />
           <span v-else>-</span>
         </template>
       </el-table-column>>
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 c71bed5..6859506 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
@@ -37,21 +37,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="语言标识" prop="locale">
-        <el-select
-          v-model="queryParams.locale"
-          placeholder="请选择语言"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.LANGUAGE_LOCALE)"
-            :key="`${dict.value}`"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="启用状态" prop="enabled">
         <el-select
           v-model="queryParams.enabled"
@@ -102,13 +88,11 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <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="code" />
+      <el-table-column label="编码" align="center" prop="code" width="200" />
       <el-table-column label="设计稿名称" align="center" prop="name" />
       <el-table-column label="作者" align="center" prop="author" />
-      <el-table-column label="版本" align="center" prop="version" />
-
       <el-table-column label="启用状态" align="center" prop="enabled">
         <template #default="scope">
           <el-tag :type="scope.row.enabled ? 'success' : 'danger'">
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/index.vue
index 1ddf789..3607191 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/index.vue
@@ -90,13 +90,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/ProductInfoForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/ProductInfoForm.vue
index e931688..d3582e6 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/ProductInfoForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/ProductInfoForm.vue
@@ -129,7 +129,7 @@
                         <template #header>
                           <div>
                             <span class="color-red">*</span>
-                            <span>风格主色名称</span>
+                            <span>主色名称</span>
                           </div>
                         </template>
                         <template #default="scope">
@@ -270,9 +270,9 @@ const formData = ref({
   enabled: true,
   remark: undefined,
   details: undefined,
-  specSizeWidth: 1,
-  specSizeHeight: 1,
-  specSizeThk: 1,
+  specSizeWidth: 0,
+  specSizeHeight: 0,
+  specSizeThk: 0,
   specMaterial: '',
 })
 const that = reactive({
@@ -343,10 +343,10 @@ const formRules = reactive({
   name: [{required: true, message: '产品名称不能为空', trigger: 'blur'}],
   brandId: [{required: true, message: '产品类型选择品牌', trigger: 'blur'}],
   productTypeId: [{required: true, message: '请选择产品类型', trigger: 'blur'}],
-  specSizeWidth: [{required: true, message: '请填写规格的宽度', trigger: 'blur'}],
-  specSizeHeight: [{required: true, message: '请填写规格的高(长)度', trigger: 'blur'}],
-  specSizeThk: [{required: true, message: '请填写厚度', trigger: 'blur'}],
-  specMaterial: [{required: true, message: '请填写材质说明', trigger: 'blur'}],
+  specSizeWidth: [{required: false, message: '请填写规格的宽度', trigger: 'blur'}],
+  specSizeHeight: [{required: false, message: '请填写规格的高(长)度', trigger: 'blur'}],
+  specSizeThk: [{required: false, message: '请填写厚度', trigger: 'blur'}],
+  specMaterial: [{required: false, message: '请填写材质说明', trigger: 'blur'}],
 })
 const formRef = ref() // 表单 Ref
 
@@ -502,14 +502,14 @@ const resetForm = () => {
     enabled: true,
     remark: undefined,
     details: undefined,
-    specSizeWidth: 1,
-    specSizeHeight: 1,
-    specSizeThk: 1,
+    specSizeWidth: 0,
+    specSizeHeight: 0,
+    specSizeThk: 0,
     specMaterial: '',
   }
   that.draftDesignList = [{
     remark: '',
-    label: '',
+    label: '默认',
     id: ''
   }]
   that.processInfoList =[{
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/index.vue
index f9bd556..3f4aad6 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/productinfo/index.vue
@@ -27,13 +27,7 @@
         />
       </el-form-item>
       <el-form-item label="品牌" prop="brandId">
-        <el-input
-          v-model="queryParams.brandId"
-          placeholder="请输入品牌"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <BrandDataListDialog v-model="queryParams.brandId" placeholder="请选择品牌"/>
       </el-form-item>
       <el-form-item label="产品类型" prop="productTypeId">
 
@@ -113,14 +107,13 @@
   <ContentWrap>
     <DesignPreviewDialog ref="designPreviewDialogRef"/>
     <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="code" width="200"/>
       <el-table-column label="产品名称" align="center" prop="name"/>
       <el-table-column label="封面" align="center" prop="cover">
         <template #default="scope">
           <el-image
             v-if="scope.row.cover"
-            style="width: 64px; height: 64px"
+            style="width: 50px; height: 50px"
             :src="scope.row.cover"
             :preview-src-list="[scope.row.cover]"
           />
diff --git a/hangtag-ui/hangtag-ui-front/src/styles/index.scss b/hangtag-ui/hangtag-ui-front/src/styles/index.scss
index d345222..2403b84 100644
--- a/hangtag-ui/hangtag-ui-front/src/styles/index.scss
+++ b/hangtag-ui/hangtag-ui-front/src/styles/index.scss
@@ -35,7 +35,10 @@
   }
 }
 
-
+// 单元格样式
+.el-table__cell {
+  position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+}
 .line-clamp-1 {
   overflow: hidden;
   display: -webkit-box;