Merge remote-tracking branch 'origin/pet' into pet

xuyifeng-0724-人员中台对接-pet
guoyuepeng 2024-07-02 11:19:56 +08:00
commit b57c58488b
1 changed files with 6 additions and 3 deletions

View File

@ -41,7 +41,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="股份主管部门" prop="MAIN_DEPARTMENT"> <el-form-item label="股份主管部门" prop="MAIN_DEPARTMENT">
<Treeselect <!-- <Treeselect
:options="treeData" :options="treeData"
:disabled="true" :disabled="true"
:normalizer="normalizer" :normalizer="normalizer"
@ -54,7 +54,10 @@
no-options-text="暂无数据" no-options-text="暂无数据"
no-children-text="暂无数据" no-children-text="暂无数据"
style="width: 100%;" style="width: 100%;"
/> />-->
<el-input v-model="dataForm.MAIN_DEPARTMENT_NAME" disabled maxlength="255" title="单位名称"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -764,7 +767,7 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}) })
await this.getTreeList() // await this.getTreeList()
await this.getDict() await this.getDict()
await this.getData() await this.getData()
loading.close() loading.close()