From b07125d648d9e8604880d63692e929041348bf72 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Apr 2022 09:54:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E6=B8=85=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 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index ed8b320aa..839d7b2ec 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -162,7 +162,7 @@
                                    @input="handleInput('attestationType')"
                                    :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'attestationType'"/>
+                                   :triggerChange="false" :dictCode="'attestation_type'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -195,7 +195,7 @@
                                     :disabled="disabled"
                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                     :type="'select'"
-                                    :triggerChange="false" :dictCode="'dutyTerritory'"/>
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -213,7 +213,23 @@
                                    @input="handleInput('attestationRank')"
                                    :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'attestationRank'"/>
+                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="implementType">
+                <j-dict-select-tag class="box-input" v-model="formInline.implementType"
+                                   :disabled="disabled"
+                                   @input="handleInput('implementType')"
+                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'implement_type'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -249,7 +265,7 @@
                                    @input="handleInput('designDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'designDeliverableType'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -320,7 +336,7 @@
                                    @input="handleInput('prehomoDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'prehomoDeliverableType'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -392,7 +408,7 @@
                                    @input="handleInput('verifyDeliverableType')"
                                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
                                    :type="'select'"
-                                   :triggerChange="false" :dictCode="'verifyDeliverableType'"/>
+                                   :triggerChange="false" :dictCode="'deliverable_template'"/>
               </a-form-model-item>
             </div>
           </a-col>

From 731278dd0da54d907d162d879433aa0976453be3 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Apr 2022 10:08:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E9=A2=86=E5=9F=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysCategoryController.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
index 44315f428..8d2e852d0 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
@@ -564,7 +564,11 @@ public class SysCategoryController {
 		 }
 	 }
 
-	 @GetMapping("/getSysCategoryTree")
+	/**
+	 * 只查询技术领域的树形数据字典
+	 * @return
+	 */
+	@GetMapping("/getSysCategoryTree")
 	 public Result getSysCategoryTree() {
 	 	return Result.OK(sysCategoryService.getSysCategoryTree());
 	 }