Merge branch 'dev'

@@ -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">

@@ -13,14 +13,19 @@
         <el-form-item label="印刷序列号：" prop="ysxlh">
           <el-row>
             <el-col :span="18">
-              <el-select v-model="ruleForm.ysxlh" @change="handleSelect" :disabled="disabled" placeholder="请选择">
+
+              <!-- 青海2.0版本提出输入序列号，故以下内容注释，同步相关js代码也注释 -->
+              <!-- <el-select v-model="ruleForm.ysxlh" @change="handleSelect" :disabled="disabled" placeholder="请选择">
                 <el-option
                   v-for="item in ysxlh"
                   :key="item.ysxlh"
                   :label="item.ysxlh"
                   :value="item.ysxlh">
                 </el-option>
-              </el-select>
+              </el-select> --> 
+
+              <input  :disabled="disabled" maxlength="19" class="formInput" v-model="ruleForm.ysxlh" />
+
             </el-col>
             <el-col :span="4" v-if="this.formData.bdcqzlx==1">
               <el-tabs v-model="activeTitle">