Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/project/project.js

@@ -541,3 +541,12 @@ export function getInvoice(params){
     params:params
   })
 }
+
+export function getAllGoodInfoList(params){
+
+  return request({
+    url:"/api/getallgoodinforlist",
+    method:"Get",
+    params:params
+  })
+}

src/api/qcd.js

@@ -293,3 +293,12 @@ export function Getbpdetail(params) {
     params: params
   })
 }
+
+//干体重详情
+export function Getdryweightdetail(params) {
+  return request({
+    url: '/api/commonqc/dryweight/detail',
+    method: 'get',
+    params: params
+  })
+}

src/store/modules/globalConfig.js

@@ -864,6 +864,21 @@ const global_config = {
         calcium: 1,
         bicarbonate: 1
       },
+      44: {
+        id: 44,
+        name: '导管溶栓',
+        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: {
@@ -1136,6 +1151,21 @@ const global_config = {
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
+      19: {
+        id: 19,
+        name: '低分子量肝素钠',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
     },
     anticoagulants_set: {
       type: 2

src/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator.vue

@@ -360,7 +360,7 @@ import html2canvas from "html2canvas"
                   this.weight_value = this.weight_gain[i].value
                 }
               }
-              this.Getdialyzerdetail(this.weight_value)
+              this.Getdialyzerdetail(this.weight_value,2)
             })
           }
 
@@ -404,7 +404,7 @@ import html2canvas from "html2canvas"
       // 详情查询
       deil_click(){
         this.currentPage = 1
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
        // 下载
       Download_click(){
@@ -498,7 +498,7 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(add){
+      Getdialyzerdetail(add,type){
         const params ={
           start_time:this.start_date,
           end_time:this.end_date,
@@ -508,6 +508,7 @@ import html2canvas from "html2canvas"
           keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
+          item_type:type,
         }
         this.loading = true
         Getweightdetail(params).then(response =>{
@@ -526,7 +527,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:(item.weight_add*1).toFixed(2),
+                  weight_add:((item.weight_before - item.dry_weight) / item.dry_weight).toFixed(3)  ,
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -641,11 +642,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
       // 性别
       getgender(ids){

src/xt_pages/Dialysisanalysis/weightblood/components/dry_weight.vue

@@ -181,7 +181,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
+import {Getpatinetweight,Getdryweightdetail} from '../../../../api/qcd'
 import {getAllNurseList} from '@/api/fallassement'
 import { getAllDoctorList} from "@/api/device"
 import html2canvas from "html2canvas"
@@ -340,15 +340,15 @@ import html2canvas from "html2canvas"
       },
       // 查询
       sete_click(){
-        
+
         this.getecharts()
       },
       // 详情查询
       detil_click(){
-        
+
         this.currentPage =1
         this.getdetail(this.status_value)
-        
+
       },
        // 下载
       Download_click(){
@@ -411,7 +411,7 @@ import html2canvas from "html2canvas"
           limit:this.limit,
         }
         this.loading = true
-        Getweightdetail(params).then(response =>{
+        Getdryweightdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
             // const xAxis = []

src/xt_pages/Dialysisanalysis/weightblood/components/list_denominator.vue

@@ -357,12 +357,12 @@ import html2canvas from "html2canvas"
               for(let i in this.weight_gain){
                 if(params.name == this.weight_gain[i].label){
                   this.weight_value = this.weight_gain[i].value
-                  
+
                 }
               }
-              // this.Getdialyzerdetail(params.name)              
+              // this.Getdialyzerdetail(params.name)
               // console.log('this.weight_value',this.weight_value);
-              this.Getdialyzerdetail(this.weight_value)
+              this.Getdialyzerdetail(this.weight_value,1)
             })
           }
 
@@ -406,7 +406,7 @@ import html2canvas from "html2canvas"
       // 详情查询
       deil_click(){
         this.currentPage = 1
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
        // 下载
       Download_click(){
@@ -500,7 +500,7 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(add){
+      Getdialyzerdetail(add,type){
         const params ={
           start_time:this.start_date,
           end_time:this.end_date,
@@ -510,6 +510,7 @@ import html2canvas from "html2canvas"
           keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
+          item_type:type
         }
         this.loading = true
         Getweightdetail(params).then(response =>{
@@ -644,11 +645,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
       // 性别
       getgender(ids){

src/xt_pages/data/components/addDrugs.vue

@@ -26,6 +26,13 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                       </div>
+                      
+                      <!-- <div v-if="org_id == 0">
+                        <el-form-item label="药品规格 : ">
+                            <el-input v-model="form.specification_name" style="width:160px;" placeholder=""
+                                      maxlength="30"></el-input>
+                        </el-form-item>
+                      </div> -->
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -55,7 +62,7 @@
                             </el-form-item>
                             <span style="margin-bottom:20px;font-size:20px;padding:0 10px;">*</span>
                             <el-form-item prop="min_number" class="noMargin">
-                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;"  type="number" placeholder="拆零"> </el-input>
+                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;"  type="number" placeholder="拆零" @keyup.native="changeTextOne(form.min_number)"> </el-input>
                             </el-form-item>
                             <el-form-item prop="min_unit" class="noMargin">
                               <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位">
@@ -206,7 +213,7 @@
                         </el-form-item>
                         <el-form-item label="包装零售价(元) : " prop="retail_price">
                           <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
+                                      maxlength="30"  @keyup.native="changeText(form.retail_price)"></el-input>
                         </el-form-item>
                         <el-form-item label="进货价(元) : " prop="last_price">
                             <el-input v-model="form.last_price" style="width:160px;" placeholder=""
@@ -226,7 +233,7 @@
                             <el-input v-model="form.number" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="药物分类 : " prop="drug_classify">
+                        <el-form-item label="药物分类 : ">
                             <el-select v-model="form.drug_classify" style="width:160px;" placeholder="请选择">
                                 <el-option
                                         v-for="(item, index) in drugClassifyList"
@@ -666,7 +673,8 @@
           bby01:"",
           is_project:"",
           is_show:"",
-          is_self_drug:"2"
+          is_self_drug:"2",
+        
         },
 
         rules: {
@@ -749,6 +757,13 @@
 
     },
     methods: {
+      changeText(retail_price){
+       
+        this.form.min_price = (retail_price/this.form.min_number).toFixed(2)
+      },
+      changeTextOne(min_number){
+        this.form.min_price = (this.form.retail_price/min_number).toFixed(2)
+      },
       cancle: function(formName) {
         this.$emit('dialog-cancle', this.getValue())
       },

src/xt_pages/data/components/drugs.vue

@@ -74,14 +74,14 @@
         >点击导出
         </el-button>
 
-        <!-- <el-button
+        <el-button
           style="margin-left:10px;"
           @click="jiaoBen()"
           class="filter-item"
           type="primary"
           size="small"
         >脚本
-        </el-button> -->
+        </el-button>
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -511,21 +511,31 @@
          this.getList()
       },
       getName(id) {
-        for (let i = 0; i < this.manufacturers.length; i++) {
-          if (this.manufacturers[i].id == id) {
-            return this.manufacturers[i].manufacturer_name
-          }
+        if(id == 0){
+          return ''
+        }else{
+          for (let i = 0; i < this.manufacturers.length; i++) {
+            if (this.manufacturers[i].id == id) {
+              return this.manufacturers[i].manufacturer_name
+            }
+         }
+          return ''
         }
-        return ''
+        
       },
       getDealer(id){
-        var name = "";
-        for(let i=0;i<this.dealer.length;i++){
-          if(this.dealer[i].id == id){
-             name = this.dealer[i].dealer_name
+        if (id == 0) {
+          return ""
+        }else{
+          var name = "";
+          for(let i=0;i<this.dealer.length;i++){
+            if(this.dealer[i].id == id){
+              name = this.dealer[i].dealer_name
+            }
           }
+          return name
         }
-        return name
+       
       },
       goodInfoDialogComfirm: function(val) {
 

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -934,7 +934,7 @@
                               : "/"
                            }}
                           </span>
-                        
+
 
                           <span v-if="org_id!=10206&&org_id!=10510">
                             {{
@@ -1415,6 +1415,8 @@
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         维持：
@@ -1488,6 +1490,8 @@
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu/h</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         总量：
@@ -1540,6 +1544,9 @@
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span>
+
+                        <span v-if="record.prescription.anticoagulant == 19"
+                          >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
@@ -1558,7 +1565,7 @@
                         </div>
                       </div>
 
-                    
+
                       <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                        <div class="inline_block">
                         上机时间：
@@ -1705,7 +1712,9 @@
                               org_id != 9675 &&
                               org_id!=10490  &&
                               org_id!=10600 &&
-                              org_id!=10644
+                              org_id!=10644 &&
+                              org_id!=0&&
+                              org_id!=10567
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1721,7 +1730,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id ==  10469
+                              org_id ==  10469 || org_id == 0 || org_id ==10567
                             "
                           >
                             钠浓度<br />(mmol/L)
@@ -1740,7 +1749,7 @@
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1750,8 +1759,8 @@
                             "
                             width="50"
                           >
-                          <span v-if="org_id!=0&&org_id!=10683">置换量</span> 
-                          <span v-if="org_id ==0||org_id==10683">置换液速度</span> 
+                          <span v-if="org_id!=0&&org_id!=10683">置换量</span>
+                          <span v-if="org_id ==0||org_id==10683">置换液速度</span>
                             <br />
                             <span v-if="org_id!=10598 && org_id!=10567">
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
@@ -1771,7 +1780,8 @@
                               org_id ==10629 ||
                               org_id == 10510 ||
                               org_id == 0 ||
-                              org_id == 10598
+                              org_id == 10598 ||
+                              org_id == 10567
 
                             "
                           >
@@ -1826,7 +1836,7 @@
                                 : ""
                             }}
                           </td>
-                          
+
                           <td>
                             {{
                               monitor_record.pulse_frequency
@@ -1849,7 +1859,7 @@
                                 : ""
                             }}
                           </td>
-                         
+
                           <td v-if="org_id == 10478 || org_id ==10510">
                             {{
                               monitor_record.arterial_pressure
@@ -1875,7 +1885,7 @@
                             </span>
 
                           </td>
-                        
+
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
@@ -1906,8 +1916,11 @@
                               org_id != 9675 &&
                               org_id!=10490 &&
                               org_id!=10600 &&
-                              org_id!=10644 
-                             
+                              org_id!=10644 &&
+                              org_id!=0 &&
+                              org_id!=10567
+
+
                             "
                           >
                             {{
@@ -1931,7 +1944,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469
+                              org_id == 10469 || org_id ==0 || org_id == 10567
                             "
                           >
                             {{
@@ -1964,7 +1977,7 @@
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
                           <td width="50" v-if="org_id == 10489 || org_id ==0"><br />
-                                   
+
                                    {{
                                      monitor_record.ultrafiltration_rate
                                        ? monitor_record.ultrafiltration_rate
@@ -1986,11 +1999,11 @@
                                 : ""
                             }}
                             </span>
-                            
+
                           </td>
 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0"><br />
-                                   
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567"><br />
+
                                     {{
                                       monitor_record.ultrafiltration_rate
                                         ? monitor_record.ultrafiltration_rate
@@ -2012,13 +2025,13 @@
                                 ? monitor_record.replacement_total
                                 : ""
                             }}
-                            </span> 
+                            </span>
                             <span v-if="org_id==0||org_id==10683">{{
                               monitor_record.replacement_speed
                                 ? monitor_record.replacement_speed
                                 : ""
                             }}
-                            </span> 
+                            </span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449">
                             {{
@@ -2038,7 +2051,8 @@
                               org_id ==10629 ||
                               org_id ==10510 ||
                               org_id== 0 ||
-                              org_id ==10598
+                              org_id ==10598 ||
+                              org_id == 10567
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -2130,6 +2144,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0"></td>
                         <td  v-if="org_id == 0 || org_id == 10375"> </td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
@@ -3089,7 +3104,7 @@
                           //    : "/"
                           //     }}
                             </span> -->
-                        
+
 
                         </div>
                         kg
@@ -3412,7 +3427,7 @@
 
 
                     </div>
-                    
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3438,7 +3453,7 @@
                     </div>
                   </div>
 
-                   
+
                   </td>
                 </tr>
                 <tr>
@@ -3782,7 +3797,7 @@
                           class="under_line"
                           style="width: 80px; text-align: center"
                         >
-                          
+
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -3910,7 +3925,7 @@ export default {
     };
   },
   created() {
-   
+
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -3945,7 +3960,7 @@ export default {
     // }
     console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
 
-   
+
 
     this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
 
@@ -4210,7 +4225,7 @@ export default {
 
 
           if(this.records!=null && this.records.length>0){
-           
+
             for(let i=0;i<this.records.length;i++){
               this.records[i].new_his_advices = []
                 for(let j=0;j<this.records[i].his_advices.length;j++){
@@ -4551,7 +4566,7 @@ export default {
            name = this.bloodAccessParOpera[i].name
         }
       }
-      
+
       return name
       // if (id in this.bloodAccessParOpera) {
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==0 ||this.org_id ==10206){
+          if(this.org_id ==10206){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)
@@ -1929,7 +1929,7 @@ export default {
             var template = response.data.data.template;
             this.template_id = template.template_id;
           }
-          
+
         }
       });
     },

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -266,14 +266,14 @@
           <el-table-column align="center" label="葡萄糖酸钙" v-if="gatherSetting.putaosuangai == 1">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_three }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
              </template>
           </el-table-column>
 
           <el-table-column align="center" label="肝素钠" v-if="org_id == 0 || org_id == 10683">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_four }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
              </template>
           </el-table-column>
           
@@ -736,6 +736,7 @@
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                   list[i].advice_spc_four = ""
+                  list[i].advice_spc_five = 0
                   for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
@@ -754,9 +755,19 @@
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                         
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
+
+
                    }
                 }
                 console.log("listwowowowowowo日本",this.list)
@@ -2266,6 +2277,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("左卡")!=-1){
@@ -2286,6 +2298,7 @@
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+             
            }
          }
          return advice_name
@@ -2351,6 +2364,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count =0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
@@ -2370,10 +2384,17 @@
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            //  
+             count += newArr[i].prescribing_number
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          advice_name  += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+          return  advice_name
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -308,6 +308,7 @@
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                    list[i].advice_spc_four = ""
+                   list[i].advice_spc_five = 0
                    for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
@@ -326,7 +327,14 @@
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
                    }
@@ -566,6 +574,7 @@
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
@@ -585,10 +594,16 @@
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            count += newArr[i].prescribing_number
+              // advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          return ""
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

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

@@ -10,7 +10,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
-           
+
             <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             </span>
@@ -19,8 +19,8 @@
               透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
             </span>
 
-          
-           
+
+
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
             </span>
@@ -29,8 +29,8 @@
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
               上次透后体重：
-               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span> 
-               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span> 
+               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
+               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
             </span>
 
             <span style="position: absolute;left:51%;top: 3%">
@@ -51,8 +51,8 @@
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
               </span>
-            
-            
+
+
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
@@ -560,7 +560,7 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
-                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" 
+                            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                             v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 11 && dialysisPrescription.anticoagulant != 13"
                             prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -953,7 +953,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
+                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
                             <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
@@ -964,9 +964,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53 && this.$store.getters.xt_user.template_info.org_id != 10206) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26">
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26"
                             <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                         <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
@@ -1389,7 +1389,7 @@
                 <span>上次透后称重(kg)</span>
                 <span>{{ getLastAfterWeight(last_record) }}</span>
             </div>
-          
+
           <div  class="newLine"><span>近五次数据展示:</span></div>
            <div>
             <el-table
@@ -2282,7 +2282,7 @@ mu
            }else{
                this.dialysisPrescription.dialysis_remark=""
            }
-          
+
           } else {
             this.zhiShow = false
             this.huShow = false
@@ -2634,18 +2634,18 @@ mu
         }
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
-      
+
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
-          
+
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
               }
-            
+
             }
          }
         }
@@ -3200,13 +3200,10 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-         
-        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhh",this.targetAdvices)
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
-              console.log("WOOWOWOWOWOWOW",this.targetAdvices[i].week_day.indexOf(total_day))
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
-                console.log("尽力啊=--------------------")
                 this.targetAdvices[i].isCheck = 1
               }
               if(this.targetAdvices[i].frequency_type == 1){
@@ -3284,7 +3281,7 @@ mu
              return false
          }
         }
-         
+
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
@@ -4601,8 +4598,8 @@ mu
       }else{
         this.dialysisPrescription.dialysis_remark = ""
       }
-       
-      
+
+
 
       const ParamsQuery = {}
       ParamsQuery['patient_id'] = this.$route.query.patient_id
@@ -4759,25 +4756,25 @@ mu
 
     },
     handlePatientInfo(id) {
-      
+
       getPatientRecordList(id).then(response=>{
         if(response.data.state ==1){
           this.isVisibility = false
           this.msgtip_visibility = true
 
-          
+
           var beforList = response.data.data.beforList
-       
+
           this.tableData = beforList
 
           var afterList =  response.data.data.afterList
-       
+
           this.afterList = afterList
 
           this.monitorList = response.data.data.monitorList
         }
       })
-     
+
     },
     GetLast(date){
       var weight_after = ""
@@ -4798,23 +4795,23 @@ mu
       return cruor
     },
     GetMonitorList(monitor_date){
-     
+
         var str = ""
         var newArr = []
         for(let i=0;i<this.monitorList.length;i++){
           for(let j=0;j<this.monitorList[i].child.length;j++){
             if(monitor_date == this.monitorList[i].monitoring_date){
-              newArr.push(this.monitorList[i].child[j]) 
+              newArr.push(this.monitorList[i].child[j])
             }
           }
         }
-       
+
         if(newArr!=null && newArr.length>0){
         for(let i=0;i<newArr.length;i++){
             str += newArr[i].systolic_blood_pressure +"/"+newArr[i].diastolic_blood_pressure+","
         }
         }
-      
+
         return str
     },
     handlePatientInfoOne(){
@@ -5480,18 +5477,18 @@ mu
       },
       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
-           
+
           if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
-              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
+              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water
             }
           }
-          
-           
+
+
         }
-        
+
       },
       stockType: function() {
         console.log('stockType', this.stockType)
@@ -5544,7 +5541,7 @@ mu
         }
         console.log(" 人员",this.adminRoles)
       },
-     
+
     },
     created() {
 

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2669,7 +2669,7 @@ export default {
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206&&this.org_id !=0){
+          if(this.org_id !=10206){
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           }else{

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -92,7 +92,7 @@
           </div>
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
-            <div class="under_line" style="width: 50px; text-align: center">
+            <div class="under_line" style="width: 100px; text-align: center">
               <span v-if="org_id!=9538 && org_id!=0">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
@@ -517,7 +517,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 1"
                       >
@@ -528,7 +528,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                        
+
                         "
                         v-if="prescription.mode_id == 2"
                       >
@@ -539,7 +539,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 3"
                       >
@@ -550,7 +550,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 4"
                       >
@@ -561,7 +561,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 5"
                       >
@@ -572,7 +572,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 6"
                       >
@@ -583,7 +583,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 7"
                       >
@@ -594,7 +594,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 8"
                       >
@@ -605,7 +605,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 9"
                       >
@@ -616,7 +616,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 10"
                       >
@@ -627,7 +627,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 11"
                       >
@@ -638,7 +638,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 12"
                       >
@@ -649,7 +649,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 13"
                       >
@@ -660,7 +660,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 14"
                       >
@@ -671,7 +671,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 15"
                       >
@@ -682,7 +682,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 16"
                       >
@@ -693,7 +693,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 17"
                       >
@@ -704,7 +704,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 18"
                       >
@@ -715,7 +715,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 19"
                       >
@@ -726,7 +726,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 22"
                       >
@@ -737,7 +737,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 23"
                       >
@@ -748,7 +748,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 24"
                       >
@@ -758,7 +758,7 @@
                         class="under_line"
                         style="width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 25"
                       >
@@ -769,7 +769,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 29"
                       >
@@ -780,7 +780,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 30"
                       >
@@ -791,7 +791,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 31"
                       >
@@ -802,7 +802,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 32"
                       >
@@ -813,7 +813,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 33"
                       >
@@ -824,7 +824,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 34"
                       >
@@ -835,7 +835,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 35"
                       >
@@ -846,7 +846,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 36"
                       >
@@ -857,7 +857,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 37"
                       >
@@ -868,7 +868,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 38"
                       >
@@ -879,7 +879,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 39"
                       >
@@ -891,7 +891,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 40"
                       >
@@ -903,7 +903,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 41"
                       >
@@ -915,7 +915,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                         
+
                         "
                         v-if="prescription.mode_id == 42"
                       >
@@ -927,7 +927,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          
+
                         "
                         v-if="prescription.mode_id == 43"
                       >
@@ -1444,9 +1444,9 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                       <span v-if="org_id!=10644">mg</span> 
-                       <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                       <span v-if="org_id!=10644">mg</span>
+                       <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1463,9 +1463,9 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     <span v-if="prescription.anticoagulant == 14">
-                      <span v-if="org_id!=10644">mg</span> 
-                      <span v-if="org_id==10644">iu</span> 
+                     <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                      <span v-if="org_id!=10644">mg</span>
+                      <span v-if="org_id==10644">iu</span>
                      </span>
                      <span v-if="prescription.anticoagulant == 17">U</span>
 
@@ -1509,9 +1509,9 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1527,9 +1527,9 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
-                            <span v-if="org_id!=10644">mg/h</span> 
-                            <span v-if="org_id==10644">iu/h</span> 
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                            <span v-if="org_id!=10644">mg/h</span>
+                            <span v-if="org_id==10644">iu/h</span>
                           </span>
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
                       </span>
@@ -1600,9 +1600,9 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                      </span>
@@ -1618,9 +1618,9 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      <span v-if="prescription.anticoagulant == 14">
-                        <span v-if="org_id!=10644">mg</span> 
-                        <span v-if="org_id==10644">iu</span> 
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
+                        <span v-if="org_id!=10644">mg</span>
+                        <span v-if="org_id==10644">iu</span>
                       </span>
                       <span v-if="prescription.anticoagulant == 17">U</span>
                     </span>
@@ -1839,8 +1839,8 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 "> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
@@ -1851,7 +1851,7 @@
                          <span v-if="org_id == 10471">L</span>
                          <span v-if="org_id != 10471"> (ml)</span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           <span v-if="org_id == 10683">置换液速度</span>
@@ -1864,7 +1864,7 @@
                           <span v-if="org_id==10598 || org_id == 10567">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1962,8 +1962,8 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==10469 || org_id == 10567 || org_id == 0"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
@@ -1983,7 +1983,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 "><br/>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 ">
                               <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -2018,7 +2018,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -2059,7 +2059,7 @@
                         <td v-if="org_id == 0||org_id == 9829">
                           {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
                         </td>
-                       
+
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -2237,6 +2237,7 @@
                             "
                             >({{ advice.remark }})</span
                           >
+                          <span v-if="org_id == 0 || org_id == 10644">({{ advice.remark }})</span>
                         </td>
 
                         <td height="32px">
@@ -2255,7 +2256,7 @@
                           </span>
 
                         </td>
-                     
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.execution_staff>0">
                             <span
@@ -2290,7 +2291,7 @@
                               getTime(advice.execution_time, "{h}:{i}")
                              }}</span>
                           </span>
-                         
+
                         </td>
                         <td height="32px">
                           <span v-if="org_id!=10489">
@@ -2310,7 +2311,7 @@
                               />
                             </span>
                           </span>
-                         
+
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538  ||
                             org_id ==10375 || org_id ==10571 || org_id ==10600">
@@ -2353,8 +2354,8 @@
 
                         "
                         >
-                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
-                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }} {{ advice.remark }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}  {{ advice.remark }}</span>
                         </td>
                       <td height="32px">
                         <span
@@ -2387,7 +2388,7 @@
                         />
                       </td>
                         <td height="32px">
-                          
+
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
@@ -2550,7 +2551,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id == 10489"
+                      v-if="org_id ==10206 || org_id ==10633 || org_id == 10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2573,8 +2574,8 @@
 
                         "
                         >
-                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
-                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}{{ advice.remark }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}{{ advice.remark }}</span>
                         </td>
                       <td height="32px">
                         <span
@@ -3918,8 +3919,10 @@
                             v-if="
                               advice.parent_id == 0 && advice.remark.length > 0
                             "
-                            >({{ advice.remark }})</span
-                          >
+                            >({{ advice.remark }})
+
+                            
+                          </span>
                         </td>
 
                         <td height="32px">
@@ -5409,11 +5412,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-        
+
         if(this.advices!=null && this.advices.length>0){
           this.advice_jilurow = this.advices.length + 1;
         }
-       
+
 
         var childMap = {};
         for (const index in this.advices) {
@@ -5477,7 +5480,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489 || this.org_id == 0){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5525,7 +5528,7 @@ export default {
             }
          }
 
-      
+
 
          let projects = [];
         response.data.data.projects.map((item) => {
@@ -5551,7 +5554,7 @@ export default {
                 this.projects[i].project_team_id = 0
 
                 if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
-                 
+
                   this.projects[i].project_team = this.projects[i].team.project_team
                   this.projects[i].project_team_id = this.projects[i].team.id
                   this.projects[i].start_time = this.projects[i].start_time
@@ -5561,8 +5564,8 @@ export default {
                   this.projects[i].execution_staff= this.projects[i].execution_staff
                   this.projects[i].advice_name =  this.projects[i].team.project_team
                   this.projects[i].advice_doctor = this.projects[i].doctor
+                  this.projects[i].remark = this.projects[i].remark
 
-             
                   newHisArr.push(this.projects[i])
                   // this.doctor_advices_2.push(this.project[i])
                 }else{
@@ -5574,20 +5577,21 @@ export default {
                   this.projects[i].execution_time = this.projects[i].execution_time
                   this.projects[i].execution_staff= this.projects[i].execution_staff
                   this.projects[i].advice_doctor = this.projects[i].doctor
+                  this.projects[i].remark = this.projects[i].remark
                   newHisArr.push(this.projects[i])
 
 
                   // this.doctor_advices_2.push(this.projects[i])
                 }
 
-                
+
 
               }
 
             }
             }
 
-          
+
 
             for(let i=0;i<newHisArr.length;i++){
               newHisArr[i].advice_name_str = ""
@@ -5603,7 +5607,7 @@ export default {
 
         }
 
-       
+
 
         //针对内蒙古阿拉善
         if(this.org_id ==10206){
@@ -5706,7 +5710,7 @@ export default {
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
 
-        
+
         if (this.totollength > 18) {
           var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];

src/xt_pages/stock/config/goodList.vue

@@ -0,0 +1,243 @@
+<template>
+    <div>
+     <div class="page_inspection">
+        <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
+            <div class="cell clearfix" style="margin-bottom:0;">
+                <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
+                <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
+            </div>
+            <el-button type="primary" @click="openForm(0)">新增</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
+            <el-table-column prop="date" label="序号" width="80" align="center">
+                <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="名称" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.project_team}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="拼音助记符" width="140" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.pinyin}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="五笔助记符" width="140" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.wubi}}
+                </template>
+            </el-table-column>
+            <el-table-column label="价格" width="100" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.price}}
+                </template>
+            </el-table-column>
+            <el-table-column label="排序" width="100" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.sort}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="备注" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.remark}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="date" label="操作" width="300" align="center">
+                <template slot-scope="scope">
+                    <el-button @click="editProjectTeam(scope.row.id)" type="primary" size="small">编辑</el-button>
+                    <el-button type="danger" size="small" @click="DeleteProjectTeam(scope.row.id,scope.$index)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+         >
+        </el-pagination> 
+
+        <el-dialog
+        title="组套详情"
+        :visible.sync="dialogVisible"
+        width="50%"
+       >
+        <span>
+        <el-form :model="form">
+          <el-row>
+            <el-col :span="24">
+                <el-form-item
+                    label="组套名称 : "
+                    prop="project_team"
+                    style="width: 100%"
+                    >
+                    <el-input
+                        style="width:200px"
+                        v-model="form.project_name"
+                        placeholder=""
+                        maxlength="30"
+                    ></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row> 
+          <el-row>
+             <el-col :span="24">
+                <el-form-item
+                    label="排序 : "
+                    prop="project_team"
+                    style="width: 100%"
+                    >
+                    <el-input
+                        style="width:200px"
+                        v-model="form.sort"
+                        placeholder=""
+                        maxlength="30"
+                    ></el-input>
+                </el-form-item>
+             </el-col>
+          </el-row>
+        
+     
+            <el-form-item label="组套明细:" style="width: 50%">
+                <el-select
+                    v-model="form.project_detail"
+                    filterable
+                    placeholder="请选择"
+                    @change="changeProject"
+                    
+                >
+                    <el-option
+                    v-for="item in goodList"
+                    :key="item.id"
+                    :label="item.good_str"
+                    :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="数量" style="width: 50%">
+                    <div style="display: flex">
+                        <el-input
+                        v-model="form.number"
+                        style="margin-right: 10px"
+                        ></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+            </el-form-item>
+            
+            <el-form-item>
+              <el-table
+                :data="tableData"
+                border
+                style="width: 100%">
+                <el-table-column
+                prop="date"
+                label="耗材名称&规格"
+                width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="数量"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                 prop="address"
+                  label="操作">
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+
+        </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
+import { getAllGoodInfoList,DeleteProjectTeam } from "@/api/project/project"
+export default {
+   
+    data(){
+        return{
+            search_input:'',
+            options: [{
+            value: '1',
+            label: '是'
+            }, {
+            value: '2',
+            label: '否'
+            },],
+            value: '',
+            tableData: [],
+            limit:10,
+            page:1,
+            total:0,
+            dialogVisible:false,
+            form:{
+                project_name:"",
+                sort:"", 
+                number:"",
+                project_detail:""
+            },
+            projectList:[],
+            goodList:[]
+        }
+    },
+    methods:{
+        changeProject(){
+            
+        },
+        getlist(){
+
+        },
+        handleCurrentChange(){
+
+        },
+        handleSizeChange(){
+
+        },
+        searchAction(){
+
+        },
+        addProjectList(){
+            
+        },
+        openForm(){
+         getAllGoodInfoList().then(response=>{
+            if(response.data.state ==1){
+               var goodList = response.data.data.goodList
+               if(goodList!=null && goodList.length>0){
+                 for(let i=0;i<goodList.length;i++){
+                   goodList[i].good_str = goodList[i].good_name+ " " + goodList[i].specification_name
+                 }
+               }
+               this.goodList = goodList
+               this.dialogVisible = true
+            }
+         })
+         
+        }
+    },
+    created(){
+     
+       this.getlist() 
+      
+    }
+}
+</script>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -911,6 +911,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
           type:1,
+          storehouse_id:this.storehouse_id,
         }
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
@@ -936,6 +937,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
+       this.getGoodDetailPrintList()
      }
   }
 };

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -987,6 +987,7 @@ export default {
           this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
+          this.tableDataList[i].patient_name = this.getPatientName(this.tableDataList[i].patient_id)
           this.tableDataList[i].out_count = this.tableDataList[i].count
           this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
           this.tableDataList[i].dealer_name = this.getDealerNameOne(this.tableDataList[i].GoodInfo.dealer)
@@ -1009,8 +1010,8 @@ export default {
       
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','time','number','product_date_name','expiry_date_name','user_name','in_price','price','out_count','total_price']
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','manufacturer_name','dealer_name','number','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
 

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -468,6 +468,7 @@ export default {
         start_time:this.start_time,
         end_time:this.end_time,
         order_type:this.order_type,
+        storehouse_id:this.storehouse_id,
       }
     
      getDrugWarehouseInfoPrint(params).then(response=>{
@@ -616,6 +617,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
+       this.getDrugWarehouseInfoPrint()
      }
   }
 };

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -318,10 +318,12 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
     getTypeName: function(row) {
       let name = "";
@@ -443,7 +445,7 @@ export default {
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&storehouse_id="+this.storehouse_id)
     },
     getlist(){
       var params = {
@@ -733,8 +735,8 @@ export default {
       console.log("hwhhwhwhwhwhw",this.tableData)
      
       import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','数量','总价']
-       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用人','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','number_bath','product_date_name','expiry_date_name','time','user_name','in_price','price','patient_name','count','total_price']
 
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
@@ -753,6 +755,7 @@ export default {
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
+            this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id) 
             if(this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
               if(this.tableData[i].count >=this.tableData[i].min_number){
@@ -970,6 +973,7 @@ export default {
          start_time:this.start_time,
          end_time:this.end_time,
          order_type:2,
+         storehouse_id:this.storehouse_id,
       }
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
@@ -1166,6 +1170,7 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.getlist()
+       this.getDrugOutOrderPrint()
      }
   }
 };

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -139,6 +139,7 @@
         keyword:this.$route.query.keyword,
         limit:this.$route.query.limit,
         page:this.$route.query.page,
+        storehouse_id:this.$route.query.storehouse_id,
         cancelStockDate:[],
         drugList:[],
         org_id:0,
@@ -230,6 +231,7 @@
           start_time:this.start_time,
           end_time:this.end_time,
           order_type:parseInt(this.order_type),
+          storehouse_id:parseInt(this.storehouse_id),
         }
       
         getDrugOutOrderPrint(params).then(response=>{

src/xt_pages/stock/index.vue

@@ -23,6 +23,10 @@
             <automatic-reduce></automatic-reduce>
           </el-tab-pane>
 
+          <!-- <el-tab-pane label="耗材套装">
+            <good-list></good-list>
+          </el-tab-pane> -->
+
         </el-tabs>
 
       </div>
@@ -37,7 +41,7 @@
   import GoodType from './config/goodType'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import AutomaticReduce from './config/automaticReduce'
-  
+  import GoodList from './config/goodList'
   export default {
     name: 'service',
     components: {
@@ -47,7 +51,7 @@
       Manufacturer,
       Dealer,
       BreadCrumb,
-      
+      GoodList,
     },
     data() {
       return {

src/xt_pages/stock/stockInOrder.vue

@@ -362,6 +362,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="耗材追溯码" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.good_code}}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">

src/xt_pages/stock/stockInOrderAdd.vue

@@ -239,6 +239,16 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+              <template slot-scope="scope">
+               <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+            </template>
+          
+          </el-table-column>
+
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
               <el-input placeholder="请输入备注" v-model="scope.row.remark"></el-input>
@@ -274,8 +284,28 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
 
-
+ 
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 
 </template>
@@ -380,8 +410,8 @@
             price: '',
             remark: '',
             dealer: '',
-            manufacturer: ''
-
+            manufacturer: '',
+            good_code:""
           },
           isCreated: 1
 
@@ -422,7 +452,12 @@
         showCheck:false,
         showReturnCheck:false,
         warehousing_info_id:0,
-        org_id:0
+        org_id:0,
+        dialogVisible:false,
+        currentRow:{},
+        currentIndex:0,
+        textarea:""
+
       }
     },
     methods: {
@@ -579,6 +614,7 @@
         tempObj["packing_price"] = ""
         tempObj["id"] = 0
         tempObj['register_number'] = ''
+        tempObj['good_code'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -795,6 +831,7 @@
                   list[i].product_date = this.getTimeOne(list[i].product_date)
                   list[i].good_name = list[i].GoodInfo.good_name
                   list[i].name = list[i].GoodInfo.specification_name +"/"+ list[i].GoodInfo.packing_unit
+                  list[i].good_code = list[i].good_code
                 }
                 this.recordInfo.recordData = []
                 this.recordInfo.recordData = list
@@ -969,7 +1006,31 @@
           return ""
          }
        }
-     }
+     },
+     changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
     }
     ,
     created() {
@@ -1003,6 +1064,7 @@
       tempObj['packing_price']= ''
       tempObj['id']= 0
       tempObj['register_number'] = ''
+      tempObj['good_code'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -301,6 +301,18 @@
                </el-select>
             </template>
           </el-table-column>
+
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+           <template slot-scope="scope">
+              <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+           </template>
+       
+         </el-table-column>
+
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  :disabled ="disabled"></el-input>
@@ -349,6 +361,26 @@
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -451,6 +483,11 @@ export default {
       list:[],
       is_check:0,
       order_id:0,
+      org_id:0,
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:""
     };
   },
   methods: {
@@ -482,6 +519,7 @@ export default {
             tempForm["remark"] = "";
             tempForm["dealer"] = "";
             tempForm["manufacturer"] = "";
+            tempForm["good_code"] = ""
             this.recordInfo.recordData.splice(
               this.currentIndex + 1,
               0,
@@ -570,6 +608,7 @@ export default {
       tempObj["manufacturer"] = "";
       tempObj["license_number"] = ""
       tempObj["packing_price"] = ""
+      tempObj["good_code"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -775,6 +814,7 @@ export default {
                 list[i].product_date = this.getTimeOne(list[i].product_date)
                 list[i].good_name = list[i].GoodInfo.good_name
                 list[i].name = list[i].GoodInfo.specification_name
+                list[i].good_code = list[i].good_code
                }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
@@ -848,6 +888,7 @@ export default {
             tempObj["manufacturer"] = "";
             tempObj["license_number"] = ""
             tempObj["register_number"] = ""
+            tempObj["good_code"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }
@@ -906,6 +947,11 @@ export default {
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
+
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].packing_price = "0"
             }else{
@@ -920,6 +966,15 @@ export default {
             }else{
               this.recordInfo.recordData[i].dealer = val.dealer
             }
+
+
+
+            // for(let i=0;i<this.recordInfo.recordData.length;i++){
+            //   this.recordInfo.recordData[i].warehouse_info_str = ""
+            //   for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+            //     this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+            //   }
+            // }
           
           }
         }
@@ -995,10 +1050,35 @@ export default {
          return ""
         }
       }
-    }
+    },
+    changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
      
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -148,10 +148,20 @@
                   type="number"
                   v-model="scope.row.stock_count"
                 ></el-input>
+                
               </el-form-item>
             </template>
           </el-table-column>
 
+          <!-- <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余批次详情</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.warehouse_info_str }} 
+            </template>
+          </el-table-column> -->
+
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -450,7 +460,8 @@ export default {
       loading:false,
       patients:[],
       classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
-
+      tableWarehouseInfoList:[],
+      org_id:0,
     };
   },
   methods: {
@@ -830,6 +841,7 @@ export default {
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
                     warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
+                    
 
                  }
                  this.recordInfo.recordData = warehouseOutInfoList
@@ -921,7 +933,8 @@ export default {
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             this.recordInfo.recordData[i].patient_id = 0
-             
+            this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
             }else{
@@ -941,6 +954,10 @@ export default {
               this.recordInfo.recordData[i].price = val.packing_price
             }
 
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
             if(val.dealer == 0){
@@ -949,6 +966,13 @@ export default {
              this.recordInfo.recordData[i].dealer = val.dealer
             }
 
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              this.recordInfo.recordData[i].warehouse_info_str = ""
+              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+                this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+              }
+            }
+
             console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
 
@@ -967,6 +991,7 @@ export default {
           var list = response.data.data.list
           this.numberList = list
           // var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
+          // this.tableWarehouseInfoList = lastWarehouseInfoTwo
         }
      })
     },
@@ -1062,7 +1087,7 @@ export default {
 
   },
   created() {
-
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;

src/xt_pages/user/components/PatientDetail.vue

@@ -286,7 +286,7 @@
                 <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
               </el-form-item>
             </el-col>
-            
+
              <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
@@ -639,7 +639,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-           
+
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
@@ -1209,12 +1209,12 @@
                   <td colspan="8">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >  {{ patientPrint.remark }}</div>
                   </td>
                 </tr>
 
-              
+
 
                 <tr>
                   <td>
@@ -1235,7 +1235,7 @@
                   <td colspan="7">
                     <div
                       class="td_proj_content td_align_left"
-                     
+
                     >
                      {{ patientPrint.treatment_plan }}
                    </div>
@@ -1251,8 +1251,8 @@
                 {{getTime(patientPrint.created_time)}}</span>
                 <span v-else>{{ printDate }}</span> -->
 
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
 
               </div>
               <div class="proj">
@@ -1356,10 +1356,10 @@
                     血管通路
                   </td>
                   <td colspan="3" style="padding: 3px 0px;font-size: 17px;">
-                    
+                     {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }}
                   </td>
                 </tr>
-                
+
                 <tr>
                   <td style="padding: 3px 0px;font-size: 17px; font-weight: 500;">
                     主诉
@@ -1403,7 +1403,7 @@
                   </td>
                   <td colspan="3">
                     <div class="td_proj_content td_align_left">
-                     
+
                     </div>
                   </td>
                 </tr>
@@ -1443,7 +1443,7 @@
                   <td colspan="9">
                     <div
                       class="td_proj_content td_align_left"
-                      
+
                     ></div>
                   </td>
                 </tr>
@@ -1468,7 +1468,7 @@
                       v-html="patientPrint.treatment_plan"
                     ></div>
                   </td>
-                </tr>  
+                </tr>
               </tbody>
             </table>
             <div class="print_footnote_panel">
@@ -1482,8 +1482,8 @@
               </div>
               <div class="proj" style="text-align: right;">
                 <span class="proj_title">日期：</span>
-                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span> 
-                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span> 
+                <span v-if="patientPrint.print_date>0">{{getTime(patientPrint.print_date)}}</span>
+                <span v-if="patientPrint.print_date<=0">{{getTime(patientPrint.created_time)}}</span>
               </div>
             </div>
           </div>
@@ -1728,6 +1728,7 @@ export default {
       ],
       operators:[],
       liuAddresslist:[],
+      patientVascularAccessOne:{},
     };
   },
   computed: {
@@ -1822,6 +1823,7 @@ export default {
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
             console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
@@ -2108,8 +2110,8 @@ export default {
               /\n/g,
               "<br/>"
             );
-            
-            
+
+
 
             this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
               /\n/g,

src/xt_pages/workforce/appointment.vue

@@ -91,7 +91,7 @@
       </div>
     </div>
     <div>
-      
+
       <div class="app-container" style="padding: 0 20px 20px 20px;">
         <div>
           <div style="position: relative;height: 57px">
@@ -1216,7 +1216,7 @@ export default {
 
           })
           console.log("tablesit",this.tableList)
-      
+
           const filename = '排班模版'
 
           if (this.$store.getters.xt_user.org.id == 10234) {
@@ -5075,7 +5075,6 @@ export default {
           mode_name = this.mode[i].name
         }
       }
-      console.log("mode_name--",mode_name)
       return mode_name
     }
   },