1ba0943c by jiaozeping@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 00170c08 0cd23ca1
......@@ -162,11 +162,20 @@
<el-row>
<el-col :span="8">
<el-form-item label="户籍所在省市" prop="hjszss">
<el-cascader
<el-select
clearable
v-model="ruleForm.hjszss"
:props="treeProps"
:disabled="!showButton"
class="width100"
:options="dictData['A38']" :disabled="!showButton"></el-cascader>
placeholder="请选择">
<el-option
v-for="item in dictData['A38']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
......
......@@ -147,11 +147,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="户籍所在省市" prop="hjszss">
<el-cascader
<el-select
clearable
v-model="ruleForm.hjszss"
:props="treeProps"
:disabled="!showButton"
class="width100"
:options="dictData['A38']" :disabled="!showButton"></el-cascader>
placeholder="请选择">
<el-option
v-for="item in dictData['A38']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -147,11 +147,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="户籍所在省市" prop="hjszss">
<el-cascader
<el-select
clearable
v-model="ruleForm.hjszss"
:props="treeProps"
:disabled="!showButton"
class="width100"
:options="dictData['A38']" :disabled="!showButton"></el-cascader>
placeholder="请选择">
<el-option
v-for="item in dictData['A38']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......