Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/router/modules/integration.js

     meta: {
       title: '质控集成'
     }
+  },
+  {
+    path: '/data/medicalInsurance',
+    component: () => import('@/xt_pages/integration/medicalInsurance'),
+    name: '医保绑定',
+    meta: {
+      title: '医保绑定'
+    }
   }
 
   ]

src/xt_pages/integration/medicalInsurance.vue

+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container medicalInsurance">
+        <p class="medicalTitle">绑定医疗机构编码</p>
+        <p>绑定医疗机构编码后，如系统能正常使用医保扣费，则代表医疗机构编码正确</p>
+        <p>此后请勿修改该编码，否则导致系统异常</p>
+        <p>此版本医保系统只能在</p>
+        <el-form ref="form" :model="form" label-width="120px" label-position="left" style="margin-top:40px;">
+            <el-form-item label="医疗机构编码:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+            </el-form-item>
+            <el-form-item label="医疗机构名称:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+            </el-form-item>
+            <el-form-item label="医疗机构VPN:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+                <span style="margin-left:5px;">提示：如果没有VPN，则使用<span class="defaultVPN">系统默认VPN</span></span>
+            </el-form-item>
+        </el-form>
+        <el-button type="primary">绑定</el-button>
+        <el-form ref="form" :model="form" label-width="120px" label-position="left" style="margin-top:40px;">
+            <el-form-item label="电子医保卡ID:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+            </el-form-item>
+            <el-form-item label="电子医保卡KEY:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+            </el-form-item>
+            <el-form-item label="渠道号:">
+                <el-input v-model.trim="form.dbhost" maxlength="200" style="width :200px;"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-button type="primary">绑定电子卡</el-button>
+        <p class="medicalTitle" style="margin-top:20px;">医疗绑定步骤</p>
+        <p>1.目前诊所云医保系统只支持广东深圳市区域</p>
+        <p>2.绑定医疗机构编码(该编码从深圳医保局申请所得)</p>
+        <p>3.系统设置-医师信息；为对应的员工填写成员编码(该编码则是医保局下发的操作员编码)</p>
+        <p>4.药品管理-药品信息维护；为需要医保报销的药品设置医保编码</p>
+        <p>5.系统设置-检测项目设置；为需要医保报销的检查项目设置医保编码</p>
+        <p>6.患者使用医保挂号；挂号成功后到开处方界面从挂号人员列表选择挂号患者，开处方收费即可</p>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: '集成配置' },
+                { path: false, name: '医保绑定' }
+            ],
+            form:{}
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.medicalInsurance p{
+    line-height: 24px;
+}
+.medicalTitle{
+    font-size: 18px;
+    color:#409EFF;
+}
+.defaultVPN{
+    background: #409EFF;
+    padding: 2px 5px;
+    border-radius: 2px;
+    color:#fff;
+    margin-left:5px;
+}
+</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           <el-form-item label="证件号: " prop="name">
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
           </el-form-item>
+          <el-form-item label="挂号类型: " prop="name">
+            <el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>
+          </el-form-item>
           <el-form-item label="挂号类型: " prop="name">
             <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
               <el-option
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
-                       :patientInfo="patientInfo"></additionalCharges>
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
         departMent: [],
         curStatus: 0
       }
-    }, mounted() {
-
     },
     methods: {
       getTotal() {
 
       querySearch(queryString, cb) {
         var restaurants = this.diagnoses
+        console.log(restaurants)
         restaurants.map(item => {
           item.value = item.name
         })
       changeKind(val) {
         this.drugs = []
 
-        if (val == 0) {
+        if(val == 0){
           this.drugs = this.allDrugs
-        } else {
-          for (let i = 0; i < this.allDrugs.length; i++) {
-            if (this.allDrugs[i].drug_type == val) {
+        }else{
+          for (let i = 0; i < this.allDrugs.length; i++){
+            if (this.allDrugs[i].drug_type == val){
               this.drugs.push(this.allDrugs[i])
             }
           }

src/xt_pages/outpatientRegistration/index.vue

                         </el-select>
                     </el-form-item>
                     <el-form-item class="specialFormItem" label="医保卡号：">
-                        <el-input v-model="form.medicalInsuranceCard"></el-input>
-                        <el-button type="primary" @click="reading">读卡</el-button>
+                        <div style="display:flex;">
+                            <el-input v-model="form.medicalInsuranceCard"></el-input>
+                            <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+                        </div>
                     </el-form-item>
                     <el-form-item label="患者姓名：">
                         <el-input v-model="form.name"></el-input>
     flex-wrap: wrap;
     justify-content: space-between;
     .el-form-item{
-        width: 260px;
+        width: 33%;
     }
     .specialFormItem{
-        width:625px;
+        width:67%;
         .el-input{
             min-width: 150px;
         }
     }
     .el-select{
-        width: 180px;
+        width: 100%;
     }
     .el-input{
-        width: 180px;
+        width: 100%;
     }
 }
 </style>