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

src/store/modules/globalConfig.js

         sodium: 1,
         calcium: 1,
         bicarbonate: 1
-      }
+      },
       // 15: { id: 15, name: 'HD前置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 16: { id: 16, name: 'HD后置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 17: { id: 17, name: 'HDF前置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 18: { id: 18, name: 'HDF后置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 }
-
+      19: {
+        id: 19,
+        name: 'UF',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      }
     },
     anticoagulants_confit: { // 抗凝剂
       1: {

src/xt_pages/dialysis/components/consumables.vue

         </div>
       </div>
       <div>
-        <!-- <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button> -->
+        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
         <el-table-column
           align="center"
           prop="name"
-          v-for="item,index in good_types"
+          v-for="(item,index) in good_types"
           :key="index"
           :label="item"
         >
 
         good_types: [],
         arrKey:[],
+        arrList:[],
 
       }
     },
           arrlist.push(desc)
           return desc
         }
-       console.log("arrlist---------",arrlist)
         return ""
        
         // else if (good_user != null && good_user.length <= 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-
+           
             this.list = []
             this.good_types = []
             this.allGoodInfo = []
             for (let a = 0; a <  res.data.good_type.length; a++){
               Object.keys(res.data.good_type[a]).map(item => {
                 if(item == 'type_name'){
-                  arr.push(item)
+                  arr.push('name')
                 }
               })
               this.good_types.push(res.data.good_type[a].type_name)
             }
+
             this.arrKey.push(...arr)
           
             this.allGoodInfo = res.data.dialysis_goods
 
                 }
                 arr.push(obj)
-
-
               }
 
 
             }
 
 
-            for (let a = 0; a <  this.list.length; a++){
+           for (let a = 0; a <  this.list.length; a++){
               for (let b = 0; b <  this.list[a].good_type.length; b++){
 
                 if(this.list[a].good_type[b].id > 0){
 
               }
             }
-
+           
+          //  console.log("99999999",this.list)
+           let a = [] 
+          this.list.map(item => {
+            a.push(item.good_type)
+          })
+          // console.log('aaaaaaaaa',a)
+          let b = []
+       
+          a.map(item => {
+            let obj = []
+            item.map((it,index) => {
+              let i = 0
+              let c = {}
+              let str = 'name' + index
+              c[str] = it.name
+              obj.push(c)
+              
+            })
+            
+            b.push(obj)
+          })
+          var temp = []
+          // console.log('bbbbbbbbbb',b)
+          for(let i=0;i<b.length;i++){
+            var objC = {...b[i]}
+            temp.push(objC)
           }
-
-         console.log("list222222",this.list)
-
-        })
-
-
-
-
-
-
-
-
+       
+          // console.log("temp--------",temp)
+          var tempTwo = []
+          temp.map(item => {
+            let obj = []
+            Object.values(item).map(it => {
+              obj.push(it)
+            })
+            let obj2 = {}
+            obj.map((i,ind) => {
+            
+              let str = 'name' + ind
+              obj2[str] = i[str]
+            })
+            tempTwo.push(obj2)
+            console.log(325556574342354234234,tempTwo)
+          })
+          
+          this.arrList.push(...tempTwo)
+          console.log("cccccccc",this.arrList)
+          }
+        })  
       },
       selectSchedulType(scheduleType) {
         this.schedulType = scheduleType
 
        exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = this.good_types
-         const filterVal = this.arrKey
+         
         
-         const data = this.formatJson(filterVal, this.list)
+       
+         var arrTwo = []
+         for(let i=0;i<this.arrKey.length;i++){
+            arrTwo.push('name'+i)
+         }
+         console.log("arrKey88888",arrTwo)
+
+        //  console.log("9999999",this.list)
+         const tHeader = this.good_types
+         const filterVal = arrTwo
+         console.log("thedad",tHeader)
+         console.log("filterval",filterVal)
+         console.log("33333",this.arrList)
+         const data = this.formatJson(filterVal,this.arrList)
+         console.log("data",data)
+      
          excel.export_json_to_excel({
            header: tHeader,
            data,
           this.downloadLoading = false
         })
        },
-       formatJson(filterVal, jsonData) {
+      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
 

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
+
             <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
             </el-form-item>
+
             <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23' :label="'首剂(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
+        console.log("val-----",val)
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
           this.anticoagulant.weichi_unit = 'mg/h'
           this.anticoagulant.zongliang_unit = 'mg'
         }
+
+       if (this.$store.getters.xt_user.template_info.template_id == 27 && val == 4) {
+          this.anticoagulant.shouji_unit = 'ml'
+          this.anticoagulant.weichi_unit = 'ml'
+          this.anticoagulant.zongliang_unit = 'ml'
+        }
       },
       handleCommit: function() {
         if (this.dialysisPrescription.anticoagulant == '低分子肝素') {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50">
                         置换量<br />(ml)
                       </td>
+                      <td width="200" v-if="org_id == 9919">ktv</td>
                       <td width="200">病情变化及处理</td>
-
+                     
                       <!-- <td width="100">时间</td>
                   <td width="30">T<br>C°</td>
                   <td width="30">P<br/>次/分</td>
                       <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))" style="width:50px">
                         {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
                       </td>
+                      <td width="200" v-if="org_id == 9919">{{monitor.ktv}}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                       <td></td>
                       <td></td>
                       <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50"></td>
+                      <td v-if="org_id == 9919"></td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="height:40px;line-height:20px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
-      }
+      },
+      org_id:0,
     }
   },
   methods: {
       'hemodialysis',
       'vascular_access_desc'
     )
-
+     this.org_id = this.$store.getters.xt_user.org.id
+     console.log("=====",this.org_id)
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

             </td>
             <td width="30">岁</td>
 
-            
+
             <td width="50">门诊号:</td>
             <td width="150">
               <div class="under-line">
                       </div>
                     </td>
 
-                    
+
                     <td></td>
                   </tr>
                 </tbody>
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
                     </td>
-                    <td width="10">mg,</td>
+                    <td width="10">ml,</td>
                     <td width="60">追加量</td>
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
                     </td>
-                    <td width="10">mg/h</td>
+                    <td width="10">ml</td>
                     <td width="10">）</td>
                     <td width="100">
                         <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
             <td width="60" style="height:20px;line-height:20px">电导度<br />mS/cm</td>
             <td width="60" style="height:20px;line-height:20px">血流量<br />ml/分</td>
             <td width="40" style="height:20px;line-height:20px">液温<br />℃</td>
+            <td width="60" style="height:20px;line-height:20px">置换量<br />L</td>
             <td width="">特殊记录</td>
           </tr>
 
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+            <td>{{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}</td>
             <td style="text-align:left;padding-left:10px;">
               <div style="line-height:20px;text-align: left;display: inline-block;">
                 &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
         </tbody>
       </table>
       <div style="page-break-after: always;"></div>
-      
-      
 
-      
+
+
+
     </div>
     <div id='new-dialysis-2' class="dialysis-print-order">
       <!-- <div class="order-yy-name"></div> -->
             </td>
             <td width="20"></td>
 
-            
+
             <td></td>
           </tr>
         </tbody>
             <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
             <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
           </td>
-          
+
           <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
           <td>
             <span v-if="setAdminUserES(advice.execution_staff) == ''">
             this.dialysisOrder.DeviceNumber.number
           );
         }
-        
+
       } else {
         if(this.patientInfo.DialysisSchedule.device_zone.name.indexOf("区") > -1){
           return (
             this.patientInfo.DialysisSchedule.device_number.number
           );
         }
-        
+
       }
     },
 

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

 
       <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="用法">
       </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

     <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>
       </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"
                 <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"
                     <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>
         prescriptions: [],
         record_date: '',
         tableData: [],
-        editableTabsValue: '1',
+        editableTabsValue: '处方1',
         loadingone: false,
         editableTabs: [{
           title: '处方1',
       }
     },
     created() {
-      let tableHeight = document.body.clientHeight - 263
+      let tableHeight = document.body.clientHeight - 243
       this.tableHeight = tableHeight
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       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
     height: 100%;
     display: flex;
     flex-direction: column;
+    margin-top: 20px;
 
   .el-radio {
     margin-right: 5px;
     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;
   }
   .addTab {
     position: absolute;
-    right: 0;
-    top: 6px;
+    right: 6px;
+    top: 3px;
     z-index: 20;
   }
 
     display: flex;
     flex-direction: column;
     position: relative;
-    height: 100%;
+  }
+  .preTabs{
+    height:100%;
+    display: flex;
+    flex-direction: column;
+    .el-tab-pane{
+      height:auto !important;
+    }
   }
 
   .settlementTabs {
   }
   .centerRight {
     width: 300px;
-    margin-left: 5px;
+    margin-left: 10px;
     display: flex;
     flex-direction: column;
     overflow-y: auto;
 
   .centerRightTitle {
     color: #409EFF;
-    padding-top: 10px;;
   }
 
   .basicUl {
   }
 
   }
+  .preTabs{
+    .el-tabs__content{
+      flex: 1;
+      overflow-y: auto;
+      padding: 5px 0 5px 5px;
+    }
+  }
 </style>
 

src/xt_pages/outpatientCharges/summary.vue

         </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

             <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>
 
                           <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>
 
                           </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}}
 .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

 <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>
     <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')"
               </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
             </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"
               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">
 
 
         </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>
           <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>
                           </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">
                         </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>
                 <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'}"
                   </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
                 </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>
     },
     data() {
       return {
+        multipleTableHeight:'',
         register_type: '',
         value: '0',
         form: {
         })
 
       },
+      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) {
       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>
 
     height: 100%;
     display: flex;
     flex-direction: column;
+    margin-top: 2px;
 
   .el-radio {
     margin-right: 5px;
     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;
   }
     display: flex;
     align-items: center;
     justify-content: space-between;
+    z-index: 99;
   }
   .borderCard{
     height: 100%;
   }
 
   }
+  ::-webkit-scrollbar{
+    height:15px;
+  }
 </style>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

 <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>
         <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>
     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
       }
     }
   }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

 <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>
 
         </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>
 
       <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

           <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

             <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>
            if(response.data.state == 1){
              this.centerDialogVisible = true
              var list = response.data.data.list
-             // console.log("list9999999",list)
+             console.log("list9999999",list)
              this.tableData = list
            }
         })
 
   }
   .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

         <el-table-column align="center" prop="name" label="姓名" width="100">
           <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>
         <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

                         <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>
 
                     </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')"
         width: 33%;
     }
     .specialFormItem{
-        width:67%;
+        width:66.5%;
         .el-input{
             min-width: 150px;
         }

src/xt_pages/outpatientRegistration/registrationHistory.vue

             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete
-                  style="margin:16px 5px"
                   popper-class="my-autocomplete"
                   v-model.trim="search_input"
                   :fetch-suggestions="querySearchAsync"
                         <span v-if="scope.row.register_type == 5">专家</span>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="就诊号" width="80">
+                <el-table-column align="center" prop="name" label="就诊号" width="140">
                     <template slot-scope="scope">
                         {{scope.row.number}}
                     </template>
                 </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 == 2" :disabled="true">已退号</el-button>
+                        <el-button size="mini" type="info" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
+                        <el-button size="mini" type="info" 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>
                 </el-table-column>

src/xt_pages/stock/selfPreparedMedicine/query.vue

          for(let i=0;i<this.tableData.length;i++){
             this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
          }
+         console.log("表哥------",this.tableData)
          const data = this.formatJson(filterVal, this.tableData)
+         console.log("data",data)
+         return
          excel.export_json_to_excel({
            header: tHeader,
            data,