Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="医疗类型: " prop="name">
+            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
+              <el-option
+                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="诊断:" prop="name">
             <el-autocomplete
               style="width:100%;"
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="过敏史及特殊病史: " prop="name">
+          <el-form-item label="过敏病史: " prop="name">
             <el-autocomplete
               style="width:100%;"
               class="inline-input"
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
-                <div style="margin-bottom:5px;">
+                <div style="margin-bottom:5px;display:flex;">
                   <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
-                  <el-select style="margin-right:5px;width:100px;" v-model="value" placeholder="" @change="changeKind">
+                  <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
                     <el-option
                       label="全部"
                       value="0">
                     </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
+                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableData"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                   </el-table-column>
                 </el-table>
                       </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;"
+                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{}}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">33</template>
                   </el-table-column>
-                  <el-table-column align="center" label="库存" width="60">
+                  <el-table-column label="库存" width="60">
                     <template slot-scope="scope">22</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">12</template>
                   </el-table-column>
                 </el-table>
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="项目列表" name="1">
-                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;"
+                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableDataTwo"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
+                  <el-table-column label="规格" width="60">
                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
+                  <el-table-column label="单价" width="40">
                     <template slot-scope="scope">{{ scope.row.price }}</template>
                   </el-table-column>
                 </el-table>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
-                <el-table :data="tabPrjectTeam" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                <el-table :data="tabPrjectTeam"  border style="width: 100%;flex:1;overflow-y: auto;" :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row
                           @select='selectTeam'>
-                  <el-table-column align="center" type="selection" width="40"></el-table-column>
-                  <el-table-column align="center" prop="name" label="名称">
+                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{scope.row.project_team}}</template>
                   </el-table-column>
                 </el-table>
   }
   .preTabs {
     height: 100%;
+    display: flex;
+    flex-direction: column;
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
   }
 
   .costBox {
     color: #fff;
   }
 
+  }
+  .rightTabs{
+    display: flex;
+    flex-direction: column;
   }
   .comfirmBox {
     width: 100%;
 
   }
   .preTabs {
-
-  .el-tabs__content {
-
-  }
-
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
   }
   .rightTabs {
     height: 100%;
-
-
-  .el-tabs__content {
-
-  }
-
+    .el-tabs__content{
+      flex:1;
+      overflow-y: auto;
+    }
+    .el-tab-pane{
+      display: flex;
+      flex-direction: column;
+    }
   }
   #tab-more {
 

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

 
 
       // },
-      open(index) {
-        console.log("index",index)
-        if (index == 1) {
+      createCaseHistory() {
+        console.log("触发了吗")
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
               this.$message.success("保存成功")
             }
           })
-        } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
-        } else if (index == 3) {
-          this.$refs.medicalRecord.show()
-        } else if (index == 4) {
-          this.$refs.saveRecordTemplate.show(this.case_history)
-        }
+       
 
       },
       getMsgFormSon(data){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input  v-model="scope.row.single_dose"></el-input>
-          <div> {{scope.row.min_unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" style="width:60%;"></el-input>
+            <div>{{scope.row.min_unit}}</div>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="100" label="用法">
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
           <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
             <el-option
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
             <div> {{scope.row.min_unit}}</div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="50" label="单价">
+      <el-table-column align="center" prop="retail_price" width="60" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
+          <el-input v-model="scope.row.remark" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
 
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="selection" width="40"></el-table-column>
-      <el-table-column align="center" type="index" width="40" label="序号">
-         <template slot-scope="scope">
-            {{scope.$index + 1}}
-         </template>
-      </el-table-column>
-      <el-table-column align="center" prop="project_name" width="50" label="名称">
+      <!-- <el-table-column align="center" type="index" width="40" label="序号"></el-table-column> -->
+      <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
           {{getGroup(scope.row.statistical_classification)}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
         </template>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                     highlight-current-row
                     ref="tab"
           >
-            <el-table-column align="center" prop="name" label="患者姓名">
+            <el-table-column prop="name" label="姓名">
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="90">
+            <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
             </el-table-column>
           </el-table>
             this.$message.error("请先选择病人")
             return
           }
-          if(this.case_history.is_infect == true){
-            this.case_history.is_infect = 1
-          }
-          if(this.case_history.is_infect == false){
-             this.case_history.is_infect = 2
-          }
-          let params = {
-            "his_patient_id":this.hisPatientInfo.id,
-            "delivery_way":this.delivery_way?"":0,
-            "patient_id":this.patientInfo.id,
-            "temperature":this.case_history.temperature,
-            "blood_sugar":this.case_history.blood_sugar,
-            "pulse":this.case_history.pulse,
-            "sbp":this.case_history.sbp,
-            "dbp":this.case_history.dbp,
-            "blood_fat":this.case_history.blood_fat,
-            "height":this.case_history.height,
-            "sick_type":this.case_history.sick_type,
-            "symptom":this.case_history.symptom,
-            "sick_date":this.start_time,
-            "is_infect":this.case_history.is_infect,
-            "chief_conplaint":this.case_history.chief_conplaint,
-            "history_of_present_illness":this.case_history.history_of_present_illness,
-            "past_history":this.case_history.past_history,
-            "personal_history":this.case_history.personal_history,
-            "family_history":this.case_history.family_history,
-            "record_date":this.record_date,
-            "diagnostic":this.case_history.diagnostic,
-            "breathing":this.case_history.breathing,
-            "doctor_advice":this.doctor_advice,
-            "remark":this.remark
-          }
-
-          createCaseHistory(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error("患者病历已存在")
-              return false
-            } else {
-              this.$message.success("保存成功")
-            }
-          })
+          this.$refs.child.createCaseHistory()
+          // if(this.case_history.is_infect == true){
+          //   this.case_history.is_infect = 1
+          // }
+          // if(this.case_history.is_infect == false){
+          //    this.case_history.is_infect = 2
+          // }
+          // let params = {
+          //   "his_patient_id":this.hisPatientInfo.id,
+          //   "delivery_way":this.delivery_way?"":0,
+          //   "patient_id":this.patientInfo.id,
+          //   "temperature":this.case_history.temperature,
+          //   "blood_sugar":this.case_history.blood_sugar,
+          //   "pulse":this.case_history.pulse,
+          //   "sbp":this.case_history.sbp,
+          //   "dbp":this.case_history.dbp,
+          //   "blood_fat":this.case_history.blood_fat,
+          //   "height":this.case_history.height,
+          //   "sick_type":this.case_history.sick_type,
+          //   "symptom":this.case_history.symptom,
+          //   "sick_date":this.start_time,
+          //   "is_infect":this.case_history.is_infect,
+          //   "chief_conplaint":this.case_history.chief_conplaint,
+          //   "history_of_present_illness":this.case_history.history_of_present_illness,
+          //   "past_history":this.case_history.past_history,
+          //   "personal_history":this.case_history.personal_history,
+          //   "family_history":this.case_history.family_history,
+          //   "record_date":this.record_date,
+          //   "diagnostic":this.case_history.diagnostic,
+          //   "breathing":this.case_history.breathing,
+          //   // "doctor_advice":this.doctor_advice,
+          //   // "remark":this.remark
+          //   "doctor_advice":this.$ref.doctor_advice,
+          //   // "remark":this.remark
+          // }
+          // console.log("params",params)
+          // return
+          // createCaseHistory(params).then(response => {
+          //   if (response.data.state == 0) {
+          //     this.$message.error("患者病历已存在")
+          //     return false
+          //   } else {
+          //     this.$message.success("保存成功")
+          //   }
+          // })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
         } else if (index == 3) {

src/xt_pages/outpatientRegistration/index.vue

             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" :model="form" label-width="100px">
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
                     <el-form-item label="挂号类型："  prop="register">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
             },
 
             rules: {
-              idCard: [{ required: true, message: '请填写身份证', trigger: 'blur'  }],
+              idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
            })   
         },
         saveHisPatient(formName){   
+           if(this.form.idCard == ""){
+             this.$message.error("证件号码不能为空")
+           }
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){

src/xt_pages/outpatientRegistration/registrationHistory.vue

                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)" >退号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
                     </template>