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

src/router/modules/patient.js

@@ -326,17 +326,17 @@ export default {
     }
   },
 
-  // {//评估工具/跌倒评估
-  //   path: '/patients/patient/:id/Fallassessment',
-  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-  //   hidden: true,
-  //   is_menu: false,
-  //   name: 'Fallassessment',
-  //   meta: {
-  //     title: 'firstDiseasePrint',
-  //     noCache: true
-  //   }
-  // },
+  { //评估工具/跌倒评估
+    path: '/patients/patient/:id/Fallassessment',
+    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+    hidden: true,
+    is_menu: false,
+    name: 'Fallassessment',
+    meta: {
+      title: 'firstDiseasePrint',
+      noCache: true
+    }
+  },
   // {//小儿跌倒风险评估
   //   path: '/patients/patient/:id/pediatricFallAssessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),

src/xt_pages/device/airDisinfectTwo.vue

@@ -1020,7 +1020,7 @@
                     </el-form-item>
 
                     <el-form-item label="消毒科室" label-width="110px" required prop="department">
-                        <el-select v-model="form.department" placeholder="请选择">
+                        <el-select v-model="form.department" placeholder="请选择" >
                           <el-option
                           v-for="(item,index) in disinfectionOfficeList"
                           :key="index"
@@ -1539,12 +1539,12 @@
         changeStore(val){
          
           this.getNewAirDisinfectList()  
-        },  
-      AddCard(){
-        getAirDisinfectLongTime(this.storey).then(response=>{
+        }, 
+        changeStorey(val){
+          console.log("val2o2o2o",val)
+          getAirDisinfectLongTime(val).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-           
             var first_total_time = 0
             var sencond_total_time = 0
             var third_total_time = 0
@@ -1571,11 +1571,11 @@
             this.last_total_time = last_total_time
            
           }
-          this.dialogFormVisible =  true
-          
-        
          }
         })
+        }, 
+      AddCard(){
+        this.dialogFormVisible =  true
       },
       AddCardOne(){
         getAirDisinfectWayLongTime(this.form.department).then(response=>{

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1522,7 +1522,7 @@
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
-                                : ""
+                                : "0"
                             }}
                             </span>
                           </td>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -624,7 +624,7 @@
 
         <li v-if="isShow('冲洗量')">
           <label>Ns冲洗量(ml): </label>
-          <span class="content">{{this.prescription.chaptalization}}</span>
+          <span class="content">{{this.prescription.warsh_count}}</span>
         </li>
 
        

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

@@ -1116,13 +1116,13 @@
                 </el-row>
                 <el-row>
                   <el-col :span="8">
-                  <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShow('冲洗量') && dialysisPrescription.anticoagulant == 1">
+                  <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShows('冲洗量') && dialysisPrescription.anticoagulant == 1">
                     <el-input v-model="dialysisPrescription.warsh_count"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShow('冲洗时间') && dialysisPrescription.anticoagulant == 1">
+                  <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShows('冲洗时间') && dialysisPrescription.anticoagulant == 1">
                     <el-input v-model="dialysisPrescription.washing_time"></el-input>
                   </el-form-item>
                 </el-col>
@@ -4161,7 +4161,7 @@ mu
               // 长期处方不为空
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid'&& key != 'remark') {
                 this.dialysisPrescription[key] =
                   response.data.data.solution[key]
               }
@@ -4181,7 +4181,7 @@ mu
               for (const key in response.data.data.prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.prescription[key]
                 }
@@ -4191,7 +4191,7 @@ mu
               for (const key in response.data.data.system_prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.system_prescription[key]
                 }
@@ -4202,7 +4202,7 @@ mu
                 // 临时处方为空
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] = ''
                 }
               }

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

@@ -75,6 +75,21 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            align="center"
+            label="拒测血压"
+            width="110"
+            v-if="isShow('拒测血压')"
+          >
+            <template slot-scope="scope">
+              {{
+                scope.row.is_pressure
+                  ? scope.row.is_pressure
+                  : ""
+              }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="pulse_frequency"
             align="center"
@@ -1660,6 +1675,20 @@
             </el-form-item>
           </el-col>
 
+
+          <el-col :span="24" v-if="isShow('拒测血压')">
+            <el-form-item label="拒测血压：" :prop="isName('拒测血压')">
+              <el-select v-model="form.is_pressure" placeholder="请选择">
+                <el-option
+                  v-for="item in pressureList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -1676,6 +1705,9 @@
               <el-input type="textarea" :rows="4" v-model="form.urr"></el-input>
             </el-form-item>
           </el-col>
+
+
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -1911,6 +1943,7 @@ export default {
         filter_pressure:"",
         replacement_speed:"",
         dicarbonate:"",
+        is_pressure:"",
       },
 
       table_current_row: null,
@@ -1929,7 +1962,11 @@ export default {
       complicationList: [],
       infoDialogVisible:false,
       selected_date:"",
-      remark:""
+      remark:"",
+      pressureList:[
+        {id:1,name:"是"},
+        {id:2,name:"否"}
+      ]
     };
   },
   props: {
@@ -2481,6 +2518,7 @@ export default {
         : "";
         this.form.replacement_speed = monitor.replacement_speed?monitor.replacement_speed:""
         this.form.dicarbonate = monitor.dicarbonate?monitor.dicarbonate:""
+        this.form.is_pressure = monitor.is_pressure
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -2631,10 +2669,9 @@ export default {
           ? 0
           : parseFloat(this.form.replacement_speed);
 
-          this.form.dicarbonate =
-        parseFloat(this.form.dicarbonate) == NaN
-          ? 0
-          : parseFloat(this.form.dicarbonate);
+       this.form.dicarbonate =parseFloat(this.form.dicarbonate) == NaN ? 0: parseFloat(this.form.dicarbonate);
+       this.form.is_pressure = this.form.is_pressure
+
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -9,6 +9,7 @@
           <th v-if="isShow('监测时间')" width="124px">时间</th>
           <th v-if="isShow('体温')" width="72px">体温(℃)</th>
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
+          <th v-if="isShow('拒测血压')" width="72px">拒测血压</th>
           <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
@@ -55,6 +56,7 @@
           <td v-if="isShow('监测时间')"> {{ parseTime(monitor.operate_time, "{y}-{m}-{d} {h}:{i}") }} </td>
           <td v-if="isShow('体温')"> {{ monitor.temperature ? monitor.temperature : "" }} </td>
           <td v-if="isShow('血压')"> {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/{{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }} </td>
+          <th v-if="isShow('拒测血压')" width="72px">{{ monitor.is_pressure }}</th>
           <td v-if="isShow('脉搏')"> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
           <td v-if="isShow('呼吸频率')"> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
           <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} /{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}  </td>

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -53,6 +53,8 @@
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
                             <span v-if="schedule.mode_id == 24">I-HDF</span>
+                            </br>
+                            <span v-if="schedule.prescription.anticoagulant==1" style="color:red">无肝素</span>
                             </td>
                           
                    

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -212,6 +212,9 @@
             <span v-if="scope.row.mode_id == 13">(CRRT)</span>
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
             <span v-if="scope.row.mode_id == 24">I-HDF</span>
+            </br>
+
+            <span v-if="scope.row.anticoagulant == 1" style="color:red">无肝素</span>
           </template>
         </el-table-column>
         <el-table-column  label="分区床位" width="100">
@@ -1057,6 +1060,7 @@ export default {
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
                        it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
                        it.dialysis_irrigation = item.prescription.dialysis_irrigation
+                       it.anticoagulant = item.prescription.anticoagulant
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id
@@ -1155,6 +1159,7 @@ export default {
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
                        it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
                        it.dialysis_irrigation = item.prescription.dialysis_irrigation
+                       it.anticoagulant = item.prescription.anticoagulant
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id

src/xt_pages/dialysis/signPrint.vue

@@ -13,7 +13,7 @@
                 <div v-for="(item, index) in list" :key="index">
                     <div class="signPrint" v-for="it in item.parent_advice" style="page-break-after: always;">
                        
-                        <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -303,7 +303,7 @@
                           <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                           <td width="60" style="height:20px;line-height:20px">透析液温度</td>
                           <td width="60" style="height:20px;line-height:20px">电导度<br />ms/cm</td>
-                          <td width="60" style="height:20px;line-height:20px">体温<br />C°</td>
+                          <td width="60" style="height:20px;line-height:20px">血流量<br />ml/min</td>
                           <td width="">病情变化及处理</td>
                           <td width="60" style="height:20px;line-height:20px">签名</td>
                       </tr>
@@ -323,7 +323,7 @@
                           <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
                           <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                           <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
-                          <td>&nbsp;{{ monitor.temperature ? monitor.temperature : "" }}</td>
+                          <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</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 }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1567,8 +1567,8 @@ export default {
 
     }, searchProjectAction() {
       console.log('~~~~')
-      console.log(this.allProject)
-      console.log(this.allProject)
+      
+      // console.log(this.allProject)
 
 
       if (this.search_project_keyword.length == 0) {
@@ -1577,12 +1577,13 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-            arr = arr.concat(this.allProject[i])
-          }
+
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+              arr = arr.concat(this.allProject[i])
+            }
+          
         }
         this.tabProject = arr
-
       }
 
     }, searchProjectTeamAction() {
@@ -1606,7 +1607,10 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.drugs.length; i++) {
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
+          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || 
+          this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
+          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+          this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
             arr = arr.concat(this.drugs[i])
           }
         }
@@ -3427,7 +3431,8 @@ export default {
               total: project[i].total,
               is_special_diseases: project[i].disease_directory,
               project: project[i],
-              stock_count: 0
+              stock_count: 0,
+              first_letter:project[i].first_letter
             }
 
             this.tabProject.push(obj)
@@ -3465,9 +3470,6 @@ export default {
 
           this.allProject = this.tabProject
 
-
-
-
         }
       })
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -40,8 +40,8 @@
               </div>
 
               <div class="mainCell" style="margin-bottom:10px;">
-                  <el-input size="small" placeholder="请输入姓名或就诊号"
-                            v-model="search_input" class="filter-item"/>
+                  <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction"
+                    @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
                   <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                              @click="searchAction">
                       搜索
@@ -556,8 +556,11 @@ export default {
         switch (this.radio) {
           case 0:
             let arr4 = []
+            // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr4 = arr4.concat(this.all_data[i])
               }
             }
@@ -565,8 +568,11 @@ export default {
             break
           case 2:
             let arr2 = []
+            // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_data[i])
               }
             }
@@ -575,8 +581,11 @@ export default {
             break
           case 1:
             let arr3 = []
+            // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr3 = arr3.concat(this.all_data[i])
               }
             }

src/xt_pages/management/components/ManageForm.vue

@@ -34,10 +34,10 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="8">
+          <el-col :span="8">
             <el-form-item
               label="分区:"
-              v-show="bedShow"
+              v-show="bedShowTwo"
               required
               prop="zone_id"
             >
@@ -50,7 +50,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
 
           <el-col :span="8">
             <el-form-item
@@ -494,12 +494,7 @@ export default {
           this.deviceType = zones;
           var numbers = response.data.data.numbers;
           var devicenumber = response.data.data.devicenumber;
-          // console.log('devicenumber$', devicenumber)
-          // var device = [{ bed_id: 0, bed_number: '请选择' }]
-          // for (let index = 0; index < devicenumber.length; index++) {
-          // const item = devicenumber[index]
-          // device.push({ bed_id: item.bed_id, bed_number: item.bed_number })
-          // }
+         
           this.bedNumber = devicenumber;
         }
       });
@@ -603,7 +598,7 @@ export default {
         }
         arr1.push(obj.id);
       });
-      // console.log('arrr1', arr1)
+     
       this.form.treat_type = arr1;
 
       var device_type = this.form.device_type;
@@ -621,7 +616,7 @@ export default {
       var machine_statuss = parseInt(machine_status);
       this.form.machine_status = machine_statuss;
 
-      console.log("购买日期", this.form.buy_date);
+
 
       if (this.form.Disinfection_mode === "") {
         this.form.Disinfection_mode = 0;
@@ -714,7 +709,7 @@ export default {
         }
         arr1.push(obj.id);
       });
-      // console.log('arrr1', arr1)
+     
       this.form.treat_type = arr1;
 
       var device_type = this.form.device_type;
@@ -732,13 +727,7 @@ export default {
       var machine_statuss = parseInt(machine_status);
       this.form.machine_status = machine_statuss;
 
-      // if (this.form.bed_number === '') {
-      //  this.form.bed_number = 0
-      // }
-      // var bed_numbers = this.form.bed_number
-      // var bed_numberss = parseInt(bed_numbers)
-      // this.form.bed_number = bed_numberss
-      console.log("购买日期", this.form.buy_date);
+ 
 
       if (this.form.Disinfection_mode === "") {
         this.form.Disinfection_mode = 0;
@@ -824,13 +813,14 @@ export default {
          this.form.zone_id = 0
       }
     
-      console.log("form23232wo",this.form)
+    
+    
       this.$refs[formName].validate(valid => {
         if (valid) {
           SaveManageInfoTwo(this.form, this.forms.beds).then(response => {
             if (response.data.state === 1) {
               var add = response.data.data.addmacher;
-              console.log("add", add);
+          
               this.dialogVisible = false;
               this.$message.success("保存成功");
               this.getAllSubregion();
@@ -845,7 +835,7 @@ export default {
       getAllMode().then(response => {
         var mode = response.data.data.mode;
         this.deviceMode = mode;
-        console.log("mode", mode);
+       
       });
     },
     delManageInfo(){

src/xt_pages/management/home.vue

@@ -340,6 +340,20 @@
                                    </el-form-item>
                                </el-col>
                              </el-row>
+                             <el-row>
+                              <el-col :span="7">
+                                   <el-form-item label="分区">
+                                    <el-select style="width:135px" v-model="form.zone_id" :disabled="disableFour">
+                                      <el-option
+                                        v-for="item in this.bedZone"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id"
+                                      ></el-option>
+                                    </el-select>
+                                   </el-form-item>
+                               </el-col>
+                             </el-row>
                              <el-row>
                                <el-col :span="7">
                                  <el-form-item label="设备名称:" required prop="device_name">
@@ -3355,7 +3369,7 @@ export default {
       getAllSubregion() {
         getAllSubregion().then(response => {
           var zones = response.data.data.zones
-          console.log("zones",zones)
+       
           this.deviceType = zones
           var numbers = response.data.data.numbers
 
@@ -3440,7 +3454,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-        console.log("val3223323223",val)
+      
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -3464,7 +3478,7 @@ export default {
        
       },
       toParent(){
-        console.log("处方23322332")
+      
         this.$refs.childSix.getlist()
       },
       getAutoData(id) {
@@ -3478,7 +3492,7 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
-            console.log("addmacher",addmacher)
+         
             var warning = response.data.data.warning
 
             var time = this.getTimestamp(this.userform.date) - warning.stime
@@ -3786,6 +3800,10 @@ export default {
         if (this.form.zone_id === '') {
           this.form.zone_id = 0
         }
+        if( this.form.zone_id >0){
+          this.form.zone_id = parseInt(this.form.zone_id)
+        }
+     
 
         this.$refs[formName].validate(valid => {
           if (valid) {
@@ -3900,7 +3918,6 @@ export default {
         getAllPlan().then(response => {
           if (response.data.state === 1) {
             var plan = response.data.data.plan
-            console.log("plan=====",plan )
             for (let index = 0; index < plan.length; index++) {
               if (plan[index].time === 1) {
                 plan[index].time = '周一'
@@ -4040,7 +4057,7 @@ export default {
         getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            console.log("plandetail",plandetail)
+           
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -4435,10 +4452,7 @@ export default {
       },
 
       SaveInformation(formName) {
-        // if (this.userform.classtype === '') {
-        //   this.userform.classtype = 0
-        // }
-        console.log("form233232322323",this.userform.classtype)
+     
         if(this.userform.classtype!=""){
           var classtypes = this.userform.classtype
           var classtype = parseInt(classtypes)
@@ -4558,7 +4572,7 @@ export default {
         }
         this.userform.user_total = parseInt(this.userform.user_total)
 
-        console.log("user_form",this.userform)
+
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -4778,7 +4792,7 @@ export default {
            this.qualityForm.modifications = parseInt(this.qualityForm.modifications)
          }
 
-        console.log("3333333",this.qualityForm)
+      
 
         this.$refs[formName].validate(response => {
           SaveBacteria(this.equimentid, this.qualityForm).then(response => {
@@ -5124,7 +5138,7 @@ export default {
         getTimeBeteen(id, todayTime).then(response => {
           if (response.data.state === 1) {
             var timedata = response.data.data.timeData
-            // console.log("timedata----------------------",timedata)
+           
             if (timedata.length === 0) {
               this.warnShow = false
             }
@@ -5173,7 +5187,7 @@ export default {
             this.userform.bed_number = ''
             var change = response.data.data.change
             this.bedNumberTwo = change
-            // console.log('change', change)
+          
           }
         })
       },
@@ -5254,7 +5268,7 @@ export default {
             saveOxygenates(this.equimentid, this.qualityFormFour).then(response => {
               if (response.data.state === 1) {
                 var oxygenates = response.data.data.oxygenates
-                console.log("oxygenates",oxygenates)
+                
                 this.$message.success('保存成功')
                 this.qualityFormFour.specimenb = ''
                 this.qualityFormFour.concentrate_noc = ''
@@ -5298,7 +5312,7 @@ export default {
             saveHardWater(this.equimentid, this.qualityFormFive).then(response => {
               if (response.data.state === 1) {
                 var hadwater = response.data.data.hadwater
-                console.log("hadwater",hadwater)
+            
                 this.$message.success('保存成功')
                 this.qualityFormFive.specimenb = ''
                 this.qualityFormFive.concentrate_noc = ''
@@ -5341,7 +5355,7 @@ export default {
             saveWater(this.equimentid, this.qualityFormSix).then(response => {
               if (response.data.state === 1) {
                 var deviceWater = response.data.data.deviceWater
-                console.log("deviceWater",deviceWater)
+              
                 this.$message.success('保存成功')
                 this.qualityFormSix.specimenb = ''
                 this.qualityFormSix.concentrate_noc = ''
@@ -5386,7 +5400,7 @@ export default {
             saveDevicePH(this.equimentid, this.qualityFormSeven).then(response => {
               if (response.data.state === 1) {
                 var devicePh = response.data.data.devicePh
-                console.log("devicePh",devicePh)
+             
                 this.$message.success('保存成功')
                 this.qualityFormSeven.specimenb = ''
                 this.qualityFormSeven.concentrate_noc = ''

src/xt_pages/management/index.vue

@@ -124,7 +124,10 @@
         </el-table-column>
 
         <el-table-column label="分区" align="center">
-          <template slot-scope="scope">{{ scope.row.name }}</template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.device_type!='水处理机'"> {{ scope.row.name }}</span> 
+            <span v-if="scope.row.device_type=='水处理机'"> {{getZoneName(scope.row.zone_id)  }}</span> 
+          </template>
         </el-table-column>
 
         <el-table-column label="机位号" align="center">
@@ -416,6 +419,15 @@ export default {
           this.$message.success("保存成功!")
         }
       })
+    },
+    getZoneName(val){
+     var zone_name= ""
+     for(let i=0;i<this.zones.length;i++){
+       if(val == this.zones[i].id){
+          zone_name = this.zones[i].name
+       }
+     }
+     return zone_name
     }
   },
   created() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1588,21 +1588,22 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
-      console.log('~~~~')
-      console.log(this.allProject)
-
+      console.log('~~~~',this.search_project_keyword)
+      // console.log(this.allProject)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
 
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-            arr = arr.concat(this.allProject[i])
-          }
+         
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+              arr = arr.concat(this.allProject[i])
+            }
+          
         }
         this.tabProject = arr
-
+        console.log('kkkk',this.tabProject);
       }
 
     }, searchProjectTeamAction() {
@@ -1626,7 +1627,11 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.drugs.length; i++) {
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
+          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
+           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+           ) {
             arr = arr.concat(this.drugs[i])
           }
         }
@@ -3531,8 +3536,9 @@ export default {
               is_special_diseases: project[i].disease_directory,
               project: project[i],
               stock_count:0,
+              first_letter:project[i].first_letter
             }
-
+            // console.log('hhhhh',obj);
             this.tabProject.push(obj)
           }
 
@@ -3569,7 +3575,7 @@ export default {
           }
 
           this.allProject = this.tabProject
-
+          // console.log('cccc',this.allProject);
         }
       })
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -830,6 +830,7 @@ export default {
     },
 
     searchAction() {
+      
       if (this.search_input.length == 0) {
         switch (this.radio) {
           case 0:
@@ -843,12 +844,14 @@ export default {
             break
         }
       } else {
-
+        console.log('5555',this.radio);
         switch (this.radio) {
           case 0:
             let arr = []
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
+               this.all_data[i].number.indexOf(this.search_input) != -1 ||
+               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr = arr.concat(this.all_data[i])
                 console.log(arr)
               }
@@ -858,8 +861,12 @@ export default {
             break
           case 2:
             let arr2 = []
+           
             for (let i = 0; i < this.cure_data.length; i++) {
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || this.cure_data[i].number.indexOf(this.search_input) != -1) {
+              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
+              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
+              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                console.log('2222',this.cure_data);
                 arr2 = arr2.concat(this.cure_data[i])
               }
             }
@@ -867,11 +874,18 @@ export default {
 
             break
           case 1:
+            console.log("wowowoowowow",this.un_cure_data)
             let arr3 = []
+            console.log('3333',this.un_cure_data);
             for (let i = 0; i < this.un_cure_data.length; i++) {
-              if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
-                arr3 = arr3.concat(this.un_cure_data[i])
+              if(this.un_cure_data[i].first_letter!=undefined){
+                if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || 
+                this.un_cure_data[i].number.indexOf(this.search_input) != -1 ||
+                this.un_cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr3 = arr3.concat(this.un_cure_data[i])
+                }
               }
+              
             }
             this.un_cure_data = arr3
             break
@@ -902,9 +916,11 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.un_cure_data.push(obj)
+                console.log('vvvvv',this.un_cure_data);
               }
               //已就诊
               if (response.data.data.list[i].his_patient[b].prescription.length > 0) {
@@ -912,7 +928,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }
@@ -921,15 +938,18 @@ export default {
 
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
+            console.log("hahhahahahahahahah",response.data.data.list_two)
             //未就诊
             if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
               let obj = {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.un_cure_data.push(obj)
+              // console.log('aaaaa',this.un_cure_data);
             }
 
             //已就诊
@@ -938,12 +958,13 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
           }
-
+          // console.log('gggg',this.un_cure_data);
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
 
@@ -966,7 +987,6 @@ export default {
               this.getPatientInfo(this.un_cure_data[0])
 
             } else if (this.radio == 2) {
-
               this.$refs.tab.setCurrentRow(this.cure_data[0])
               this.oldCurrentRow = this.cure_data[0]
               this.getPatientInfo(this.cure_data[0])
@@ -1000,7 +1020,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.un_cure_data.push(obj)
               }
@@ -1010,7 +1031,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }
@@ -1025,7 +1047,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.un_cure_data.push(obj)
             }
@@ -1036,7 +1059,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
@@ -1488,6 +1512,7 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
+          console.log("getSchedulePatientList",response.data.data.list_two)
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
             //未就诊
@@ -1496,8 +1521,10 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
+              console.log('6666',obj);
               this.un_cure_data.push(obj)
             }
 
@@ -1507,7 +1534,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
@@ -1522,8 +1550,10 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
+                console.log('8888',obj);
                 this.un_cure_data.push(obj)
               }
               //已就诊
@@ -1532,7 +1562,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }

src/xt_pages/role/admin.vue

@@ -192,7 +192,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSendInformaton">生成PDF</el-button> -->
+          @click="toSavePDFInformation">生成PDF</el-button> -->
      </div>
     
       
@@ -1057,7 +1057,9 @@ export default {
     toSavePDFInformation(){
       toSavePDFInformation().then(response=>{
          if(response.data.data == 1){
+          var information =  response.data.data.information
 
+           var orderId = response.data.data.orderId
          }
       })
     }

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -49,6 +49,9 @@
             </el-option>
         </el-select>
         
+        <span>
+          <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+        </span>
         
       </div>
       
@@ -597,7 +600,131 @@
         }
       }
       return max_str + min_str;
-     }
+     },
+
+     toExprot(){
+      import('@/vendor/Export2Excel').then(excel => { 
+         
+        console.log("tableList",this.tableList)
+
+        if(this.tableList!=null && this.tableList.length>0){
+          for(let i=0;i<this.tableList.length;i++){
+
+              this.tableList[i].index = i+1
+             if(this.tableList[i].consumable_type == 1){
+               this.tableList[i].consumable_type_name = "手动入库"
+             }
+             if(this.tableList[i].consumable_type == 2){
+               this.tableList[i].consumable_type_name = "手动出库"
+             }
+             if(this.tableList[i].consumable_type == 3){
+               this.tableList[i].consumable_type_name = "自动出库"
+             }
+             if(this.tableList[i].consumable_type == 4){
+               this.tableList[i].consumable_type_name = "手动退库"
+             }
+             if(this.tableList[i].consumable_type == 5){
+               this.tableList[i].consumable_type_name = "报损数量"
+             }
+             if(this.tableList[i].consumable_type == 7){
+               this.tableList[i].consumable_type_name = "自动退库"
+             }
+             if(this.tableList[i].consumable_type == 10){
+               this.tableList[i].consumable_type_name = "盘盈"
+             }
+             if(this.tableList[i].consumable_type == 11){
+               this.tableList[i].consumable_type_name = "盘亏"
+             }
+             if(this.tableList[i].consumable_type == 12){
+               this.tableList[i].consumable_type_name = "调拨出库"
+             }
+             if(this.tableList[i].consumable_type == 13){
+               this.tableList[i].consumable_type_name = "调拨入库"
+             }
+             if(this.tableList[i].consumable_type == 15){
+               this.tableList[i].consumable_type_name = "结算出库"
+             }
+
+        
+            if(this.tableList[i].consumable_type == 1){
+              this.tableList[i].order_number = this.tableList[i].warehousing_order
+            }
+            if(this.tableList[i].consumable_type == 2){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 3){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 4 || this.tableList[i].consumable_type == 7){
+              this.tableList[i].order_number = this.tableList[i].cancel_order_number
+            }
+            if(this.tableList[i].consumable_type == 10){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 11){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 12){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 13){
+              this.tableList[i].order_number = this.tableList[i].warehousing_order
+            }
+            if(this.tableList[i].consumable_type == 15){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+
+            this.tableList[i].record_time = this.getTime(this.tableList[i].ctime)
+          
+            this.tableList[i].storehouse_name = this.getHouseName(this.tableList[i].storehouse_id)
+
+
+            
+            if(this.tableList[i].consumable_type!=2 && this.tableList[i].consumable_type!=3 && this.tableList[i].consumable_type!=5 &&  this.tableList[i].consumable_type != 7){
+              this.tableList[i].coutn_unit = (this.tableList[i].count.toString()) +this.tableList[i].max_unit
+            }
+            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
+              this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
+            }
+            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number >0)){
+              this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
+            }
+
+            if(this.tableList[i].price>0){
+              this.tableList[i].total_price = this.tableList[i].price
+            }
+            if(this.tableList[i].price == 0){
+              this.tableList[i].total_price = this.getPrice(this.tableList[i].drug_id)
+            }
+
+            this.tableList[i].expire_date_name = this.getTime(this.tableList[i].expire_date,"{y}-{h}-{d}")
+            this.tableList[i].manufacturer_name = this.getManufacturer( this.tableList[i].manufacturer)
+            this.tableList[i].patient_name = this.getPatientName(this.tableList[i].patient_id) 
+            this.tableList[i].over_count_name = this.getDrugCount(this.tableList[i].over_count,this.tableList[i].BaseDrugLib.max_unit,this.tableList[i].BaseDrugLib.min_unit,this.tableList[i].BaseDrugLib.min_number)
+
+          }
+        }
+      
+       
+        const multiHeader =['序号','出入库方式','出入库单据编码','操作日期','仓库名称','数量','单价','有效期','使用人','剩余库存']
+      
+        const filterVal = ['index', 'consumable_type_name', 'order_number', 'record_time', 'storehouse_name', 'coutn_unit', 'total_price', 'expire_date_name','patient_name','over_count_name']
+        
+
+        const data = this.formatJson(filterVal, this.tableList) 
+        console.log("datawoowow",data)
+         
+      
+         excel.export_json_to_excel({
+           header: multiHeader,
+           data,
+           filename: '药品流水'
+         })
+       })
+    },
+    formatJson(filterVal, jsonData) {
+     return jsonData.map(v => filterVal.map(j => v[j]))
+    },
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -48,6 +48,11 @@
               :value="item.id">
             </el-option>
         </el-select>
+
+        <span>
+          <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+        </span>
+       
       </div>
       
        <el-table
@@ -490,7 +495,116 @@
           }
        }
        return name
-     }
+     },
+     toExprot(){
+      import('@/vendor/Export2Excel').then(excel => { 
+         
+        console.log("tableList",this.tableList)
+
+        if(this.tableList!=null && this.tableList.length>0){
+          for(let i=0;i<this.tableList.length;i++){
+              this.tableList[i].index = i+1
+             if(this.tableList[i].consumable_type == 1){
+               this.tableList[i].consumable_type_name = "手动入库"
+             }
+             if(this.tableList[i].consumable_type == 2){
+               this.tableList[i].consumable_type_name = "手动出库"
+             }
+             if(this.tableList[i].consumable_type == 3){
+               this.tableList[i].consumable_type_name = "自动出库"
+             }
+             if(this.tableList[i].consumable_type == 4){
+               this.tableList[i].consumable_type_name = "手动退库"
+             }
+             if(this.tableList[i].consumable_type == 7){
+               this.tableList[i].consumable_type_name = "自动退库"
+             }
+             if(this.tableList[i].consumable_type == 10){
+               this.tableList[i].consumable_type_name = "盘盈"
+             }
+             if(this.tableList[i].consumable_type == 11){
+               this.tableList[i].consumable_type_name = "盘亏"
+             }
+             if(this.tableList[i].consumable_type == 12){
+               this.tableList[i].consumable_type_name = "调拨出库"
+             }
+             if(this.tableList[i].consumable_type == 13){
+               this.tableList[i].consumable_type_name = "调拨入库"
+             }
+             if(this.tableList[i].consumable_type == 15){
+               this.tableList[i].consumable_type_name = "结算出库"
+             }
+
+            if(this.tableList[i].consumable_type == 1){
+              this.tableList[i].order_number = this.tableList[i].warehousing_order
+            }
+            if(this.tableList[i].consumable_type == 2){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 3){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 5){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 12){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 15){
+              this.tableList[i].order_number = this.tableList[i].warehouse_out_order_number
+            }
+            if(this.tableList[i].consumable_type == 4 || this.tableList[i].consumable_type == 7){
+              this.tableList[i].order_number = this.tableList[i].cancel_order_number
+            }
+            if(this.tableList[i].consumable_type == 7){
+              this.tableList[i].order_number = this.tableList[i].cancel_order_number
+            }
+
+            if(this.tableList[i].consumable_type == 11|| this.tableList[i].consumable_type == 13 ||this.tableList[i].consumable_type == 10 ){
+              this.tableList[i].warehousing_order = this.tableList[i].warehousing_order
+            }
+          
+
+            this.tableList[i].record_time = this.getTime(this.tableList[i].ctime)
+          
+            this.tableList[i].storehouse_name = this.getHouseName(this.tableList[i].storehouse_id)
+          
+            this.tableList[i].coutn_unit = (this.tableList[i].count.toString()) +this.packing_unit
+
+            if(this.tableList[i].price>0){
+              this.tableList[i].total_price = this.tableList[i].price
+            }
+            if(this.tableList[i].price == 0){
+              this.tableList[i].total_price = this.tableList[i].packing_price
+            }
+
+            this.tableList[i].expire_date_name = this.getTime(this.tableList[i].expire_date,"{y}-{h}-{d}")
+            this.tableList[i].manufacturer_name = this.getManufacturer( this.tableList[i].manufacturer)
+            this.tableList[i].patient_name = this.getPatientName(this.tableList[i].patient_id) 
+
+          }
+        }
+      
+       
+        const multiHeader =['序号','出入库方式','出入库单据编码','操作日期','仓库名称','数量','单价','有效期','生产商','使用人','剩余库存']
+      
+        const filterVal = ['index', 'consumable_type_name', 'order_number', 'record_time', 'storehouse_name', 'coutn_unit', 'total_price', 'expire_date_name','manufacturer_name','patient_name','over_count']
+        
+
+        const data = this.formatJson(filterVal, this.tableList) 
+        console.log("datawoowow",data)
+
+         excel.export_json_to_excel({
+           header: multiHeader,
+           data,
+           filename: '耗材流水'
+         })
+       })
+    },
+    formatJson(filterVal, jsonData) {
+     return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+
     }
   }
 </script>

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -49,35 +49,50 @@
                   <span v-if="item.Mon_M.patient_id">
                     <span>{{ item.Mon_M.patient }} </span><br/>
                     <span >{{ item.Mon_M.mode_name }}</span><br/>
-                    <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}</span>
+                    <span v-if="org_id==10469 || org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/>
+                    <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
+                   
+                    </span>
                   </span>
                 </td>
                 <td style="min-width:50px;" v-if="first_day == 1">
                   <span v-if="item.Mon_A.patient_id">
                     <span>{{ item.Mon_A.patient }} </span><br/>
                     <span >{{ item.Mon_A.mode_name }}</span><br/>
-                    <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span>
+                     <span v-if="org_id==10469 || org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
+                    <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
+                     
+                    </span>
                   </span>
                 </td>
                 <td style="min-width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_N.patient_id">
                         <span>{{ item.Mon_N.patient }} </span><br/>
                         <span >{{ item.Mon_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==10469 || org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
+                        <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }} </span><br/>
                         <span >{{ item.Tue_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id==0||org_id==10469">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/>
+                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_A.patient_id">
                       <span>{{ item.Tue_A.patient }} </span><br/>
                         <span >{{ item.Tue_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id == 10469">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
+                        <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
+                         
+                        </span>
 
                     </span>
                 </td>
@@ -85,105 +100,151 @@
                     <span v-if="item.Tue_N.patient_id">
                       <span>{{ item.Tue_N.patient }} </span><br/>
                         <span >{{ item.Tue_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id==0||org_id ==10469">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
+                        <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_M.patient_id">
                       <span>{{ item.Wed_M.patient }} </span><br/>
                         <span >{{ item.Wed_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id == 0 || org_id ==10469">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/>
+                        <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_A.patient_id">
                       <span>{{ item.Wed_A.patient }} </span><br/>
                         <span >{{ item.Wed_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
+                        <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_N.patient_id">
                       <span>{{ item.Wed_N.patient }} </span><br/>
                         <span >{{ item.Wed_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0 || org_id ==10469">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
+                        <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_M.patient_id">
                       <span>{{ item.Thurs_M.patient }} </span><br/>
                         <span >{{ item.Thurs_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id == 0||org_id ==10469">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
+                        <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_A.patient_id">
                       <span>{{ item.Thurs_A.patient }} </span><br/>
                         <span >{{ item.Thurs_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
+
+                        <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
+                        
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_N.patient_id">
                       <span>{{ item.Thurs_N.patient }} </span><br/>
                         <span >{{ item.Thurs_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0 || org_id ==10469" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_M.patient_id">
                       <span>{{ item.Fri_M.patient }} </span><br/>
                         <span >{{ item.Fri_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/>
+                        <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_A.patient_id">
                       <span>{{ item.Fri_A.patient }} </span><br/>
                         <span >{{ item.Fri_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_N.patient_id">
                       <span>{{ item.Fri_N.patient }} </span><br/>
                         <span >{{ item.Fri_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id == 0||org_id ==10469">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
+                        <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_M.patient_id">
                       <span>{{ item.Sat_M.patient }} </span><br/>
                         <span >{{ item.Sat_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0 || org_id ==10469">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_A.patient_id">
                       <span>{{ item.Sat_A.patient }} </span><br/>
                         <span >{{ item.Sat_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_N.patient_id">
                       <span>{{ item.Sat_N.patient }} </span><br/>
                         <span >{{ item.Sat_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_M.patient_id">
                       <span>{{ item.Sun_M.patient }} </span><br/>
                         <span >{{ item.Sun_M.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
+                        <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
+                         
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_A.patient_id">
                       <span>{{ item.Sun_A.patient }} </span><br/>
                         <span >{{ item.Sun_A.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0 || org_id ==10469">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
+                        <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
+                         
+                        </span>
 
                     </span>
                 </td>
@@ -191,7 +252,10 @@
                     <span v-if="item.Sun_N.patient_id">
                       <span>{{ item.Sun_N.patient }} </span><br/>
                         <span >{{ item.Sun_N.mode_name }}</span><br/>
-                        <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}</span>
+                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
+                        <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <!-- <td>{{item.total}}</td> -->
@@ -243,9 +307,11 @@ export default {
            five_day:0,
            six_day:0,
            seven_day:0,
+           org_id:0
         }
     },
     created(){
+        this.org_id = this.$store.getters.xt_user.org.id
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
         this.partition_id = this.$route.query.partition_id
@@ -375,6 +441,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:"",
                           },
                           Mon_A: {
                               schedule_id: 0,
@@ -384,6 +451,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Mon_N: {
@@ -394,6 +462,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Tue_M: {
@@ -404,6 +473,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Tue_A: {
@@ -414,6 +484,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
 
                           },
@@ -425,6 +496,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Wed_M: {
@@ -435,6 +507,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Wed_A: {
@@ -445,6 +518,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Wed_N: {
@@ -455,6 +529,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Thurs_M: {
@@ -465,6 +540,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Thurs_A: {
@@ -475,6 +551,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Thurs_N: {
@@ -485,6 +562,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Fri_M: {
@@ -495,6 +573,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Fri_A: {
@@ -505,6 +584,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Fri_N: {
@@ -515,6 +595,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sat_M: {
@@ -525,6 +606,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sat_A: {
@@ -535,6 +617,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sat_N: {
@@ -545,6 +628,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sun_A: {
@@ -555,6 +639,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sun_N: {
@@ -565,6 +650,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           Sun_M: {
@@ -575,6 +661,7 @@ export default {
                               patient: '',
                               type:1,
                             dialysis_machine_name:"",
+                            anticoagulant:""
 
                           },
                           total: 0
@@ -635,6 +722,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Mon_A = {
@@ -644,6 +732,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Mon_N = {
@@ -653,6 +742,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Tue_M = {
@@ -662,6 +752,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Tue_A = {
@@ -671,6 +762,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Tue_N = {
@@ -680,6 +772,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Wed_M = {
@@ -689,6 +782,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Wed_A = {
@@ -698,6 +792,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Wed_N = {
@@ -707,6 +802,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Thurs_M = {
@@ -716,6 +812,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Thurs_A = {
@@ -725,6 +822,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Thurs_N = {
@@ -734,6 +832,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Fri_M = {
@@ -743,6 +842,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Fri_A = {
@@ -752,6 +852,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Fri_N = {
@@ -761,6 +862,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sat_M = {
@@ -770,6 +872,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sat_A = {
@@ -779,6 +882,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sat_N = {
@@ -788,6 +892,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sun_A = {
@@ -797,6 +902,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sun_N = {
@@ -806,6 +912,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
                       };
                       that.scheduleZone[index].Sun_M = {
@@ -815,6 +922,7 @@ export default {
                           patient: "",
                           type:1,
                         dialysis_machine_name:"",
+                        anticoagulant:"",
 
 
                       };
@@ -840,8 +948,9 @@ export default {
                                       patient_id: schedule.patient_id,
                                       patient: schedule.patient,
                                       patient_contagions: schedule.patient_contagions,
-                                        dialysis_machine_name: schedule.dialysis_machine_name,
-                                        mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
+                                      dialysis_machine_name: schedule.dialysis_machine_name,
+                                      mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name,
+                                      anticoagulant:schedule.dialysissolution.anticoagulant
                                       };
                                       that.scheduleZone[index].total += 1;
 
@@ -1222,6 +1331,56 @@ export default {
           return this.Screencasting =false
         }
         
+      },
+      getAnticoagulant(val){
+        var name= ""
+        if(val == 1){
+          name ="无肝素"
+        }
+        if(val == 2){
+          name ="普通肝素"
+        }
+        if(val == 3){
+          name ="低分子肝素"
+        }
+        if(val == 4){
+          name ="阿加曲班"
+        }
+        if(val == 5){
+          name ="枸橼酸钠"
+        }
+        if(val == 6){
+          name ="低分子肝素钙"
+        }
+        if(val == 7){
+          name ="低分子肝素钠"
+        }
+        if(val == 8){
+          name ="依诺肝素"
+        }
+        if(val == 9){
+          name ="达肝素"
+        }
+        if(val == 10){
+          name ="体外抗凝"
+        }
+        if(val == 11){
+          name ="那屈肝素"
+        }
+        if(val == 12){
+          name ="无抗凝剂"
+        }
+        if(val == 13){
+          name ="那屈肝素钙"
+        }
+        if(val == 14){
+          name ="肝素钙注射液"
+        }
+        if(val == 15){
+          name ="甲磺酸萘莫司他"
+        }
+
+        return name
       }
     }
 }