From 538ddea946c0ee99cca8d15abb2fdb7a0bc1599e Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 15 Mar 2022 11:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=20sxm=202022-3-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/language/common.vue | 50 +++++++++++++----------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index 2cbde45..6746764 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -73,7 +73,7 @@
               <a type="text" size="small" @click="addOrUpdateLanguageList(scope.row.functionId)">{{ buttons.settingLanguageList }}
               </a>
               |
-              <a type="text" size="small" v-show="" @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
+              <a type="text" size="small"  @click="addOrUpdateLanguage(scope.row)">{{ buttons.settingLanguage }}</a>
             </template>
           </el-table-column>
         </el-table>
@@ -348,34 +348,34 @@ export default {
           "columnType": null,
           "align": null
         },
-        // {
-        //   "tableId": "common1002",
-        //   "tableName": "commonLanguage",
-        //   "columnProp": "baseName",
-        //   "columnLabel": "控件名称",
-        //   "columnHidden": false,
-        //   "columnImage": false,
-        //   "columnSortable": false,
-        //   "columnWidth": null,
-        //   "format": null,
-        //   "functionId": "9001",
-        //   "sortLv": 2,
-        //   "status": true,
-        //   "fixed": false,
-        //   "serialNumber": null,
-        //   "columnType": null,
-        //   "align": null
-        // },
         {
           "tableId": "common1002",
           "tableName": "commonLanguage",
-          "columnProp": "languageValue",
+          "columnProp": "baseName",
           "columnLabel": "控件名称",
           "columnHidden": false,
           "columnImage": false,
           "columnSortable": false,
           "columnWidth": null,
           "format": null,
+          "functionId": "9001",
+          "sortLv": 2,
+          "status": true,
+          "fixed": false,
+          "serialNumber": null,
+          "columnType": null,
+          "align": null
+        },
+        {
+          "tableId": "common1002",
+          "tableName": "commonLanguage",
+          "columnProp": "languageValue",
+          "columnLabel": "控件值",
+          "columnHidden": false,
+          "columnImage": false,
+          "columnSortable": false,
+          "columnWidth": null,
+          "format": null,
           "functionId": this.$route.meta.menuId,
           "sortLv": 2,
           "status": true,
@@ -520,9 +520,17 @@ export default {
       addOrUpdateVisible: false
     }
   },
+  // watch:{
+  //   querySysLanguagePack: {
+  //     deep: true,
+  //     handler: function (newV, oldV) {
+  //       this.querySysLanguagePack.key = this.querySysLanguagePack.key.toUpperCase()
+  //     }
+  //   }
+  // },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 180;
+      this.heigquerySysLanguagePackht = window.innerHeight - 180;
     })
   },
   activated() {