From 0e67114e15212efeacf2c66b81261490f97ae434 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Thu, 24 Oct 2024 00:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/DraftDesign/index.vue      |  2 +-
 .../productcareitem/ProductCareItemForm.vue   | 21 +++++++++++++++++++
 .../src/components/DraftDesign/index.vue      |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
index 951035e..c4ccc90 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
@@ -242,7 +242,7 @@ const rightKeyMenu = computed(() => {
       value: 'clearGroup',
       icon: 'icon-lk_cell_clear',
       disabled: disabledMenu.value,
-      label: '清除属性',
+      label: '取消变量',
       handler: (item) => {
         const cells = that.selectedCellsList
         if (cells.length === 0) {
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/ProductCareItemForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/ProductCareItemForm.vue
index 2dd355c..d6a9964 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/ProductCareItemForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/productcareitem/ProductCareItemForm.vue
@@ -85,7 +85,28 @@
                           <span>{{ scope.$index + 1 }}</span>
                         </template>
                       </el-table-column>
+                      <el-table-column prop="locale" label="地区语言" width="180">
+                        <template #header>
+                          <div>
+                            <span class="color-red">*</span>
+                            <span>地区语言</span>
+                          </div>
+                        </template>
+                        <template #default="scope">
 
+                          <div
+                            :class="{ 'duplicate-tips' : duplicateCheck(scope.row.locale) }">
+                            <el-select v-model="scope.row.locale" placeholder="地区语言">
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.LANGUAGE_LOCALE)"
+                                :key="`${dict.value}`"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </div>
+                        </template>
+                      </el-table-column>
 
                       <el-table-column prop="value">
                         <template #header>
diff --git a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/index.vue b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/index.vue
index 951035e..c4ccc90 100644
--- a/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/components/DraftDesign/index.vue
@@ -242,7 +242,7 @@ const rightKeyMenu = computed(() => {
       value: 'clearGroup',
       icon: 'icon-lk_cell_clear',
       disabled: disabledMenu.value,
-      label: '清除属性',
+      label: '取消变量',
       handler: (item) => {
         const cells = that.selectedCellsList
         if (cells.length === 0) {