Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
e1de1a15 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 8a926264 0cd23ca1
Inline Side-by-side
Showing 4 changed files with 43 additions and 11 deletions
...@@ -162,11 +162,20 @@ ...@@ -162,11 +162,20 @@
162 <el-row> 162 <el-row>
163 <el-col :span="8"> 163 <el-col :span="8">
164 <el-form-item label="户籍所在省市" prop="hjszss"> 164 <el-form-item label="户籍所在省市" prop="hjszss">
165 <el-cascader 165 <el-select
166 clearable
166 v-model="ruleForm.hjszss" 167 v-model="ruleForm.hjszss"
167 :props="treeProps" 168 :disabled="!showButton"
168 class="width100" 169 class="width100"
169 :options="dictData['A38']" :disabled="!showButton"></el-cascader> 170 placeholder="请选择">
171 <el-option
172 v-for="item in dictData['A38']"
173 :key="item.dcode"
174 :label="item.dname"
175 :value="item.dcode">
176 </el-option>
177 </el-select>
178
170 </el-form-item> 179 </el-form-item>
171 </el-col> 180 </el-col>
172 <el-col :span="16"> 181 <el-col :span="16">
......
...@@ -147,11 +147,20 @@ ...@@ -147,11 +147,20 @@
147 </el-col> 147 </el-col>
148 <el-col :span="8"> 148 <el-col :span="8">
149 <el-form-item label="户籍所在省市" prop="hjszss"> 149 <el-form-item label="户籍所在省市" prop="hjszss">
150 <el-cascader 150 <el-select
151 clearable
151 v-model="ruleForm.hjszss" 152 v-model="ruleForm.hjszss"
152 :props="treeProps" 153 :disabled="!showButton"
153 class="width100" 154 class="width100"
154 :options="dictData['A38']" :disabled="!showButton"></el-cascader> 155 placeholder="请选择">
156 <el-option
157 v-for="item in dictData['A38']"
158 :key="item.dcode"
159 :label="item.dname"
160 :value="item.dcode">
161 </el-option>
162 </el-select>
163
155 </el-form-item> 164 </el-form-item>
156 </el-col> 165 </el-col>
157 <el-col :span="8"> 166 <el-col :span="8">
......
...@@ -147,11 +147,20 @@ ...@@ -147,11 +147,20 @@
147 </el-col> 147 </el-col>
148 <el-col :span="8"> 148 <el-col :span="8">
149 <el-form-item label="户籍所在省市" prop="hjszss"> 149 <el-form-item label="户籍所在省市" prop="hjszss">
150 <el-cascader 150 <el-select
151 clearable
151 v-model="ruleForm.hjszss" 152 v-model="ruleForm.hjszss"
152 :props="treeProps" 153 :disabled="!showButton"
153 class="width100" 154 class="width100"
154 :options="dictData['A38']" :disabled="!showButton"></el-cascader> 155 placeholder="请选择">
156 <el-option
157 v-for="item in dictData['A38']"
158 :key="item.dcode"
159 :label="item.dname"
160 :value="item.dcode">
161 </el-option>
162 </el-select>
163
155 </el-form-item> 164 </el-form-item>
156 </el-col> 165 </el-col>
157 <el-col :span="8"> 166 <el-col :span="8">
......
...@@ -13,14 +13,19 @@ ...@@ -13,14 +13,19 @@
13 <el-form-item label="印刷序列号：" prop="ysxlh"> 13 <el-form-item label="印刷序列号：" prop="ysxlh">
14 <el-row> 14 <el-row>
15 <el-col :span="18"> 15 <el-col :span="18">
16 <el-select v-model="ruleForm.ysxlh" @change="handleSelect" :disabled="disabled" placeholder="请选择"> 16
17 <!-- 青海2.0版本提出输入序列号，故以下内容注释，同步相关js代码也注释 -->
18 <!-- <el-select v-model="ruleForm.ysxlh" @change="handleSelect" :disabled="disabled" placeholder="请选择">
17 <el-option 19 <el-option
18 v-for="item in ysxlh" 20 v-for="item in ysxlh"
19 :key="item.ysxlh" 21 :key="item.ysxlh"
20 :label="item.ysxlh" 22 :label="item.ysxlh"
21 :value="item.ysxlh"> 23 :value="item.ysxlh">
22 </el-option> 24 </el-option>
23 </el-select> 25 </el-select> -->
26
27 <input :disabled="disabled" maxlength="19" class="formInput" v-model="ruleForm.ysxlh" />
28
24 </el-col> 29 </el-col>
25 <el-col :span="4" v-if="this.formData.bdcqzlx==1"> 30 <el-col :span="4" v-if="this.formData.bdcqzlx==1">
26 <el-tabs v-model="activeTitle"> 31 <el-tabs v-model="activeTitle">
......