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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           <el-form-item label="处方类型: " prop="name" label-position="right">
             <el-select style="width:100%;" v-model="register_type" placeholder="">
               <el-option
-                v-for="(item,index) in getDictionaryDataConfig('system','prescription_type')"
+                v-for="(item,index) in register"
                 :key="index"
-                :label="item.name"
-                :value="item.id">
+                :label="item.label"
+                :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
               </div>
             </div>
 
-            
+
 
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
         }
       }
     },
-   
+
   }
 </script>