Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -155,7 +155,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+      <el-form-item label="挂号类型：" :validate-event="is_Name">
         <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
@@ -330,7 +330,7 @@
           name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
           gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
           id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
-          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
+          // register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
           doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
           department: [{required: true, message: '请填写科室', trigger: 'blur'}],
           age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],

src/xt_pages/outpatientRegistration/index.vue

@@ -125,7 +125,7 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                    <el-form-item label="挂号类型：" :validate-event="is_Name">
                         <el-select v-model="form.register" placeholder="请选择" @change="changeReg">
                             <el-option
                                     v-for="item in his_registers"
@@ -315,16 +315,16 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" >
-                        <el-select v-model="form.register" placeholder="请选择">
-                            <el-option
-                                    v-for="item in his_registers"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <!--<el-form-item label="挂号类型：" >-->
+                        <!--<el-select v-model="form.register" placeholder="请选择">-->
+                            <!--<el-option-->
+                                    <!--v-for="item in his_registers"-->
+                                    <!--:key="item.value"-->
+                                    <!--:label="item.label"-->
+                                    <!--:value="item.value">-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
 
                     <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
                         <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""