|
@@ -476,14 +476,14 @@
|
|
|
<el-form-item label="职业：">
|
|
<el-form-item label="职业：">
|
|
|
<template v-if="formModel.status =='0'">
|
|
<template v-if="formModel.status =='0'">
|
|
|
<span class="grid-content-span" v-if="formModel.memberUpdateLog.taOccupation" style="color:red">
|
|
<span class="grid-content-span" v-if="formModel.memberUpdateLog.taOccupation" style="color:red">
|
|
|
- {{formModel.taOccupationN}}
|
|
|
|
|
|
|
+ {{formModel.taOccupation}}
|
|
|
</span>
|
|
</span>
|
|
|
<span class="grid-content-span" v-else>
|
|
<span class="grid-content-span" v-else>
|
|
|
- {{formModel.taOccupationN}}
|
|
|
|
|
|
|
+ {{formModel.taOccupation}}
|
|
|
</span>
|
|
</span>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-else>
|
|
<template v-else>
|
|
|
- <span class="grid-content-span" >{{formModel.taOccupationN}}</span>
|
|
|
|
|
|
|
+ <span class="grid-content-span" >{{formModel.taOccupation}}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</div>
|
|
</div>
|
|
@@ -748,15 +748,8 @@
|
|
|
></el-option>
|
|
></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="职业" :label-width="formLabelWidth">
|
|
|
|
|
- <el-select v-model="form.taOccupation" filterable placeholder="请选择">
|
|
|
|
|
- <el-option
|
|
|
|
|
- v-for="result in industryList"
|
|
|
|
|
- :key="result.id"
|
|
|
|
|
- :label="result.name"
|
|
|
|
|
- :value="result.value"
|
|
|
|
|
- ></el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ <el-form-item label="职业" :label-width="formLabelWidth">
|
|
|
|
|
+ <el-input v-model="form.taOccupation" autocomplete="off"></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="工作地" :label-width="formLabelWidth">
|
|
<el-form-item label="工作地" :label-width="formLabelWidth">
|
|
|
<el-cascader
|
|
<el-cascader
|
yanliming