WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-04-14 10:15:01 +08:00
parent 2cf3699162 731278dd0d
commit 988c8df54f
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+5 -1
View File
@@ -564,7 +564,11 @@ public class SysCategoryController {
} }
} }
@GetMapping("/getSysCategoryTree") /**
* 只查询技术领域的树形数据字典
* @return
*/
@GetMapping("/getSysCategoryTree")
public Result getSysCategoryTree() { public Result getSysCategoryTree() {
return Result.OK(sysCategoryService.getSysCategoryTree()); return Result.OK(sysCategoryService.getSysCategoryTree());
} }
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+22 -6
View File
@@ -162,7 +162,7 @@
@input="handleInput('attestationType')" @input="handleInput('attestationType')"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'attestationType'"/> :triggerChange="false" :dictCode="'attestation_type'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -195,7 +195,7 @@
:disabled="disabled" :disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'dutyTerritory'"/> :triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -213,7 +213,23 @@
@input="handleInput('attestationRank')" @input="handleInput('attestationRank')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:type="'select'" :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> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -249,7 +265,7 @@
@input="handleInput('designDeliverableType')" @input="handleInput('designDeliverableType')"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'designDeliverableType'"/> :triggerChange="false" :dictCode="'deliverable_template'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -320,7 +336,7 @@
@input="handleInput('prehomoDeliverableType')" @input="handleInput('prehomoDeliverableType')"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'prehomoDeliverableType'"/> :triggerChange="false" :dictCode="'deliverable_template'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -392,7 +408,7 @@
@input="handleInput('verifyDeliverableType')" @input="handleInput('verifyDeliverableType')"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'verifyDeliverableType'"/> :triggerChange="false" :dictCode="'deliverable_template'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>