导出

src/xt_pages/data/components/addDrugs.vue

@@ -146,14 +146,24 @@
               <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" >
-              <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
                 <el-option
                   v-for="item,index in manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select> -->
+
+            <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="item in manufacturerList"
+                    :key="item.id"
+                    :label="item.manufacturer_name"
+                    :value="item.id">
+                  </el-option>
+            </el-select>
+
             </el-form-item>
             <el-form-item label="药理分类 : " prop="pharmacology_category">
               <el-select v-model="form.pharmacology_category" style="width:160px;" placeholder="请选择">
@@ -333,6 +343,7 @@
   import {
     getAdviceConfig,
   } from '@/api/advice'
+ import { getManufacturerList } from "@/api/stock";
   export default {
     data() {
       return {
@@ -422,7 +433,10 @@
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
           manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
-        }
+        },
+        page:1,
+        limit:500,
+        manufacturerList:[]
       }
     },
     props: {
@@ -440,7 +454,7 @@
         type: Number,
         default: 1
       }
-
+      
     },
     methods: {
       cancle: function(formName) {
@@ -574,11 +588,26 @@
 
         return form
       },
+      getlist(){
+         var params = {
+             page:this.page,
+             limit:this.limit
+          }
+          console.log("params2222222",params)
+        getManufacturerList(params).then(response=>{
+           var manufacturerList =   response.data.data.manufacturer
+           console.log("列表2222222",manufacturerList)
+           this.manufacturerList = manufacturerList
+        })
+      }
     }, watch: {
       visible(val) {
         // this.form = this.formValue
 
       }
+    },
+    created(){
+      this.getlist()
     }
   }
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue

@@ -52,7 +52,10 @@
                             <td width="10"></td>
                             <td width="50">性 别:</td>
                             <td width="60">
-                                <div class="under-line">{{ record.patient.gender ? "男" : "女" }}</div>
+                                <div class="under-line">
+                                  <span v-if=" record.patient.gender == 1">男</span>
+                                  <span v-if=" record.patient.gender == 2">女</span>
+                                </div>
                             </td>
                             <td width="10"></td>
                             <td width="50">年 龄:</td>

src/xt_pages/dialysis/components/allSummary.vue

@@ -239,7 +239,7 @@ export default {
           this.getlist()
           this.getAllMaterial()
         },
-           search(){
+          search(){
           //  if(this.selected_date==""){
           //     this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
           //   }

src/xt_pages/dialysis/components/allSummaryDialog.vue

@@ -66,6 +66,7 @@
 const moment = require('moment')
 import { parseTime } from "@/utils";
 import {getGatherList} from "@/api/consumable"
+
 export default {
     data(){
         return{
@@ -83,7 +84,8 @@ export default {
             partitionType: 0,
             tableData: [],
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD")
+            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            stockTotal:[]
         }
     },
     created(){
@@ -141,6 +143,8 @@ export default {
             }
           })
         }
+
+      
     }
 }
 </script>

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -20,24 +20,24 @@
         placeholder="选择日期"
         @change="selectEndtime">
       </el-date-picker>
-      <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+      <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
 
     </div>
     <div style="margin-top:10px;">
       <el-table :data="tableData" border style="width: 100%" height="300px">
-        <el-table-column align="center" prop="date" label="商品类型" width="180">
+        <el-table-column align="center" prop="date" label="耗材类型" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_type_name}}
+            {{scope.row.good_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="规格名称" width="180">
           <template slot-scope="scope">
-            {{scope.row.good_name}}
+            {{scope.row.specification_name}}
           </template>
         </el-table-column>
         <el-table-column align="center" prop="address" label="数量">
           <template slot-scope="scope">
-            {{scope.row.count}}
+            {{getStockCount(scope.row.id)}}
           </template>
         </el-table-column>
       </el-table>
@@ -50,7 +50,7 @@
   const moment = require('moment')
   import { GetDialysisGoodStatistics } from '@/api/dialysis'
   import { parseTime } from '@/utils'
-
+  import { getPrintStockGood } from '@/api/stock'
   export default {
     props: {
       list: Array
@@ -62,7 +62,8 @@
           end_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD')
         },
         visible: false,
-        startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        // startTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        startTime:moment().startOf('month').format("YYYY-MM-DD"),
         endTime: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         schedulArr: [
           { value: 0, label: '全部班' },
@@ -76,7 +77,8 @@
         partitionType: 0,
         tableData: [],
         start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD')
+        end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+        stockTotal:[]
       }
     },
     created() {
@@ -119,8 +121,8 @@
         done()
       },
       show() {
-        this.GetDialysisGoodStatistics()
-
+        // this.GetDialysisGoodStatistics()
+        this.getlist()
         this.visible = true
       },
 
@@ -136,9 +138,40 @@
         this.GetDialysisGoodStatistics()
 
       },
+       getlist(){
+          var params = {
+            start_time:this.startTime,
+            end_time:this.endTime,
+            type:3
+          }
+          console.log("param2222222",params)
+          getPrintStockGood(params).then(response=>{
+            var stockTotal = response.data.data.stockTotal
+            console.log("stocktOTl",stockTotal)
+            this.stockTotal = stockTotal
+            for (let i = 0; i < response.data.data.list.length; i++) {
+               if (response.data.data.list[i].query_warehouseout_info.length > 0) {
+                  this.tableData.push(response.data.data.list[i])
+               }
+             }
+             console.log("表哥22222222222",this.tableData) 
+          })
+       },
+
       toPrint() {
         this.$router.push('/dialysis/consumables_print?startime=' + this.start_time + '&endtime=' + this.end_time)
-      }
+      },
+      getStockCount(id){
+       
+       var count = ""
+       for(let i=0;i<this.stockTotal.length;i++){
+          if(id == this.stockTotal[i].good_id){
+             count = this.stockTotal[i].count
+          }
+       }
+       return count
+     }
+    
 
     }
   }

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

@@ -596,7 +596,7 @@
          } 
 
          if(str.indexOf('透析时长')!=-1 && this.prescription!=null){
-            arr.push("透析时长:"+this.prescription.dialysis_duration)
+            arr.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysis_duration:""))
          }
 
         if(str.indexOf('透析时长')!=-1 && this.prescription==null){
@@ -604,7 +604,7 @@
          }
         
         if(str.indexOf("目标超滤量")!=-1 && this.prescription!=null){
-           arr.push("目标超滤量:"+this.prescription.target_ultrafiltration)
+           arr.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
         }
         if(str.indexOf("目标超滤量")!=-1 && this.prescription==null){
            arr.push("目标超滤量:")
@@ -924,10 +924,7 @@
     },
     watch: {
       isVisibility(val) {
-         console.log("333333333",this.patient)
-        console.log("透前评估23455",this.predialysis_evaluation)
-        console.log("透析处方23567",this.prescription)
-        console.log("双人核对",this.double_check)
+      
         if(this.prescription!=null && this.prescription.id!=0){
           this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
           this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
@@ -957,49 +954,49 @@
              console.log("222222",this.checkList)
            }
            if(this.double_check.dialysis_item_desc.indexOf("穿刺针")!=-1){
-              this.checkList.push("穿刺针:"+this.predialysis_evaluation.puncture_needle)
+              this.checkList.push("穿刺针:"+(this.predialysis_evaluation.puncture_needle?this.predialysis_evaluation.puncture_needle:""))
            }
            if(this.double_check.dialysis_item_desc.indexOf("透析液配方:")!=-1){
               this.checkList.push("透析液配方:"+this.GetDialysateFormulationById(this.prescription.dialysate_formulation))
            }
            if(this.double_check.dialysis_item_desc.indexOf("钾:")!=-1){
-              this.checkList.push("钾:"+this.prescription.kalium)
+              this.checkList.push("钾:"+(this.prescription.kalium?this.prescription.kalium:""))
            }
            if(this.double_check.dialysis_item_desc.indexOf("钙:")!=-1){
-               this.checkList.push("钙:"+this.prescription.calcium)
+               this.checkList.push("钙:"+(this.prescription.calcium?this.prescription.calcium:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析模式:")!=-1){
               this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
-              this.checkListOne.push("透析时长:"+this.prescription.dialysis_duration)
+              this.checkListOne.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysate_formulation:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("目标超滤量")!=-1){
-              this.checkListOne.push("目标超滤量:"+this.prescription.target_ultrafiltration)
+              this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("抗凝剂")!=-1){
               this.checkListOne.push("抗凝剂:"+this.getAnticoagulant(this.prescription.anticoagulant))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("首剂")!=-1){
-              this.checkListOne.push("首剂:"+this.prescription.anticoagulant_shouji)
+              this.checkListOne.push("首剂:"+(this.prescription.anticoagulant_shouji?this.prescription.anticoagulant_shouji:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("维持")!=-1){
-              this.checkListOne.push("维持:"+this.prescription.anticoagulant_weichi)
+              this.checkListOne.push("维持:"+(this.prescription.anticoagulant_weichi?this.prescription.anticoagulant_weichi:""))
            }
           if(this.double_check.dialysis_parameter_desc.indexOf("总量")!=-1){
-              this.checkListOne.push("总量:"+this.prescription.anticoagulant_zongliang)
+              this.checkListOne.push("总量:"+(this.prescription.anticoagulant_zongliang?this.prescription.anticoagulant_zongliang:""))
            }
           if(this.double_check.dialysis_parameter_desc.indexOf("置换液")!=-1){
-              this.checkListOne.push("置换液:"+this.prescription.displace_liqui_part)
+              this.checkListOne.push("置换液:"+(this.prescription.displace_liqui_part?this.prescription.displace_liqui_part:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("置换总量")!=-1){
-             this.checkListOne.push("置换总量:"+this.prescription.replacement_total)
+             this.checkListOne.push("置换总量:"+(this.prescription.replacement_total?this.prescription.replacement_total:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("处方血流量")!=-1){
-             this.checkListOne.push("处方血流量:"+this.prescription.blood_flow_volume)
+             this.checkListOne.push("处方血流量:"+(this.prescription.blood_flow_volume?this.prescription.blood_flow_volume:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析液流量")!=-1){
-             this.checkListOne.push("透析液流量:"+this.prescription.dialysate_flow)
+             this.checkListOne.push("透析液流量:"+(this.prescription.dialysate_flow?this.prescription.dialysate_flow:""))
            }
            if(this.double_check.vascular_access_desc.indexOf("通路类型")!=-1){
              this.checkListTwo.push("通路类型:"+this.getBloodAccess(this.predialysis_evaluation.blood_access_part_opera_id))

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -661,12 +661,18 @@
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
                     </td>
-                    <td width="10">ml,</td>
+                    <td width="15">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml,</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu,</span>
+                     </td>
                     <td width="60">追加量</td>
                     <td width="60">
                         <div class="under-line">&nbsp;{{ (prescription.anticoagulant == '阿加曲班' || prescription.anticoagulant == '普通肝素') && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
                     </td>
-                    <td width="10">ml</td>
+                    <td width="10">
+                      <span v-if="prescription.anticoagulant =='阿加曲班'">ml</span>
+                      <span v-if="prescription.anticoagulant =='普通肝素'">iu/h</span>
+                    </td>
                     <td width="10">）</td>
                     <td width="100">
                         <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -54,13 +54,20 @@
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
-              <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                 <el-option
                   v-for="item,index in form.manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
-                </el-option>
+                </el-option> -->
+                <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="item in manufacturerList"
+                    :key="item.id"
+                    :label="item.manufacturer_name"
+                    :value="item.id">
+                  </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="单位 : " prop="good_unit">
@@ -241,7 +248,7 @@
 
 <script>
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
-
+  import { getManufacturerList } from "@/api/stock";
   export default {
     name: 'goodInfoDailog',
     data() {
@@ -458,6 +465,18 @@
         return form
       }, changeSelected: function(val) {
         console.log(val)
+      },
+      getlist(){
+         var params = {
+             page:this.page,
+             limit:this.limit
+          }
+          console.log("params2222222",params)
+        getManufacturerList(params).then(response=>{
+           var manufacturerList =   response.data.data.manufacturer
+           console.log("列表2222222",manufacturerList)
+           this.manufacturerList = manufacturerList
+        })
       }
     },
     watch: {
@@ -469,6 +488,9 @@
           this.good_unit = ''
         }
       }
+    },
+    created(){
+      this.getlist()
     }
   }