新分支

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume,dialysis_strainer) {
+export function startDialysis(dialysis_strainer,patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -76,6 +76,7 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     blood_flow_volume:blood_flow_volume,
     dialysis_strainer:dialysis_strainer,
   }
+  console.log("dialysis_strainer",dialysis_strainer)
   console.log('params', params)
   return request({
     url: '/api/dialysis/start_record',

src/api/drug/drug.js

@@ -754,4 +754,14 @@ export function toCheckSelfWarehousingInfo(params){
     method:"get",
     params:params,
   })
+}
+
+
+export function postSelfDrugOutInfoWarehouse(){
+  
+  return request({
+    url:"/api/drug/postselfdrugwarehouse",
+    method:"Get",
+    params:params,
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -42,6 +42,14 @@ export default {
       meta: { title: '自备药出库', noCache: true }
 
     },
+    {
+      path: '/stock/selfwarehouse/out/add',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/addWarehouseOut'),
+      name: 'SelfeditWarehouseOut',
+      meta: { title: '自备药出库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

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

@@ -30,7 +30,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -927,17 +927,16 @@ export default {
           }else{
             blood_drawing = ""
           }
-
-
-
           console.log("质控护士", this.form.quality_nurse_id);
           console.log("this.form.nuclein_date", this.form.nuclein_date);
-          console.log("dialysis_strainer------------------",this.form.dialysis_strainer)
+         
+
+          var dialysis_strainer = this.form.dialysis_strainer
+          console.log("dialysis_strainer------------------",dialysis_strainer)
           startDialysis(
+            dialysis_strainer,
             this.patient_id,
-            this.schedule_date
-              ? parseTime(this.schedule_date, "{y}-{m}-{d}")
-              : parseTime(new Date(), "{y}-{m}-{d}"),
+            this.schedule_date? parseTime(this.schedule_date, "{y}-{m}-{d}"): parseTime(new Date(), "{y}-{m}-{d}"),
             this.form.nurse_id,
             this.form.bed_id,
             this.form.lood_drawing,
@@ -959,7 +958,7 @@ export default {
             this.form.nuclein_date,
             this.form.catheter_operation,
             this.form.blood_flow_volume,
-            this.form.dialysis_strainer,
+            
           ).then((rs) => {
             this.loading = false;
             var resp = rs.data;

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

@@ -2862,6 +2862,94 @@ mu
             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if(this.$store.getters.xt_user.org.id == 10693){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if(this.$store.getters.xt_user.org.id == 10694){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10587){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10587){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }

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

@@ -407,6 +407,8 @@
               }}
             </template>
           </el-table-column>
+
+
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
@@ -460,6 +462,23 @@
               }}
             </template>
           </el-table-column>
+
+
+          <el-table-column 
+            align="center"
+            label="超滤率(ml/h)"
+            width="100"
+            v-if="isShow('超滤率2')">
+            <template slot-scope="scope">
+              {{
+                scope.row.ultrafiltration_rate_one
+                  ? scope.row.ultrafiltration_rate_one
+                  : ""
+              }}
+            </template>
+
+          </el-table-column>
+
           <el-table-column
             prop="sodium_concentration"
             align="center"
@@ -582,7 +601,7 @@
                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -614,7 +633,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -954,7 +973,17 @@
             </template>
           </el-table-column>
 
-
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="剩余肝素(ml)"
+            width="140"
+            v-if="isShow('剩余肝素')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.heparin_one }}
+            </template>
+          </el-table-column>
 
 
           <el-table-column
@@ -1256,6 +1285,13 @@
             </el-form-item>
           </el-col>
 
+          <el-col  :span="8" v-if="isShow('超滤率2')">
+            <el-form-item label="超滤率(ml/min)" :prop="isName('超滤率')"
+              :rules="isCheckmust('超滤率')">
+              <el-input v-model="form.ultrafiltration_rate_one" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col
             :span="8"
             v-if="
@@ -1474,7 +1510,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1506,7 +1542,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -1739,6 +1775,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('剩余肝素')">
+            <el-form-item label="剩余肝素(ml)：" :prop="isName('剩余肝素')"
+              :rules="isCheckmust('剩余肝素')">
+              <el-input  v-model="form.heparin_one" ></el-input>
+            </el-form-item>
+          </el-col>
 
 
           <!-- </el-row>
@@ -1759,6 +1801,9 @@
           </el-col>
 
 
+          
+
+
 
           <!-- </el-row>
 
@@ -1996,6 +2041,8 @@ export default {
         replacement_speed:"",
         dicarbonate:"",
         is_pressure:"",
+        ultrafiltration_rate_one:"",
+        heparin_one:""
       },
 
       table_current_row: null,
@@ -2724,6 +2771,10 @@ export default {
        this.form.dicarbonate =parseFloat(this.form.dicarbonate) == NaN ? 0: parseFloat(this.form.dicarbonate);
        this.form.is_pressure = this.form.is_pressure
 
+      this.form.ultrafiltration_rate_one = this.form.ultrafiltration_rate_one
+
+      this.form.heparin_one = this.form.heparin_one
+
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";
@@ -2882,6 +2933,9 @@ export default {
               parseFloat(this.form.heparin_amount) == NaN
                 ? 0
                 : parseFloat(this.form.heparin_amount);
+              this.form.ultrafiltration_rate_one = this.form.ultrafiltration_rate_one
+              this.form.heparin_one = this.form.heparin_one
+
             this.$message.error(resp.msg);
             if(resp.code == 600000008){
               this.infoDialogVisible = true

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -19,13 +19,14 @@
           <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677) && org_id!=10558 && org_id!=10598 && org_id!=10414" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677) || org_id == 10558 || org_id ==10598 || org_id ==10414" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
@@ -33,6 +34,7 @@
           <th v-if="isShow('置换液流量') && (template_id == 27 ||  template_id == 60)" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
+          <th v-if="isShow('剩余肝素')" width="92px">剩余肝素(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量') && org_id!=10340 && org_id!=0" width="92px">累计血容量 
             <span v-if="template_id !=41 && org_id!=9671 && org_id!=9538 && org_id!=10340">(ml)</span>
@@ -69,6 +71,7 @@
             <span v-if="org_id ==9671 || org_id==10440">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
           </td>
           <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
+          <td v-if="isShow('超滤率2')" >{{monitor.ultrafiltration_rate_one?monitor.ultrafiltration_rate_one:''}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
           <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "" }} </td>
@@ -79,6 +82,7 @@
           <td v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </td>
           <td v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </td>
           <td v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </td>
+          <th v-if="isShow('剩余肝素')">{{ monitor.heparin_one?monitor.heparin_one:"" }}</th>
           <td v-if="isShow('抗凝剂')">
             <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
             <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -2310,7 +2310,8 @@
                         </span>
                         <img
                           :style="{'height':org_id==10597 ? '25px':'35px'}"
-                          :src="setAdminUserES(check == null ? 0 : check.modifier)
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.modifier)
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -844,18 +844,21 @@ export default {
              }
           }
           console.log("医嘱天天吞吞吐吐",this.tableAdvice)
-          if (tableAdvice.length <= 8) {
-            const length = 8 - tableAdvice.length
-            var obj = { advice_name: '', start_time: '' }
-            for (i = 0; i < length; i++) {
-              console.log(1)
-              tableAdvice.push(obj)
-            }
+          if(this.tableAdvice!=null && this.tableAdvice.length >0){
+            if (tableAdvice.length <= 8) {
+              const length = 8 - tableAdvice.length
+              var obj = { advice_name: '', start_time: '' }
+              for (i = 0; i < length; i++) {
+                console.log(1)
+                tableAdvice.push(obj)
+              }
 
-            this.tableAdvice = tableAdvice
-          }else{
-            this.tableAdvice = tableAdvice
+             this.tableAdvice = tableAdvice
+            }else{
+              this.tableAdvice = tableAdvice
+            }
           }
+        
           console.log("tableAdvice", this.tableAdvice);
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;
           console.log("透后评估", this.afterdialysis);

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -132,7 +132,7 @@
                   white-space: normal;
                 "
               >
-                <span v-if="dialysisOrder !=null" >
+                <span v-if="dialysisOrder !=null&&dialysisOrder.dialysis_dialyszers!=''" >
                   {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
                 </span>
                 <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
@@ -562,7 +562,7 @@
                 <td width="50">{{monitor.blood_flow_volume ? monitor.blood_flow_volume: "/"}}</td>
                 <td width="50">{{ monitor.conductivity ? monitor.conductivity : "/" }}</td>
                 <td width="50">
-                  <span v-if="monindex == 0">
+                  <!-- <span v-if="monindex == 0">
                     {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0" }}
                   </span>
                   <span v-else-if="monindex == ( monitors.length-1)">
@@ -570,8 +570,8 @@
                   </span>
                   <span v-else>
                     {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}
-                  </span>
-                  
+                  </span> -->
+                  {{ monitor.ultrafiltration_rate_one ? monitor.ultrafiltration_rate_one:"" }}
                 </td>
                 <td width="50">
                   <span v-if="monindex == 0">
@@ -586,7 +586,7 @@
                 </td>
                 <!-- 剩余肝素 -->
                 <td width="65">
-                  <span v-if="monindex == 0">
+                  <!-- <span v-if="monindex == 0">
                     {{ monitor.heparin ? monitor.heparin :'0' }}
                   </span>
                   <span v-else-if="monindex == ( monitors.length-1)">
@@ -594,8 +594,10 @@
                   </span>
                   <span v-else>
                     {{ monitor.heparin ? monitor.heparin: "/" }}
-                  </span> 
+                  </span>  -->
                   <!-- {{ monitor.heparin != '' ? monitor.heparin :'/' }}-->
+                    <!-- {{ monitor.heparin?monitor.heparin:"" }} -->
+                      {{ monitor.heparin_one?monitor.heparin_one:"" }}
                 </td>
                 <td width="200">
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -322,6 +322,15 @@
                </tr>
             </template>
           </el-table-column>
+          <el-table-column label="出库班次" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ getClassType(scope.row.drug_id)}}
+                  </td>
+               </tr>
+            </template>
+          </el-table-column>
           <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
                 <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
@@ -867,6 +876,8 @@ export default {
             this.houseList.push(response.data.data.houseList[i]);
           }
           var objOne = {id:0,name:"系统"}
+          var objTwo = {id:-1,name:"血透室"}
+          this.patients.push(objTwo)
           this.patients.push(objOne)
           for(let i=0;i<response.data.data.patients.length;i++){
              this.patients.push(response.data.data.patients[i])
@@ -2547,6 +2558,15 @@ export default {
          }
       }
       return str
+    },
+    getClassType(drug_id){
+      var str = ""
+      for(let i=0;i<this.outList.length;i++){
+         if(drug_id == this.outList[i].drug_id){
+            str = this.outList[i].class_type
+         }
+      }
+      return str
     }
   },
 };

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -250,6 +250,21 @@
           </el-table-column>
 
 
+          <el-table-column label="使用班次"  width="100" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.class_type" filterable placeholder="请选择出库班次">
+                <el-option
+                  v-for="(option, index) in classType"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
+
+
           <el-table-column label="使用患者"  width="150" align="center">
             <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
@@ -517,6 +532,7 @@ export default {
       showReturnCheck:false,
       warehouse_out_id:0,
       patients:[],
+      classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
     };
   },
   methods: {
@@ -560,15 +576,15 @@ export default {
           this.list = response.data.data.list;
           this.doctorList = response.data.data.doctorList;
           var obj ={id:0,name:"系统"}
+          var objOne = {id:-1,name:"血透室"}
           this.patients =[]
+          this.patients.push(objOne)
           this.patients.push(obj)
           if(response.data.data.patients!=null){
             for(let i=0;i<response.data.data.patients.length;i++){
               this.patients.push(response.data.data.patients[i])
             }
           }
-          // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
-        
         }
         loading.close();
       });
@@ -619,6 +635,7 @@ export default {
       tempObj["patient_id"] =0
       tempObj["expiry_date"] = ""
       tempObj["product_date"] = ""
+      tempObj["class_type"]= ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -1236,6 +1253,7 @@ export default {
     tempObj["patient_id"] = 0
     tempObj["product_date"] = ""
     tempObj["expiry_date"]=""
+    tempObj["class_type"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -276,6 +276,19 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="使用班次"  width="100" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.class_type" filterable placeholder="请选择出库班次">
+                <el-option
+                  v-for="(option, index) in classType"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <el-table-column label="使用患者" width="140" align="center">
             <template slot-scope="scope">
               <el-select
@@ -549,7 +562,8 @@ export default {
       storehouse_id: "",
       is_check:0,
       order_id:0,
-      patients:[]
+      patients:[],
+      classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
     };
   },
   methods: {
@@ -685,6 +699,7 @@ export default {
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
       tempObj["patient_id"] =0
+      tempObj["class_type"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -1004,6 +1019,8 @@ export default {
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count;
             response.data.data.list[i].last_price = response.data.data.list[i].last_price;
             response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
+            console.log("response.data.data.list[i].class_type",response.data.data.list[i])
+            response.data.data.list[i].class_type =  response.data.data.list[i].class_type
             this.recordInfo.recordData.push(response.data.data.list[i]);
           }
 
@@ -1035,8 +1052,10 @@ export default {
           this.houstList = response.data.data.houstList;
           this.doctorList = response.data.data.doctorList;
           var obj ={id:0,name:"系统"}
+          var objOne ={id:-1,name:"血透室"}
           this.patients =[]
           this.patients.push(obj)
+          this.patients.push(objOne)
           if(response.data.data.patients!=null){
             for(let i=0;i<response.data.data.patients.length;i++){
               this.patients.push(response.data.data.patients[i])

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -0,0 +1,934 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="handleWarehouse"
+        class="filter-item"
+        style="float: right"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增</el-button
+      >
+    </div>
+
+    <div class="app-container">
+      <div class="cell clearfix">
+        <label class="title"><span class="name">患者</span> :</label>
+        <el-select
+          size="small"
+          v-model="patient_id"
+          filterable
+          placeholder="请选择患者"
+          style="width: 200px"
+          @change="changeStoreHouse"
+        >
+          <el-option
+            v-for="(option, index) in patientList"
+            :key="index"
+            :label="option.name"
+            :value="option.id"
+          >
+          </el-option>
+        </el-select>
+        <el-input
+          size="small"
+          style="width: 200px"
+          v-model.trim="searchKey"
+          class="filter-item"
+          placeholder="单据编码/制单人/药品名称"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
+        <div style="margin-left: 10px">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
+        <!-- <div style="margin-left: 10px">
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_id"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeTypeName"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </div> -->
+      </div>
+
+      <div class="cell clearfix">
+        <el-checkbox
+          style="width: 70px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
+        <el-button size="small" type="primary" @click="drugPrint()"
+          >打印</el-button
+        >
+        <el-button size="small" type="primary" @click="toExport()" :disabled="exportLoding">导出</el-button>
+        <div>
+          <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select
+            size="small"
+            v-model="check_type"
+            filterable
+            placeholder="请选择仓库"
+            style="width: 200px"
+            @change="changeCheckType"
+          >
+            <el-option
+              v-for="(option, index) in checkList"
+              :key="index"
+              :label="option.name"
+              :value="option.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
+      <el-table
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        @current-change="handleCurrentChangeOne"
+      >
+        <el-table-column align="center" type="selection" width="55">
+        </el-table-column>
+
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.drug.drug_name }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+             {{ GetDrugTypeName(scope.row.drug.drug_type) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.drug.dose }} {{  scope.row.drug.dose_unit }} * {{ scope.row.drug.min_number}} {{ scope.row.drug.min_unit}} / {{ scope.row.max_unit }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.batch_number }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.warehousing_count }} {{ scope.row.max_unit }}
+          </template>
+        </el-table-column>
+
+      
+
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{ getManufacturer(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+             {{ getTime(scope.row.product_date) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.expiry_date) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.remark }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" width="240">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
+        background
+        style="margin-top: 20px; text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    
+    </div>
+
+ 
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import {
+  deleteDrugWarehouseInfo,
+  getDrugWarehouseInfoList,
+  exportDrugList,
+
+} from "@/api/drug/drug_stock";
+import { getAllDrugList } from "@/api/data";
+import { getDictionaryDataConfig } from "@/utils/data";
+import BreadCrumb from "../../components/bread-crumb";
+  import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo} from "@/api/drug/drug"
+export default {
+  name: "drugStockInOrder",
+  components: { BreadCrumb },
+  created() {
+    this.org_id = this.$store.getters.xt_user.org.id
+    if (this.$route.path == "/Pharmacy/drugs/stock/in") {
+      this.crumbs = [
+        { path: false, name: "药品管理" },
+        { path: "/stock/drugs/stock/query", name: "入库单·" },
+      ];
+    }
+    this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+    this.getallPatientList() 
+
+    this.getAllSelfDrugWarehouseInfoList()
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: false, name: "入库单" },
+      ],
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 5,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time: "",
+      selectedTableData: [],
+      Warehouse: {
+        loading: false,
+        warehouseDate: [],
+        tableCurrentIndex: "",
+      },
+
+      WarehouseInfo: {
+        loading: false,
+        warehouseInfoDate: [],
+      },
+      check_id: 0,
+
+      startTime: "",
+      dialogVisible: false,
+      showOne: false,
+      drugTypeList: [],
+      manufacturerList: [],
+      order_id: "",
+      dealerList: [],
+      exportList: [],
+      houseList: [],
+      storehouse_id: 0,
+      check_type: 0,
+      checkList: [
+        { id: 0, name: "全部" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
+      ],
+      exportLoding:false,
+      org_id:0,
+      patient_id:0,
+      patientList:[],
+      tableList:[],
+      manufacturerList:[],
+      dealerList:[],
+      drugTypeList:[],
+    };
+  },
+
+  methods: {
+    
+    getAllSelfDrugWarehouseInfoList(){
+        var params = {
+          keyword:this.searchKey,
+          patient_id:this.patient_id,
+        }
+        getAllSelfDrugWarehouseInfoList(params).then(response=>{
+          if(response.data.state ==1){
+            var infoList  =  response.data.data.infoList
+            console.log("infolist22222222222222",infoList)
+            this.tableList = infoList
+            this.manufacturerList = response.data.data.manufacturerList
+            this.dealerList = response.data.data.dealerList
+            this.drugTypeList = response.data.data.drugTypeList
+
+          }
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      // 把每一行的索引放进row
+      row.index = rowIndex;
+    },
+    onRowClick(row, event, column) {
+      this.WarehouseInfo.warehouseInfoDate = [];
+      this.Warehouse.tableCurrentIndex = row.index;
+      const params = {
+        id: row.id,
+      };
+      this.WarehouseInfo.loading = true;
+      getDrugWarehouseInfoList(params).then((response) => {
+        if (response.data.state == 0) {
+          this.WarehouseInfo.loading = false;
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.WarehouseInfo.loading = false;
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(
+              response.data.data.info[i]
+            );
+          }
+        }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
+        }
+      }
+      return name;
+    },
+    fetchAllDoctorAndNurse() {
+      fetchAllDoctorAndNurse().then((response) => {
+        if (response.data.state == 1) {
+          this.doctorOptions = response.data.data.doctors;
+        }
+      });
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then((response) => {
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
+            }
+          }
+        }
+      });
+    },
+    clicks: function () {},
+     handleWarehouse: function () {
+      this.$router.push({path:"/stock/selfwarehouse/info/add"})
+    },
+    handleSelectionChange: function (val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.startTime = this.getTimestamp(val);
+        this.start_time = val;
+        this.GetWarehouse();
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.end_time = val;
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function (val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+
+    handleEdit: function (index, row) {
+
+      this.$router.push({path:"/stock/selfwarehouse/info/edit?id="+row.id+"&is_sys="+row.is_sys+"&is_check="+row.is_check})
+      
+    },
+    search(){
+
+    },
+    handleSearch(id) {
+      this.WarehouseInfo.warehouseInfoDate = [];
+      this.GetOrderDetail(id);
+      this.dialogVisible = true;
+    },
+    GetOrderDetail(order_id) {
+      const params = {
+        id: order_id,
+      };
+
+      this.WarehouseInfo.warehouseInfoDate = [];
+      getDrugWarehouseInfoList(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          var obj = {total_count:0,is_total:1}
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            response.data.data.info[i].is_total = 0
+            this.showOne = true;
+            this.WarehouseInfo.warehouseInfoDate.push(
+              response.data.data.info[i]
+            );
+            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
+          }
+          this.WarehouseInfo.warehouseInfoDate.push(obj)
+        
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+          this.getAllDrugList();
+        }
+      });
+    },
+    handleDelete: function (index, row) {
+
+        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSelfWarehouseInfo(row.id).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.tableData.splice(index, 1)
+
+            }
+          })
+        })
+     },
+    changeAllSelected: function (val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      var ids = [];
+      for (let i = 0; i < selection.length; i++) {
+        ids.push(selection[i].id);
+      }
+      this.order_id = ids.join(",");
+      this.selectedTableData = selection;
+      this.exportDrugList();
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      const idOne = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        if (this.selectedTableData[i].is_check == 1) {
+          this.$message.error("已审核单据不能删除!");
+          return false;
+        }
+        if (this.selectedTableData[i].is_sys == 13) {
+          this.$message.error("调拨入库数据不能删除!");
+          return false;
+        }
+        ids.push(this.selectedTableData[i].id);
+        if (this.selectedTableData[i].supply_warehouse_id > 0) {
+          idOne.push(this.selectedTableData[i].supply_warehouse_id);
+        }
+      }
+
+      for (let i = 0; i < idOne.length; i++) {
+        if (idOne[i] > 0) {
+          this.$message.error("自动入库数据不能删除!");
+          return false;
+        }
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr,
+      };
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteDrugWarehouseInfo(params).then((response) => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
+                  if (ids[i] == this.Warehouse.warehouseDate[y].id) {
+                    this.Warehouse.warehouseDate.splice(y, 1);
+                  }
+                }
+              }
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    handleCurrentChangeOne(val) {
+      this.GetOrderDetail(val.id);
+    },
+    getTime(val) {
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    getDrugType(id) {
+      var name = "";
+      for (let i = 0; i < this.drugTypeList.length; i++) {
+        if (id == this.drugTypeList[i].id) {
+          name = this.drugTypeList[i].name;
+        }
+      }
+      return name;
+    },
+    getAllDrugList() {
+      getAllDrugList().then((response) => {
+        if (response.data.state == 1) {
+          var manufacturerList = response.data.data.manufacturerList;
+          this.manufacturerList = manufacturerList;
+          this.dealerList = response.data.data.dealerList;
+        }
+      });
+    },
+    getManufacturer(id) {
+      var name = "";
+      for (let i = 0; i < this.manufacturerList.length; i++) {
+        if (id == this.manufacturerList[i].id) {
+          name = this.manufacturerList[i].manufacturer_name;
+        }
+      }
+      return name;
+    },
+    getDealer(id) {
+      var name = "";
+      for (let i = 0; i < this.dealerList.length; i++) {
+        if (id == this.dealerList[i].id) {
+          name = this.dealerList[i].dealer_name;
+        }
+      }
+      return name;
+    },
+    getDictionaryDataConfig(module, filed_name) {
+      return getDictionaryDataConfig(module, filed_name);
+    },
+    drugPrint() {
+      if (this.order_id == "") {
+        this.$message.error("请选择入库单");
+      } else {
+        this.$router.push({
+          path: "/stock/drugStockInOrderDetailPrint?id=" + this.order_id,
+        });
+      }
+    },
+    exportDrugList() {
+      var params = {
+        order_id: this.order_id,
+      };
+      this.exportLoding = true
+      exportDrugList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+
+          for (let i = 0; i < list.length; i++) {
+            list[i].product_date = this.getTime(list[i].product_date);
+            list[i].expiry_date = this.getTime(list[i].expiry_date);
+          }
+          this.exportList = list;
+          this.exportLoding = false
+          var manufacturerList = response.data.data.manufacturerList;
+          this.manufacturerList = manufacturerList;
+          var dealerList = response.data.data.dealerList;
+
+          this.dealerList = dealerList;
+        }
+      });
+    },
+
+    lili(){
+      console.log("exportList",this.exportList)
+    },
+    toExport() {
+      if (this.order_id == "") {
+        this.$message.error("请勾选入库单");
+      }
+      for (let i = 0; i < this.exportList.length; i++) {
+        this.exportList[i].index = i + 1;
+        this.exportList[i].warehousing_time = this.getTime(this.exportList[i].warehousing_time)
+        this.exportList[i].unit =
+          this.exportList[i].dose +
+          this.exportList[i].dose_unit +
+          "*" +
+          this.exportList[i].min_number +
+          this.exportList[i].min_unit +
+          "/" +
+          this.exportList[i].max_unit;
+
+        this.exportList[i].total_price = (
+          this.exportList[i].warehousing_count * this.exportList[i].price
+        ).toFixed(2);
+        for (let j = 0; j < this.manufacturerList.length; j++) {
+          if (this.exportList[i].manufacturer == this.manufacturerList[j].id) {
+            this.exportList[i].manufacturer =
+              this.manufacturerList[j].manufacturer_name;
+          }
+          if (this.exportList[i].manufacturer == 0) {
+            this.exportList[i].manufacturer = "";
+          }
+        }
+
+        for (let z = 0; z < this.dealerList.length; z++) {
+          if (this.exportList[i].dealer == this.dealerList[z].id) {
+            this.exportList[i].dealer = this.dealerList[z].dealer_name;
+          }
+          if (this.exportList[i].dealer == 0) {
+            this.exportList[i].dealer = "";
+          }
+
+        }
+      }
+
+      import("@/vendor/Export2Excel").then((excel) => {
+        for (let i = 0; i < this.exportList.length; i++) {
+          for (let j = 0; j < this.drugTypeList.length; j++) {
+            if (this.exportList[i].drug_type == this.drugTypeList[j].id) {
+              this.exportList[i].drug_type = this.drugTypeList[j].name;
+            }
+          }
+        }
+
+        const tHeader = [
+          "序号",
+          "单据日期",
+          "药品名称",
+          "药品类型",
+          "规格&单位",
+          "批号",
+          "入库数量",
+          "进货价",
+          "总价",
+          "生产厂家",
+          "生产日期",
+          "有效日期",
+          "经销商",
+          "批注文号",
+          "备注",
+        ];
+        const filterVal = [
+          "index",
+          "warehousing_time",
+          "drug_name",
+          "drug_type",
+          "unit",
+          "batch_number",
+          "warehousing_count",
+          "price",
+          "total_price",
+          "manufacturer",
+          "product_date",
+          "expiry_date",
+          "dealer",
+          "number",
+          "remark",
+        ];
+
+        const data = this.formatJson(filterVal, this.exportList);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "药品入库单详情",
+        });
+        this.downloadLoading = false;
+      });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
+    getHouseName(id) {
+      var storehouse_name = "";
+      for (let i = 0; i < this.houseList.length; i++) {
+        if (id == this.houseList[i].id) {
+          storehouse_name = this.houseList[i].storehouse_name;
+        }
+      }
+      return storehouse_name;
+    },
+    changeStoreHouse() {
+      this.GetWarehouse();
+    },
+    changeCheckType() {
+      this.GetWarehouse();
+    },
+
+    getallPatientList(){
+        getallPatientList().then(response=>{
+          if(response.data.state ==1){
+            var patient = response.data.data.patient
+            console.log("patient====",patient)
+            this.patientList = []
+            var obj = {id:0,name:"全部"}
+            this.patientList.push(obj)
+            for(let i=0;i<patient.length;i++){
+              this.patientList.push(patient[i])
+            }
+          }
+        })    
+      },
+      GetDrugTypeName(drug_type){
+        var name = ""
+        for(let i=0;i<this.drugTypeList.length;i++){
+          if(drug_type == this.drugTypeList[i].value){
+             name = this.drugTypeList[i].name
+          }
+        }
+        return name
+      },
+      getManufacturer(id){
+         var manufacturer_name = ""
+         for(let i=0;i<this.manufacturerList.length;i++){
+           if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+           }
+         }
+         return
+      },
+      getDealerName(id){
+        var dealer_name = ""
+        for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].dealer_name){
+              dealer_name = this.dealerList[i].dealer_name
+          }
+        }
+        return dealer_name
+      }
+    
+   
+  },
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/stock/stockOutOrder.vue

@@ -323,6 +323,17 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="出库班次" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+            
+              <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ scope.row.class_type }}
+                  </td>
+               </tr>
+            </template>
+          </el-table-column>
+
           <el-table-column label="使用患者" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
             
@@ -1224,6 +1235,8 @@ export default {
             this.houselist.push(response.data.data.houselist[i]);
           }
           var objOne = {id:0,name:"系统"}
+          var objTwo = {id:-1,name:"血透室"}
+          this.patients.push(objTwo)
           this.patients.push(objOne)
           for(let i=0;i<response.data.data.patients.length;i++){
              this.patients.push(response.data.data.patients[i])

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -104,21 +104,6 @@
                     <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
                   </template>
                 </el-autocomplete>
-
-                 <!-- <el-autocomplete
-                    v-model="scope.row.good_name"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="true"
-                    placeholder="请输入耗材名称"
-                    @select="handleSelect"
-                    :popper-append-to-body="true"
-                  >
-                  
-                  <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                  <template slot-scope="{ item }">
-                    <div class="name">{{item.good_name +"  " +item.specification_name + "  "+  item.manufacturer}}</div>
-                  </template>
-                 </el-autocomplete> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -203,6 +188,20 @@
           </el-table-column>
 
 
+          <el-table-column label="使用班次"  width="100" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.class_type" filterable placeholder="请选择出库班次">
+                <el-option
+                  v-for="(option, index) in classType"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
+
           <el-table-column label="使用患者"  width="150" align="center">
             <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
@@ -449,7 +448,9 @@ export default {
       warehouseOut_id:0,
       is_check:0,
       loading:false,
-      patients:[]
+      patients:[],
+      classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
+
     };
   },
   methods: {
@@ -516,8 +517,10 @@ export default {
           this.storehouse_id = response.data.data.configlist.storehouse_out_info
           this.doctorList =  response.data.data.doctorList
           var obj ={id:0,name:"系统"}
+          var objOne ={id:-1,name:"血透室"}
           this.patients =[]
           this.patients.push(obj)
+          this.patients.push(objOne)
           if(response.data.data.patients!=null){
             for(let i=0;i<response.data.data.patients.length;i++){
               this.patients.push(response.data.data.patients[i])
@@ -574,6 +577,7 @@ export default {
       tempObj["id"] = 0
       tempObj['register_number'] = ''
       tempObj['patient_id'] =0
+      tempObj["class_type"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -790,7 +794,7 @@ export default {
                var str = storehose_name + " " + good_name +"*" + specification_name +"无库存,请入库"
                var warehouseOut =  response.data.data.warehouseOut
                this.warehouseOut = warehouseOut
-              this.warehouseOut_id = warehouseOut.id
+               this.warehouseOut_id = warehouseOut.id
 
                if(msg == 1){
                   this.$message.error(str)
@@ -1085,6 +1089,8 @@ export default {
     tempObj["id"] = 0
     tempObj['register_number'] = ''
     tempObj['patient_id'] = 0
+    tempObj["class_type"] = ""
+   
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -206,7 +206,19 @@
                </el-select>
             </template>
           </el-table-column>
-
+ 
+          <el-table-column label="使用班次"  width="100" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.class_type" filterable placeholder="请选择出库班次">
+                <el-option
+                  v-for="(option, index) in classType"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
           
           <el-table-column label="使用患者"  width="150" align="center">
             <template slot-scope="scope">
@@ -534,6 +546,7 @@ import patient from '../../router/modules/patient'
         tempObj["stock_count"] = ""
         tempObj['register_number'] = ''
         tempObj['patient_id'] =0
+        tempObj["class_type"] = ""
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {
@@ -897,7 +910,9 @@ import patient from '../../router/modules/patient'
         if(response.data.state == 1){
           this.patients =[]
           var obj ={id:0,name:"系统"}
+          var objOne ={id:-1,name:"血透室"}
           this.patients.push(obj)
+          this.patients.push(objOne)
           if(response.data.data.patients!=null){
             for(let i=0;i<response.data.data.patients.length;i++){
               this.patients.push(response.data.data.patients[i])
@@ -923,6 +938,8 @@ import patient from '../../router/modules/patient'
             response.data.data.list[i].remark = response.data.data.list[i].remark
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
+
+            response.data.data.list[i].class_type = response.data.data.list[i].class_type
           
             // response.data.data.list[i].patient_id = this.getPatientName(response.data.data.list[i].patient_id)