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

@@ -13,14 +13,19 @@
         <el-form-item label="印刷序列号：" prop="ysxlh">
         <el-form-item label="印刷序列号：" prop="ysxlh">
           <el-row>
           <el-row>
             <el-col :span="18">
             <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
                 <el-option
                   v-for="item in ysxlh"
                   v-for="item in ysxlh"
                   :key="item.ysxlh"
                   :key="item.ysxlh"
                   :label="item.ysxlh"
                   :label="item.ysxlh"
                   :value="item.ysxlh">
                   :value="item.ysxlh">
                 </el-option>
                 </el-option>
-              </el-select>
+              </el-select> --> 
+
+              <input  :disabled="disabled" maxlength="19" class="formInput" v-model="ruleForm.ysxlh" />
+
             </el-col>
             </el-col>
             <el-col :span="4" v-if="this.formData.bdcqzlx==1">
             <el-col :span="4" v-if="this.formData.bdcqzlx==1">
               <el-tabs v-model="activeTitle">
               <el-tabs v-model="activeTitle">