From 20c6ca8bebaaace79f40d9b12bcd5233aeb477f6 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Thu, 10 Oct 2024 19:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=85=81=E8=AE=B8=E6=8B=96=E5=AE=BD=EF=BC=8C?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E8=A6=81=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/ProductInfoListDialog/index.vue       |  2 +-
 .../ProductTypeDataListDialog/config.data.ts  |  1 +
 .../src/components/Table/src/Table.vue        |  5 +++
 .../base/producttype/ProductTypeForm.vue      | 11 +-----
 .../src/views/base/producttype/index.vue      | 13 -------
 .../src/views/oms/brand/BrandForm.vue         | 16 +--------
 .../src/views/oms/brand/index.vue             | 34 +++++--------------
 .../src/views/oms/draftdesigndata/index.vue   | 14 ++------
 .../src/views/oms/productcareitem/index.vue   | 27 ++-------------
 .../src/views/oms/productinfo/index.vue       | 11 ++----
 .../components/SaleContractEntryForm.vue      |  2 +-
 .../src/views/system/codingrules/index.vue    |  9 +----
 .../src/components/Table/src/Table.vue        |  5 +++
 13 files changed, 31 insertions(+), 119 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue
index be83138..035650e 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductInfoListDialog/index.vue
@@ -95,7 +95,7 @@
 
 <script lang="ts" setup name="ProductInfoListDialog">
 import {allSchemas} from './config.data'
-import {ProductInfoApi, ProductInfoVO} from '@/api/oms/productinfo'
+import {ProductInfoApi} from '@/api/oms/productinfo'
 import DataForm from './DataForm.vue'
 
 /** 稿件图片库  */
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts
index ad995f9..6454660 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/components/Dialog/src/ProductTypeDataListDialog/config.data.ts
@@ -17,6 +17,7 @@ const crudSchemas = reactive<CrudSchema[]>([
   {
     label: '编码',
     field: 'value',
+    width: 200,
     isSearch: true,
   },
   {
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Table/src/Table.vue b/hangtag-ui/hangtag-ui-admin/src/components/Table/src/Table.vue
index a9394ba..56ddd34 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/Table/src/Table.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/Table/src/Table.vue
@@ -47,6 +47,10 @@ export default defineComponent({
     data: {
       type: Array as PropType<Recordable[]>,
       default: () => []
+    },
+    border:{
+      type: Boolean,
+      default: true
     }
   },
   emits: ['update:pageSize', 'update:currentPage', 'register','selectionChange'],
@@ -273,6 +277,7 @@ export default defineComponent({
     return () => (
       <div v-loading={unref(getProps).loading}>
         <ElTable
+
           // @ts-ignore
           ref={elTableRef}
           data={unref(getProps).data}
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/ProductTypeForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/ProductTypeForm.vue
index 58b31b4..3d6304e 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/ProductTypeForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/ProductTypeForm.vue
@@ -16,16 +16,7 @@
       <el-form-item label="排序号" prop="sort">
         <el-input v-model="formData.sort" placeholder="请输入排序号" />
       </el-form-item>
-      <el-form-item label="语言标识" prop="locale">
-        <el-select v-model="formData.locale" placeholder="请选择语言标识">
-          <el-option
-            v-for="dict in getDictOptions(DICT_TYPE.LANGUAGE_LOCALE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="扩展项 json格式数据" prop="extendInfo">
         <el-input v-model="formData.extendInfo" type="textarea" placeholder="请输入扩展项 json格式数据" />
       </el-form-item>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/index.vue
index fc76c1b..6d45fdd 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/base/producttype/index.vue
@@ -27,17 +27,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="语言标识" prop="locale">
-
-        <el-select class="!w-240px" v-model="queryParams.locale" placeholder="请选择语言标识">
-          <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="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -79,8 +68,6 @@
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="编码" align="center" prop="value" />
       <el-table-column label="名称" align="center" prop="label" />
-      <el-table-column label="排序号" align="center" prop="sort" />
-      <el-table-column label="语言标识" align="center" prop="locale" />
       <el-table-column
         label="创建时间"
         align="center"
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 529440b..1fbaa31 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
@@ -39,21 +39,7 @@
       <el-form-item label="品牌介绍 富文本内容" prop="intro">
         <Editor v-model="formData.intro" height="150px" />
       </el-form-item>
-      <el-form-item label="语言标识" prop="locale">
-        <el-select
-          v-model="formData.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="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
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 04c13b3..1df6936 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
@@ -41,21 +41,6 @@
           />
         </el-select>
       </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="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -93,25 +78,22 @@
 
   <!-- 列表 -->
   <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="logo" align="center" prop="logo" />
+      <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" />
+          <span v-else>-</span>
+        </template>
+      </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" />
         </template>
       </el-table-column>
       <el-table-column label="官网" align="center" prop="website" />
-      <el-table-column label="语言标识" align="center" prop="locale" />
-      <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/draftdesigndata/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/draftdesigndata/index.vue
index 7837a91..c71bed5 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
@@ -108,11 +108,7 @@
       <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="locale">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.LANGUAGE_LOCALE" :value="scope.row.locale" />
-        </template>
-      </el-table-column>
+
       <el-table-column label="启用状态" align="center" prop="enabled">
         <template #default="scope">
           <el-tag :type="scope.row.enabled ? 'success' : 'danger'">
@@ -121,13 +117,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">
 
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 bd18386..1ddf789 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
@@ -21,23 +21,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :span="8">
-          <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-col>
+
         <el-col :xs="24" :span="8">
           <el-form-item label="启用状态" prop="enabled">
             <el-select
@@ -89,8 +73,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="保养项名称" align="center" prop="value" />
+    <el-table border  v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="保养项名称" align="center" prop="value" width="200" />
       <el-table-column label="品牌通用" align="center" prop="isAll" >
         <template #default="scope">
           <div>
@@ -98,11 +82,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="语言标识 " align="center" prop="locale">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.LANGUAGE_LOCALE" :value="scope.row.locale" />
-        </template>
-      </el-table-column>
       <el-table-column label="启用状态" align="center" prop="enabled" >
         <template #default="scope">
             <div>
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 19e53d0..f9bd556 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
@@ -112,9 +112,9 @@
   <!-- 列表 -->
   <ContentWrap>
     <DesignPreviewDialog ref="designPreviewDialogRef"/>
-    <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="cover">
         <template #default="scope">
@@ -137,13 +137,6 @@
         </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="操作" width="200px" align="center">
         <template #default="scope">
           <el-button
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/salecontract/components/SaleContractEntryForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/salecontract/components/SaleContractEntryForm.vue
index 2a5647f..c5785f3 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/salecontract/components/SaleContractEntryForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/salecontract/components/SaleContractEntryForm.vue
@@ -147,4 +147,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/system/codingrules/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/system/codingrules/index.vue
index 0318984..75fffb3 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/system/codingrules/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/system/codingrules/index.vue
@@ -67,13 +67,6 @@
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <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
@@ -195,4 +188,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/hangtag-ui/hangtag-ui-front/src/components/Table/src/Table.vue b/hangtag-ui/hangtag-ui-front/src/components/Table/src/Table.vue
index a9394ba..56ddd34 100644
--- a/hangtag-ui/hangtag-ui-front/src/components/Table/src/Table.vue
+++ b/hangtag-ui/hangtag-ui-front/src/components/Table/src/Table.vue
@@ -47,6 +47,10 @@ export default defineComponent({
     data: {
       type: Array as PropType<Recordable[]>,
       default: () => []
+    },
+    border:{
+      type: Boolean,
+      default: true
     }
   },
   emits: ['update:pageSize', 'update:currentPage', 'register','selectionChange'],
@@ -273,6 +277,7 @@ export default defineComponent({
     return () => (
       <div v-loading={unref(getProps).loading}>
         <ElTable
+
           // @ts-ignore
           ref={elTableRef}
           data={unref(getProps).data}