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

src/api/advice.js

@@ -15,7 +15,7 @@ export function getAllAdviceConfig() {
 }
 
 export function CreateDoctorAdvice(id, advice, mode) {
-  
+
   return request({
     url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
     method: "post",
@@ -190,7 +190,7 @@ export function CreateAdviceTemplate(data) {
 }
 
 export function UpdateAdviceTemplate(id, data,drug_id) {
-  
+
   return request({
     url: "/api/advicetemplate/update?id=" + id+"&drug_id="+drug_id,
     method: "put",
@@ -289,7 +289,7 @@ export function DeleteParentAdviceTemplate(id) {
 }
 
 export function CreateSubAdvice(params) {
-  
+
   return request({
     url: "/api/subadvice/create",
     method: "post",
@@ -502,3 +502,7 @@ export function getSchedualDoctors (params) {
     params: params
   })
 }
+
+
+
+

src/api/his/his.js

@@ -181,6 +181,91 @@ export function getExportConsumeDetailList(params) {
 
 
 
+export function CreateHisSingleAdviceTemplate(params) {
+  return request({
+    url: "/api/hisadvicetemplate/add",
+    method: "post",
+    params:params
+  });
+}
+
+
+
+
+
+export function DeleteHisAdviceTemplate(id, template_id, parent_id) {
+  return request({
+    url:
+      "/api/hisadvicetemplate/delete?id=" +
+      id +
+      "&template_id=" +
+      template_id +
+      "&parent_id=" +
+      parent_id,
+    method: "delete"
+  });
+}
+
+
+export function postHisAdviceTemplate(params, name, advice_type) {
+  return request({
+    url:
+      "/api/hisadvicetemplate/create?template_name=" +
+      name +
+      "&advice_type=" +
+      advice_type,
+    method: "post",
+    data: params
+  });
+}
+
+
+
+
+export function updateHisTemplateName(params) {
+  return request({
+    url: "/api/histemplate/modify",
+    method: "post",
+    params:params
+  });
+}
+
+
+export function UpdateHisAdviceTemplate(params) {
+  return request({
+    url: "/api/hisadvicetemplate/update",
+    method: "put",
+    params:params
+  });
+}
+
+
+export function DeleteHisParentAdviceTemplate(id) {
+  return request({
+    url: "/api/hisadviceparenttemplate/delete?template_id=" + id,
+    method: "delete",
+  });
+}
+
+
+export function getAllHisAdviceTemplate () {
+  return request({
+    url: '/api/getallhisadvicetemplate',
+    method: 'get',
+  })
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/lang/zh.js

@@ -196,7 +196,7 @@ export default {
     upload_config: '质控上报配置',
     quality_control: '质控上报',
     remind_print: '排版提醒打印',
-    system_prescription: '处方模版',
+    system_prescription: '透析方案模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
 
@@ -231,7 +231,9 @@ export default {
     templateManagement:'模板管理',
     drugStockUserDetail:"出库人明细",
     DepartManage:"部门管理",
-    basicConfig:'基础配置'
+    basicConfig:'基础配置',
+
+    histemplate:'处方模版',
 
   },
   navbar: {

src/router/modules/templateManagement.js

@@ -27,7 +27,7 @@ export default {
         meta: {
           title: 'template',
           noCache: true,
-    
+
         }
     },
     {
@@ -38,6 +38,14 @@ export default {
           title: 'system_prescription'
         }
     },
-    
+    {
+      path: '/data/histemplate',
+      component: () => import('@/xt_pages/data/hisTemplate'),
+      name: 'histemplate',
+      meta: {
+        title: 'histemplate'
+      }
+    },
+
   ]
 }

src/xt_pages/data/druguseTemplate.vue

@@ -547,7 +547,7 @@
                   <el-col :span="15">
 
                     <el-form-item label="药品规格 :" prop="advice_desc">
-                      <el-col :span="8">                     
+                      <el-col :span="8">
                          <el-autocomplete
                          style="width:100px;"
                          class="inline-input"
@@ -1627,7 +1627,7 @@
       },
       onRowClick(row, event, column) {
         this.table_current_index = row.index
-      }, 
+      },
       modifyRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
@@ -1657,7 +1657,7 @@
           this.templateTableVisible = false
         }).catch(() => {
         })
-      }, 
+      },
 
       //添加医嘱模版
       submitTableTemplate(formName) {
@@ -1669,10 +1669,10 @@
         const params = {
           'data': this.adviceTableData
         }
-      
+
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
-     
+
         postAdviceTemplate(params, name, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
@@ -1807,7 +1807,7 @@
 
       },
       submitTemplate(formName) {
- 
+
         if(this.src_type == ""){
             this.templateForm.way = 0
             this.templateForm.drug_id = 0
@@ -1818,7 +1818,7 @@
             this.templateForm.advice_name = arr[0]
         }
         console.log("2222",this.templateForm)
-       
+
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)
           this.templateForm.prescribing_number = parseFloat(this.templateForm.prescribing_number)
@@ -1829,7 +1829,7 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
-          
+
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -1948,7 +1948,7 @@
                     this.adviceTableData[i].weekdays = templateFormTwo.weekdays
                     this.adviceTableData[i].drug_id =  templateFormTwo.drug_id
                     this.adviceTableData[i].way   = templateFormTwo.way
-                    
+
                   }
                 }
               } else {
@@ -2147,7 +2147,7 @@
                 object['template_id'] = response.data.data.advice_templates[i].id
                 this.adviceTemplates.push(object)
               }
-              
+
               // 非空模版的处理
               for (let y = 0; y < response.data.data.advice_templates[i].DoctorAdviceTemplate.length; y++) {
                 if (response.data.data.advice_templates[i].id == response.data.data.advice_templates[i].DoctorAdviceTemplate[y].template_id) {
@@ -2177,21 +2177,21 @@
       }, cancelEditHandle() {
         // this.templateTableVisible = true
         this.templateEditFormVisible = false
-      }, 
-      
+      },
+
       //编辑医嘱
       submitEditTemplate(formName) {
-        
+
          var drug_id = 0
          for(let i=0;i<this.all_drug.length;i++){
            if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
               drug_id = this.all_drug[i].id
            }
-         } 
+         }
         this.templateFormEdit.drug_id = drug_id
-       
+
         console.log("编辑子药",this.templateFormEdit)
-       
+
         this.$refs[formName].validate(valid => {
 
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
@@ -2221,7 +2221,7 @@
                 return s && s.trim()
               }).join(',')
             }
-           
+
             UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit,this.templateFormEdit.drug_id).then(
               response => {
                 if (response.data.state == 0) {
@@ -2253,7 +2253,7 @@
             )
           }
         })
-      }, 
+      },
       drugDesc(row) {
         if (row.isNoSub == 2) {
           if (row.drug_spec.length <= 0) {
@@ -2339,13 +2339,13 @@
         this.table_current_index_two = row.index
       }, cancelHandleTwo() {
         this.templateFormTwoVisible = false
-      }, 
+      },
       submitTemplateTwo(formName) {
-        
+
         this.templateForm['template_id'] = this.current_template_id
         this.templateForm['advice_type'] = this.form.advice_type
-       
-      
+
+
         if (this.templateForm.frequency_type == 1) {
           this.templateForm.day_count = 0
           this.templateForm.week_days = ''
@@ -2359,7 +2359,7 @@
           }).join(',')
         }
         console.log("编辑模板",this.templateForm)
-        
+
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
@@ -2391,7 +2391,7 @@
         this.adviceTableDataTwo = []
       }, cancelEditHandleTwo() {
         this.templateEditFormTwoVisible = false
-      }, 
+      },
       submitEditTemplateTwo(formName) {
         this.$refs[formName].validate(valid => {
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
@@ -2512,7 +2512,7 @@
           this.editDialogTitle = '编辑医嘱'
           this.edit_advice_name = '医嘱内容'
         }
-      }, 
+      },
       openDelete(index, row) {
         this.hoverOrderArr = []
 
@@ -2689,14 +2689,14 @@
             this.adviceTableDataTwo.push(this.adviceTemplates[i])
           }
         }
-      }, 
+      },
       modifyTemplateName() {
         const params = {
           template_name: this.form.name,
           template_id: this.current_template_id
         }
         console.log("params---",params)
-       
+
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2825,9 +2825,9 @@
                 obj.id = base_drug_list[i].id
                 this.all_drug.push(obj)
               }
-            }   
+            }
         })
-       
+
     },
 
 
@@ -2871,7 +2871,6 @@
             }
         }
       },
-
       changeDrugDescTwo(name) {
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
@@ -2887,7 +2886,7 @@
           }
         }
       },
-      
+
 
      querySearch(queryString, cb) {
         console.log('queryString',queryString)

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -9,12 +9,8 @@
 
       <el-table-column align="center" prop="name" width="90" label="单次用量">
         <template slot-scope="scope">
-          <div style="display:flex;align-items:center;">
             <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-            <div> {{scope.row.single_dose}}</div>
-
-            <div> {{scope.row.single_dose_unit}}</div>
-          </div>
+            <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="用法">
@@ -33,19 +29,13 @@
       </el-table-column>
 
       <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">
-          {{scope.row.day}}
-        </template>
+        <template slot-scope="scope">{{scope.row.day}}</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;align-items:center;">
             <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-            <div> {{scope.row.prescribing_number}}</div>
-
-            <div>{{scope.row.prescribing_number_unit}}</div>
-          </div>
+            <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3,19 +3,19 @@
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
-    <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-        <div class="mainCell" style="justify-content: space-between;">
+        <!-- <div class="mainCell" style="justify-content: space-between;">
           <p style="color: red">未收费：<span>{{cal_one}}</span>人</p>
           <p style="color: red">已收费：<span>{{cal_two}}</span>人</p>
           <p style="color: red">已退费：<span>{{cal_three}}</span>人</p>
 
-        </div>
+        </div> -->
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
-            <el-radio :label=1>未收费</el-radio>
-            <el-radio :label=2>已收费</el-radio>
-            <el-radio :label=3>已退费</el-radio>
+            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
+            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
+            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
             <el-radio :label=4>全部</el-radio>
 
           </el-radio-group>
@@ -43,10 +43,10 @@
       </div>
       <div class="mainRight">
 
-        <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
+        <div class="mainCell fixedCell" style="margin-bottom:10px;">
           <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
-          <el-button size="small" @click="open(3)" type="primary" style="margin-left:10px;">打印</el-button>
+          <el-button size="small" @click="open(3)" type="primary">打印</el-button>
           <el-button v-loading="loadingone" size="small"
                      @click="open(6)"
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
@@ -68,7 +68,7 @@
                 <div class="centerLeft">
                   <div class="tabsBox">
                     <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
-                    <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"
                         :key="index"
@@ -119,14 +119,14 @@
                     <li style="width:100%;">地址：{{patientInfo.home_address}}</li>
                     <li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>
                   </ul>
-                  <p class="centerRightTitle">诊断信息</p>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
                   <div style="display:flex;justify-content: space-between;line-height:30px;">
                     <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number}}</span>
                   </div>
                   <ul class="basicUl">
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
-                    <li style="width:50%;">总费用：{{ getTotal() }}</li>
+                    <li style="width:100%;">总费用：{{ getTotal() }}</li>
 
                     <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
                     <li style="width:100%;">是否有传染病：</li>
@@ -250,7 +250,7 @@
         prescriptions: [],
         record_date: '',
         tableData: [],
-        editableTabsValue: '1',
+        editableTabsValue: '处方1',
         loadingone: false,
         editableTabs: [{
           title: '处方1',
@@ -279,7 +279,7 @@
       }
     },
     created() {
-      let tableHeight = document.body.clientHeight - 263
+      let tableHeight = document.body.clientHeight - 243
       this.tableHeight = tableHeight
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
@@ -865,7 +865,7 @@
       fullHeight(val) {
         if (!this.timer) {
           this.fullHeight = val
-          let tableHeight = val - 263
+          let tableHeight = val - 243
           this.tableHeight = tableHeight
           this.timer = true
           let that = this
@@ -893,6 +893,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+    margin-top: 20px;
 
   .el-radio {
     margin-right: 5px;
@@ -904,9 +905,17 @@
     display: flex;
     align-items: center;
   }
+  .fixedCell{
+    position: fixed;
+    z-index: 99;
+    right: 42px;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+  }
 
   .mainRight {
-    margin-left: 20px;
+    margin-left: 10px;
     flex: 1;
     height: 100%;
     display: flex;
@@ -933,8 +942,8 @@
   }
   .addTab {
     position: absolute;
-    right: 0;
-    top: 6px;
+    right: 6px;
+    top: 3px;
     z-index: 20;
   }
 
@@ -959,7 +968,14 @@
     display: flex;
     flex-direction: column;
     position: relative;
-    height: 100%;
+  }
+  .preTabs{
+    height:100%;
+    display: flex;
+    flex-direction: column;
+    .el-tab-pane{
+      height:auto !important;
+    }
   }
 
   .settlementTabs {
@@ -976,7 +992,7 @@
   }
   .centerRight {
     width: 300px;
-    margin-left: 5px;
+    margin-left: 10px;
     display: flex;
     flex-direction: column;
     overflow-y: auto;
@@ -990,7 +1006,6 @@
 
   .centerRightTitle {
     color: #409EFF;
-    padding-top: 10px;;
   }
 
   .basicUl {
@@ -1028,5 +1043,12 @@
   }
 
   }
+  .preTabs{
+    .el-tabs__content{
+      flex: 1;
+      overflow-y: auto;
+      padding: 5px 0 5px 5px;
+    }
+  }
 </style>
 

src/xt_pages/outpatientCharges/summary.vue

@@ -41,7 +41,7 @@
         </div>
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
-      <el-table :data="tableData" border height="500" style="width: 100%;" :row-style="{ color: '#303133' }"
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
         <el-table-column
           prop="date"

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -7,7 +7,7 @@
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                      <el-table  :data="tableData" border style="width: 99%;"
+                      <el-table  :data="tableData" border style="width: 100%;"
                                 :row-style="{ color: '#303133' }"
                                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
 
@@ -15,7 +15,7 @@
                           <template slot-scope="scope">{{ scope.row.name }}</template>
                         </el-table-column>
 
-                        <el-table-column align="center" prop="project_name" label="分类">
+                        <el-table-column align="center" prop="project_name" label="分类" width="100">
                           <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
                         </el-table-column>
 
@@ -26,50 +26,36 @@
                           </template>
                         </el-table-column>
                         <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
-                            {{scope.row.single_dose}}{{scope.row.single_dose_unit}}
-                          </template>
+                          <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+                        <el-table-column align="center" prop="delivery_way" width="90" label="用法">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
                             {{scope.row.delivery_way}}
 
                           </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
-                            {{scope.row.execution_frequency}}
-
-                          </template>
+                        <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
+                          <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="number_days" width="50" label="天数">
+                        <el-table-column align="center" prop="number_days" width="60" label="天数">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
                             {{scope.row.day}}
 
                           </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="total" width="50" label="总量">
-                          <template slot-scope="scope">
-                            <div style="display:flex;">
-                              <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-                              {{scope.row.count}}
-                              <div>{{scope.row.prescribing_number_unit}}</div>
-
-                            </div>
-                          </template>
+                        <el-table-column align="center" prop="total" width="60" label="总量">
+                          <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" width="50" label="单价">
+                        <el-table-column align="center" prop="name" width="60" label="单价">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
                             {{scope.row.price}}
 
                           </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" width="50" label="备注">
+                        <el-table-column align="center" prop="name" width="80" label="备注">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
                             {{scope.row.remark}}
@@ -398,7 +384,6 @@ export default {
 .summaryDetail{
     .el-table th .cell, .el-table td .cell{
         padding: 0 2px;
-        white-space: pre-line;
     }
     .el-icon-delete{
         color:red;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: calc(100% - 54px);display: flex;flex-direction: column;margin-top: 54px;">
+  <div style="height: calc(100% - 56px);display: flex;flex-direction: column;margin-top: 56px;">
     <!-- <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -12,16 +12,16 @@
     <div class="mainCenter">
       <div class="centerLeft">
         <el-form :model="form" ref="form" label-width="80px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-          <el-form-item label="姓名:" prop="name">
+          <el-form-item label="姓名:" prop="name" label-position="right">
             <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
           </el-form-item>
-          <el-form-item label="证件号: " prop="name">
+          <el-form-item label="证件号: " prop="name" label-position="right">
             <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-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','register_type')"
@@ -31,7 +31,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="疾病类型:" prop="name">
+          <el-form-item label="疾病类型:" prop="name" label-position="right">
 
             <el-select style="width:100%;" v-model="state1" placeholder="">
               <el-option
@@ -43,7 +43,7 @@
             </el-select>
 
           </el-form-item>
-          <el-form-item label="过敏病史: " prop="name">
+          <el-form-item label="过敏病史: " prop="name" label-position="right">
             <el-autocomplete
               style="width:100%;"
               class="inline-input"
@@ -52,6 +52,9 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
+          <el-form-item label="过敏病史: " prop="name" style="visibility: hidden;">
+            <el-input placeholder="" readonly></el-input>
+          </el-form-item>
         </el-form>
         <div class="tabsBox">
 
@@ -75,29 +78,31 @@
 
         </div>
         <div class="costBox">
-          <span>医生：</span>
-          <el-select style="margin-right:5px;width:140px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
-            <el-option
-              v-for="(item,index) in doctors"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </el-option>
-          </el-select>
-          <span>科室：</span>
-          <el-select style="margin-right:5px;width:140px;" v-model="departmentValue" placeholder="">
-            <el-option
-              v-for="(item,index) in department"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-          <span>当前处方总价：</span>
-          <span style="color:red;">{{getTotalOne()?getTotalOne():''}}</span>元
-          <span style="margin-left:10px;">总价：</span>
-          <span style="color:red;">{{ getTotal()?getTotal():''}}</span>元
-          <span>{{order_status}}</span>
+          <div>
+            <span>医生：</span>
+            <el-select style="margin-right:5px;width:140px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
+              <el-option
+                v-for="(item,index) in doctors"
+                :key="index"
+                :label="item.user_name"
+                :value="item.admin_user_id">
+              </el-option>
+            </el-select>
+            <span>科室：</span>
+            <el-select style="margin-right:5px;width:140px;" v-model="departmentValue" placeholder="">
+              <el-option
+                v-for="(item,index) in department"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            <span>当前处方总价：</span>
+            <span style="color:red;">{{getTotalOne()?getTotalOne():''}}</span>元
+            <span style="margin-left:10px;">总价：</span>
+            <span style="color:red;">{{ getTotal()?getTotal():''}}</span>元
+          </div>
+          <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
 
         </div>
       </div>
@@ -106,7 +111,7 @@
           <p :class="rightTab == 1 ? 'activeP' : ''" @click="clickTab(1)">药品</p>
           <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
         </div> -->
-        <el-tabs class="borderCard" type="border-card" v-model="rightTab" @tab-click="clickTab">
+        <el-tabs class="borderCard" type="border-card" v-model="rightTab" @tab-click="clickTab" :before-leave='beforeLeave'>
               <el-tab-pane label="药品" :name="1">
 
               </el-tab-pane>
@@ -132,14 +137,14 @@
                           </el-option>
                         </el-select>
                       </div>
-                      <div style="width: 100%;flex:1;overflow-y: auto;">
-                        <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs'
+                      <div style="width: 100%;flex:1;overflow: hidden;" ref="rightTable">
+                        <el-table ref="multipleTable" :height="multipleTableHeight != '' ? multipleTableHeight : '200'" :data="drugs" border @select='selectDrugs'
                                   :row-style="{ color: '#303133' }"
                                   @select-all="changeAllGoodInfoTableData"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                   highlight-current-row>
                           <el-table-column type="selection" width="40" align="center"></el-table-column>
-                          <el-table-column prop="name" label="名称">
+                          <el-table-column label="名称">
                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                           </el-table-column>
                           <el-table-column label="规格" width="60">
@@ -173,7 +178,7 @@
                         </el-select>
                       </div>
                       <div style="width: 100%;flex:1;overflow-y: auto;">
-                        <el-table ref="multipleTableTwo" :data="advices_template" border
+                        <el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'" :data="advices_template" border
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                   highlight-current-row>
@@ -199,7 +204,7 @@
                 <el-tabs class="rightTabs" v-model="activeName">
                   <el-tab-pane label="项目列表" name="1">
                     <div style="width: 100%;flex:1;overflow-y: auto;">
-                      <el-table ref="tables" :data="tabProject" border @select='selectChange'
+                      <el-table ref="tables" :height="multipleTableHeight != '' ? multipleTableHeight : '200'" :data="tabProject" border @select='selectChange'
                                 :row-style="{ color: '#303133' }"
                                 @select-all="changeAllGoodInfoTableDataTwo"
                                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -219,7 +224,7 @@
                   </el-tab-pane>
                   <el-tab-pane label="项目组套" name="2">
                     <div style="width: 100%;flex:1;overflow-y: auto;">
-                      <el-table :data="tabPrjectTeam" border
+                      <el-table :data="tabPrjectTeam" border :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
                                 :row-style="{ color: '#303133' }"
                                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                 highlight-current-row
@@ -255,7 +260,7 @@
                 </el-option>
               </el-select>
             </div> -->
-            <el-button type="primary" size="small" style="width:100%;" @click="comfirm">确定添加</el-button>
+            <el-button type="primary" style="width:100%;" @click="comfirm">确定添加</el-button>
           </div>
         </template>
       </div>
@@ -312,6 +317,7 @@
     },
     data() {
       return {
+        multipleTableHeight:'',
         register_type: '',
         value: '0',
         form: {
@@ -886,6 +892,19 @@
         })
 
       },
+      beforeLeave(activeName, oldActiveName){
+        let index = activeName
+        if (index == 1) {
+          if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
+            return false
+          }
+        } else {
+          if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+            return false
+          }
+
+        }
+      },
       clickTab(tab) {
         let index = parseInt(tab.name)
         if (index == 1) {
@@ -1150,9 +1169,26 @@
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
-
-
+      this.$nextTick(() => {
+        this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
+      })
+      
     },
+    watch: {
+      fullHeight (val) {
+        if(!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 263
+          this.tableHeight = tableHeight
+          this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
+          this.timer = true
+          let that = this
+          setTimeout(function (){
+            that.timer = false
+          },400)
+        }
+      }
+    }
   }
 </script>
 
@@ -1178,6 +1214,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+    margin-top: 2px;
 
   .el-radio {
     margin-right: 5px;
@@ -1263,11 +1300,15 @@
     bottom: 0;
     display: flex;
     align-items: center;
+    justify-content: space-between;
+  }
+  .statusRed{
+    color:red;
   }
 
   .addTab {
     position: absolute;
-    right: 3px;
+    right: 8px;
     top: 3px;
     z-index: 20;
   }
@@ -1320,6 +1361,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    z-index: 99;
   }
   .borderCard{
     height: 100%;
@@ -1427,4 +1469,7 @@
   }
 
   }
+  ::-webkit-scrollbar{
+    height:15px;
+  }
 </style>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="deskRecord" style="margin-top:54px;">
+  <div class="deskRecord" style="margin-top:56px;">
     <!-- <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -14,8 +14,7 @@
         <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <div v-if="patientInfo.gender == 1">男</div>
-        <div v-if="patientInfo.gender == 2">女</div>
+        <el-input v-model="patientInfo.gender" placeholder="" readonly></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
         <el-input v-model="patientInfo.age" placeholder="" readonly></el-input>
@@ -151,7 +150,7 @@
         </el-input>
       </el-form-item>
     </el-form>
-   
+
   </div>
 </template>
 
@@ -258,7 +257,7 @@
             "doctor_advice":this.doctor_advice,
             "remark":this.remark
           }
-        
+
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
@@ -271,25 +270,25 @@
               this.remark = ""
             }
           })
-       
+
 
       },
-    
+
 
       getTemplateDetail(id){
           console.log("22222")
           getTemplateDetail(id).then(response=>{
-              if(response.data.state == 1){  
+              if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
                 console.log("templatedetail",templatedetail)
-            
-                this.case_history.chief_conplaint =  templatedetail.chief_conplaint 
-                this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness 
-                this.case_history.past_history =  templatedetail.past_history 
-                this.case_history.personal_history =    templatedetail.personal_history 
-                this.case_history.family_history = templatedetail.family_history 
-                this.case_history.diagnostic = templatedetail.diagnostic 
-               
+
+                this.case_history.chief_conplaint =  templatedetail.chief_conplaint
+                this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness
+                this.case_history.past_history =  templatedetail.past_history
+                this.case_history.personal_history =    templatedetail.personal_history
+                this.case_history.family_history = templatedetail.family_history
+                this.case_history.diagnostic = templatedetail.diagnostic
+
               }
           })
         },
@@ -297,12 +296,29 @@
     created(){
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
        console.log("232322323",this)
-       
+       if(this.patientInfo.gender = 1){
+         this.patientInfo.gender = '男'
+       }else if(this.patientInfo.gender = 2){
+          this.patientInfo.gender = '女'
+        }
+
     },
     watch:{
       detalid:function(val){
         this.getTemplateDetail(val)
       },
+      'patientInfo.gender':{
+        handler(newName, oldName){
+          console.log('newName',newName)
+          if(newName == 1){
+            this.patientInfo.gender = '男'
+          }else if(newName == 2){
+            this.patientInfo.gender = '女'
+          }
+        },
+        immediate: true,
+        deep: true
+      },
       case_history:function(val){
         console.log("val",val)
         if(val.breathing == 0){

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -1,19 +1,18 @@
 <template>
   <div class="prescriptionTable">
-    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 100%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="name" label="名称">
         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="name" width="100" label="单次用量">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" readonly></el-input>
-          <div> {{scope.row.single_dose_unit}}</div>
+          <div>{{ scope.row.single_dose }} &nbsp;&nbsp; {{scope.row.single_dose_unit}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="用法">
+      <el-table-column align="center" prop="name" width="90" label="用法">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
           <div> {{scope.row.delivery_way}}</div>
@@ -21,7 +20,7 @@
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="频率">
+      <el-table-column align="center" prop="name" width="90" label="频率">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
           <div> {{scope.row.execution_frequency}}</div>
@@ -31,22 +30,17 @@
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <!--<el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>-->
-            <div> {{scope.row.prescribing_number}}</div>
-
-            <div>{{scope.row.prescribing_number_unit}}</div>
-          </div>
+          <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="80" label="单价">
         <template slot-scope="scope">
           <div> {{scope.row.retail_price}}</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="name" width="80" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>-->
           <div> {{scope.row.remark}}</div>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -101,10 +101,10 @@
           <el-input v-model="scope.row.number_days" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="50" label="总量">
+      <el-table-column align="center" prop="total" width="70" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <el-input v-model="scope.row.total" style="width:50" placeholder=""></el-input>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
             <div>{{scope.row.unit}}</div>
 
           </div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -45,17 +45,17 @@
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
-            <el-button size="small" ref="button_one"   @click="open(1)" type="primary">保存</el-button>
+            <el-button size="small" ref="button_one" @click="open(1)" type="primary">保存</el-button>
             <el-popover
               placement="bottom"
               width="200"
               trigger="click">
-              <el-button size="small" ref="button_two"   @click="open(2)" type="primary">处方单</el-button>
-              <el-button size="small" ref="button_six"   @click="open(6)" type="primary">治疗单</el-button>
+              <el-button size="small" ref="button_two"   @click="open(2)">处方单</el-button>
+              <el-button size="small" ref="button_six"   @click="open(6)">治疗单</el-button>
               <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
             </el-popover>
             <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
-            <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
+            <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button>
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
@@ -753,7 +753,15 @@
 
   }
   .preTabs {
-    height: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+    .el-tabs__content {
+      flex: 1;
+      overflow-y: auto;
+    }
+
   }
 
   .costBox {

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -19,9 +19,9 @@
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
         <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+          <template slot-scope="scope">{{ scope.row.patient   .name }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="处方日期" width="110">
+        <el-table-column align="center" prop="name" label="处方日期" width="200">
           <template slot-scope="scope"> {{getTimes(scope.row.info.ctime)}}</template>
 
         </el-table-column>
@@ -37,7 +37,7 @@
         <el-table-column align="center" prop="name" label="诊断">
           <template slot-scope="scope">{{ scope.row.info.diagnosis }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
+        <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
             <div v-if=" scope.row.info.id == 0">未就诊</div>
             <div v-if=" scope.row.info.id > 0">已就诊</div>

src/xt_pages/outpatientRegistration/index.vue

@@ -39,7 +39,7 @@
                         <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
 
-                    <el-form-item label="手机号码" prop="phone">
+                    <el-form-item label="手机号码：" prop="phone">
                         <el-input v-model="form.phone"></el-input>
                     </el-form-item>
 
@@ -90,7 +90,7 @@
                     </el-form-item>
 
 
-                   <el-form-item label="社保类型:">
+                   <el-form-item label="社保类型：">
                         <el-select v-model="form.social_type" placeholder="请选择">
                             <!-- <el-option
                             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
@@ -602,7 +602,7 @@ export default {
         width: 33%;
     }
     .specialFormItem{
-        width:67%;
+        width:66.5%;
         .el-input{
             min-width: 150px;
         }