From 2a0a4cd536ce16e19756e823c9aca585d8cb148e Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Apr 2022 14:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../virtualList/components/editModel.vue      | 28 ++++++++++++++-----
 .../components/virtualListDetails.vue         | 13 +++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 839d7b2ec..4290ad7d6 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -175,12 +175,15 @@
                       :title="$t('technicalField')">{{$t('technicalField')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="technologyTerritory">
-                <j-dict-select-tag class="box-input" v-model="formInline.technologyTerritory"
-                                   :disabled="disabled"
-                                   @input="handleInput('technologyTerritory')"
-                                   :placeholder="$t('PleaseSelect')+$t('technicalField')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'technology_territory'"/>
+                <a-tree-select
+                  v-model="formInline.technologyTerritory"
+                  :maxTagCount="1"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="CategoryTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                />
               </a-form-model-item>
             </div>
           </a-col>
@@ -499,12 +502,23 @@
         confirmLoading: false,
         rules: {},
         formInline: {},
-        disabled: false
+        disabled: false,
+        CategoryTreeList: []
       }
     },
     mounted() {
+      this.getSysCategoryTree()
     },
     methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       editModel(item) {
         this.visible = true
         this.$nextTick(() => {
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index c8afdef2a..4f3413a59 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -183,7 +183,8 @@
           setBatch: '/dummy/dummyInventoryInfoEO/setBatch',
           importZipUrl: '/dummy/dummyInventoryInfoEO/importData',
           exportData: '/dummy/dummyInventoryInfoEO/exportData',
-          exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate'
+          exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate',
+          getSysCategoryTree:'/sys/category/getSysCategoryTree',
         },
         loading: false,
         dataSource: [],
@@ -259,7 +260,7 @@
           {
             title: this.$t('technicalField'),
             align: 'center',
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('areaOfResponsibility'),
@@ -277,7 +278,7 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'designDeliverableTemplate',
+                dataIndex: 'designDeliverableTemplateName',
                 align: 'center'
               },
               {
@@ -297,7 +298,7 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'prehomoDeliverableTemplate',
+                dataIndex: 'prehomoDeliverableTemplateName',
                 align: 'center'
               },
               {
@@ -317,7 +318,7 @@
             children: [
               {
                 title: this.$t('Deliverables'),
-                dataIndex: 'verifyDeliverableTemplate',
+                dataIndex: 'verifyDeliverableTemplateName',
                 align: 'center'
               },
               {
@@ -471,6 +472,8 @@
         this.$refs.addModelRef.addModel()
       },
       handleDel() {
+        this.$refs.editModelRef.editModel()
+        return
         if (this.selectedRowKeys.length > 0) {
           let _this = this
           this.$confirm({