新分支

src/api/drug/drug.js

@@ -910,5 +910,10 @@ export function deleteSelfWarehouseOutList(id,params){
 }
 
 export function getSelfDrugWarehouseOutDetailByPatientId(params){
-
+  
+  return request({
+    url:"/api/drug/getselfDrugwarehouseoutdetailbypatientid",
+    method:"Get",
+    params:params,
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -24,7 +24,7 @@ export default {
       path:'/stock/selfdrugquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugQuery'),
       name: 'stockquery',
-      meta: { title: '自备药库存查询', noCache: true }
+      meta: { title: '库存查询', noCache: true }
 
     },
 
@@ -32,7 +32,7 @@ export default {
       path: '/stock/selfwarehouse/info',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseInfo'),
       name: 'selfPrepareWaresing',
-      meta: { title: '自备药入库', noCache: true }
+      meta: { title: '入库单', noCache: true }
 
     },
     {
@@ -55,7 +55,7 @@ export default {
       path: '/stock/selfwarehouse/out',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/warehouseOut'),
       name: 'selfPrepareWareOut',
-      meta: { title: '自备药出库', noCache: true }
+      meta: { title: '出库单', noCache: true }
 
     },
     {

src/xt_pages/data/basicConfig.vue

@@ -46,17 +46,17 @@
                 <el-switch v-model="good_out_open" @change="changeGoodOutOpen"></el-switch>
             </p>
 
-            <!-- <p style="margin-top:20px;">药品耗材在结算时出库：
+            <p style="margin-top:20px;">药品耗材在结算时出库：
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
-            </p> -->
+            </p>
 
-            <!-- <p style="margin-top:20px;">药品在保存处方时同步到自备库：
+            <p style="margin-top:20px;">药品在保存处方时同步到自备库：
                <el-switch v-model="self_prescription_out_open" @change="changeSelfPrescriptionOpen"></el-switch>
             </p>
 
             <p style="margin-top:20px;">药品在执行时自备药出库：
                <el-switch v-model="self_drug_out_open" @change="changeSelfPrescriptionOutOpen"></el-switch>
-            </p> -->
+            </p>
         </div>
 
 
@@ -544,7 +544,7 @@ export default {
     // this.getOrderConfig()
     this.getDataPrintList()
 
-    // this.getSelfPrintList()
+    this.getSelfPrintList()
   }
 };
 </script>

src/xt_pages/data/components/addDrugs.vue

@@ -509,6 +509,17 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item label="是否自备药:" prop="is_pharmacy">
+                        <el-select v-model="form.is_self_drug" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="item in selfDrugList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
@@ -655,6 +666,7 @@
           bby01:"",
           is_project:"",
           is_show:"",
+          is_self_drug:"2"
         },
 
         rules: {
@@ -714,7 +726,8 @@
           name: "否"
         }],
         projectList:[{id:"1",name:"是"},{id:"2",name:"否"}],
-        showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
+        showList:[{id:"1",name:"是"},{id:"2",name:"否"}],
+        selfDrugList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -988,6 +1001,7 @@
         form['bby01'] = this.form.bby01
         form['is_project'] = this.form.is_project
         form['is_show'] = this.form.is_show
+        form['is_self_drug'] = parseInt(this.form.is_self_drug)
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

@@ -748,6 +748,12 @@
                 this.formValue.is_show = this.formValue.is_show.toString()
               }
 
+              if(this.formValue.is_self_drug <=0){
+                  this.formValue.is_self_drug = ""
+              }else{
+                this.formValue.is_self_drug = this.formValue.is_self_drug.toString()
+              }
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -133,7 +133,7 @@
                   <tr>
                     <td colspan="2">
                       <div style="line-height:30px;">
-                      <span>计划脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>ml &nbsp;&nbsp;
+                      <span>计划脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
                       <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
                       </div>
                     </td>

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -93,13 +93,20 @@
             <div class="inline_block" style="flex: 1">
               透析次数：
               <div class="under_line" style="width: 70px; text-align: center">
-                {{
+                <!-- {{
                   record.patient.total_dialysis +
                   record.patient.user_sys_before_count
                     ? record.patient.total_dialysis +
                       record.patient.user_sys_before_count
                     : "/"
-                }}
+                }} -->
+                {{
+                  record.Count +
+                  record.patient.user_sys_before_count
+                    ?  record.Count +
+                      record.patient.user_sys_before_count
+                    : "/"
+                 }}
               </div>
             </div>
           </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1219,8 +1219,8 @@
                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=0&&org_id!=10510">
-                        流量：
+                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=0&&org_id!=10510 &&org_id!=10683">
+                       透析液流量：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
@@ -1671,8 +1671,13 @@
                             "
                             width="50"
                           >
-                            置换量<br />
-                            <span v-if="org_id!=10598 && org_id!=10567">(ml)</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>
+                              <span v-if="org_id ==0||org_id==10683">(ml/h)</span>
+                            </span>
                             <span v-if="org_id==10598 || org_id == 10567">L</span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
@@ -1908,11 +1913,18 @@
                             "
                             style="width: 50px"
                           >
-                            {{
+                           <span v-if="org_id!=0&&org_id!=10683">{{
                               monitor_record.replacement_total
                                 ? monitor_record.replacement_total
                                 : ""
                             }}
+                            </span> 
+                            <span v-if="org_id==0||org_id==10683">{{
+                              monitor_record.replacement_speed
+                                ? monitor_record.replacement_speed
+                                : ""
+                            }}
+                            </span> 
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449">
                             {{

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

@@ -1255,6 +1255,13 @@
          //最后一次血管通路
 
          if(this.lastAssessment!=null){
+          if(this.$store.getters.xt_user.template_info.org_id == 10697){
+
+            this.assessmentBeforeDislysis.breathing_rate =18
+
+            this.assessmentBeforeDislysis.temperature = 36.7
+
+          }
            var blood_id = 0
            for(let i= 0;i<this.blood_access_part_opera.length;i++){
               if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_part_opera[i].name){

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

@@ -362,8 +362,8 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant!=undefined && anticoagulant.shouji != -1 && isShows('首剂')  && dialysisPrescription.anticoagulant!=1 && dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id != 54 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 &&  this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 &&this.$store.getters.xt_user.template_info.org_id != 10495 &&this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
-                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&this.$store.getters.xt_user.template_info.template_id != 45 &&this.$store.getters.xt_user.template_info.org_id != 10346 &&this.$store.getters.xt_user.template_info.org_id != 10387 &&this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id != 54 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 &&  this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 &&this.$store.getters.xt_user.template_info.org_id != 10495 &&this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510">
+                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&this.$store.getters.xt_user.template_info.template_id != 45 &&this.$store.getters.xt_user.template_info.org_id != 10346 &&this.$store.getters.xt_user.template_info.org_id != 10387 &&this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 &&this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10510">
                             <el-form-item v-if='dialysisPrescription.anticoagulant != 1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.org_id != 9987 &&  this.$store.getters.xt_user.template_info.org_id!=9990' :label="'首剂(' + anticoagulant.shouji_unit + ') : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
 
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -402,7 +402,8 @@
                                     this.$store.getters.xt_user.template_info.org_id ==10495 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10375 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10551 ||
-                                    this.$store.getters.xt_user.template_info.org_id ==10600
+                                    this.$store.getters.xt_user.template_info.org_id ==10600 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10510 
                                     '
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -467,7 +468,7 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
@@ -480,6 +481,7 @@
                                             this.$store.getters.xt_user.template_info.org_id != 10495 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10375 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10551 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10510 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10600" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -499,7 +501,8 @@
                                           this.$store.getters.xt_user.template_info.org_id == 10495 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10375 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10551 ||
-                                          this.$store.getters.xt_user.template_info.org_id == 10600
+                                          this.$store.getters.xt_user.template_info.org_id == 10600 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10510 
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -578,10 +581,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && 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 != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702&& this.$store.getters.xt_user.template_info.org_id != 10510">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600  && this.$store.getters.xt_user.template_info.org_id != 10510'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -589,7 +592,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 || this.$store.getters.xt_user.template_info.org_id == 10510'
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -256,7 +256,7 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0 && this.org_id!=10375){
+                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0 && this.org_id!=10375 && this.org_id!=10633){
                         if(this.project[index].project.length > 0){
                             this.project[index].project.map(it => {
                             let obj = {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -113,7 +113,7 @@
             <tr>
               <td colspan="2">
                 <div style="line-height:30px;">
-                 <span>计划脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>ml &nbsp;&nbsp;
+                 <span>计划脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
               </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -971,6 +971,7 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
+                      v-if="org_id!=10683"
                     >
                       血流量：
                       <div
@@ -1295,7 +1296,7 @@
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=10683 && org_id!=0">
                       透析液流量：
                       <div
                         class="under_line"
@@ -1735,8 +1736,13 @@
                         <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 ==3877 || org_id == 10449 || org_id ==0">累计超滤量<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">
-                          置换量<br />
-                          <span v-if="org_id!=10598 && org_id!=10567">(ml)</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>
+                            <span v-if="org_id ==0||org_id==10683">(ml/h)</span>
+                          </span>
                           <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>
@@ -1873,11 +1879,20 @@
                           style="width: 50px"
                         >
                           <span>
+                           <span v-if="org_id!=0&&org_id!=10683"> 
                             {{
                               monitor.displacement_quantity
                                 ? monitor.displacement_quantity
                                 : ""
                             }}
+                            </span> 
+                            <span v-if="org_id == 0 || org_id == 10683">
+                              {{
+                              monitor.replacement_speed
+                                ? monitor.replacement_speed
+                                : ""
+                             }}
+                            </span>
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -765,8 +765,9 @@
         this.$router.go(-1);
       },
       submit() {
-      this.$refs["tableForm"].validate((valid) => {
+        this.$refs["tableForm"].validate((valid) => {
         if (valid) {
+          this.loading = true
           const array = this.recordInfo.recordData;
           let total = 0;
           for (let i = 0; i < array.length; i++) {
@@ -843,7 +844,6 @@
               return false;
             } else {
               this.loading = false;
-              loading.close();
               var msg = response.data.data.msg;
               var drug_name = response.data.data.drug_name;
               var dose = response.data.data.dose;
@@ -1167,8 +1167,10 @@
             warehouse_out_id:this.warehouse_out_id,
             patient_id:this.patient_id,
          }
+         this.loading = true
         checkSelfOutDrugQuery(params).then(response=>{
           if(response.data.state ==1){
+            this.loading = false
             var warehousingOutInfoList = response.data.data.warehousingOutInfoList
               var msg =response.data.data.msg
               if(msg == 1){

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -579,7 +579,7 @@
       },
       handleDelete: function (index, row) {
 
-        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+        this.$confirm('确定删除吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -595,7 +595,7 @@
                 type: 'success',
                 duration: 2000
               })
-              this.tableData.splice(index, 1)
+              this.recordInfo.recordData.splice(index, 1)
 
             }
           })
@@ -969,8 +969,10 @@
             warehousing_id:this.warehousing_id,
             patient_id:this.patient_id,
           }
+          this.loading = true
         returnSelfCheckWarehouse(params).then(response=>{
            if(response.data.state == 1){
+            this.loading = false
             var list = response.data.data.list
              this.$message.success("反审核成功!")
              this.showCheck = true
@@ -984,44 +986,47 @@
       },
       //新
       getSelfDrugWarehouseInfoById(id){
-        
+        this.recordInfo.recordData = []
         getSelfDrugWarehouseInfoById(id).then(response=>{
            if(response.data.state == 1){
              var info = response.data.data.info
-             if(info.is_check == 2){
+             for(let i=0;i<info.length;i++){
+              const tempObj = {};
+              tempObj["id"] = info[i].id;
+              tempObj["drug_id"] = info[i].drug_id;
+              tempObj["drug_name"] = info[i].drug.drug_name;
+              tempObj["max_unit"] = info[i].max_unit;
+              tempObj["min_unit"] = info[i].min_unit,
+              tempObj["product_date"] = this.getTimeOne(info[i].product_date);
+              tempObj["expiry_date"] = this.getTimeOne(info[i].expiry_date);
+              tempObj["warehousing_count"] = info[i].warehousing_count.toString();
+              tempObj["remark"] = info[i].remark;
+              tempObj["dealer"] =info[i].dealer
+              tempObj["manufacturer"] = info[i].manufacturer;
+              tempObj["batch_number"] = info[i].batch_number;
+              tempObj["drug_type"] =this.GetDrugTypeName(info[i].drug.drug_type) 
+              tempObj["number"] = info[i].number;
+              tempObj["count_unit"] = info[i].max_unit;
+              tempObj["name"] = info[i].drug.dose + info[i].drug.dose_unit + "*" + info[i].drug.min_number+info[i].drug.min_unit +"/"+info[i].drug.max_unit
+            
+              this.recordInfo.recordData.push(tempObj);
+             }
+             var warehouseInfo  =  response.data.data.warehouseInfo
+             if(warehouseInfo.is_check == 2){
                this.showCheck = true
                this.showReturnCheck = false
              }
-             if(info.is_check == 1){
+             if(warehouseInfo.is_check == 1){
                 this.showCheck = false
                 this.showReturnCheck = true
              }
-             this.patient_id = info.patient_id
-             this.warehousing_time  =this.getTimeOne(info.record_date)
+             this.patient_id = warehouseInfo.patient_id
+             this.warehousing_time  =this.getTimeOne(warehouseInfo.warehousing_time)
              this.manufacturerList = response.data.data.manufacturerList
              this.dealerList = response.data.data.dealerList
              this.drugTypeList = response.data.data.drugTypeList
-             var warehouseInfo  =  response.data.data.warehouseInfo
              this.warehousing_id  = warehouseInfo.id
-             const tempObj = {};
-             tempObj["id"] = info.id;
-             tempObj["drug_id"] = info.drug_id;
-             tempObj["drug_name"] = info.drug.drug_name;
-             tempObj["max_unit"] = info.max_unit;
-             tempObj["min_unit"] = info.min_unit,
-             tempObj["product_date"] = this.getTimeOne(info.product_date);
-             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
-             tempObj["warehousing_count"] = info.warehousing_count.toString();
-             tempObj["remark"] = info.remark;
-             tempObj["dealer"] =this.getDealer(info.dealer) 
-             tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
-             tempObj["batch_number"] = info.batch_number;
-             tempObj["drug_type"] =this.GetDrugTypeName(info.drug.drug_type) 
-             tempObj["number"] = info.number;
-             tempObj["count_unit"] = info.max_unit;
-             tempObj["name"] = info.drug.dose + info.drug.dose_unit + "*" + info.drug.min_number+info.drug.min_unit +"/"+info.drug.max_unit
-             this.recordInfo.recordData = []
-             this.recordInfo.recordData.push(tempObj);
+           
            }
         })
       },
@@ -1046,7 +1051,7 @@
        GetDrugTypeName(drug_type){
             var name = ""
             for(let i=0;i<this.drugTypeList.length;i++){
-            if(drug_type == this.drugTypeList[i].value){
+            if(drug_type == this.drugTypeList[i].id){
                 name = this.drugTypeList[i].name
             }
             }

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -864,6 +864,7 @@
               var dealerList = response.data.data.dealerList
               var manufacturerList = response.data.data.manufacturerList
               var drugTypeList = response.data.data.drugTypeList
+
               
               for(let i=0;i<warehousingOutInfo.length;i++){
                 for(let j=0;j<dealerList.length;j++){
@@ -1171,58 +1172,68 @@
       },
 
       getSelfDrugWarehouseOutById(id){
+        this.recordInfo.recordData = []
         getSelfDrugWarehouseOutById(id).then(response=>{
           if(response.data.state ==1){
               var outInfo = response.data.data.outInfo
-              if(outInfo.is_check == 2){
+              var outOne = response.data.data.outOne
+              if(outInfo!=null){
+                for(let i=0;i<outInfo.length;i++){
+                  const tempObj = {};
+                  tempObj["id"] = outInfo[i].id;
+                  tempObj["drug_id"] = outInfo[i].drug_id;
+                  tempObj["max_unit"] = outInfo[i].count_unit;
+                  tempObj["min_unit"] = outInfo[i].min_unit, 
+                  tempObj["return_count"] = "";
+                  tempObj["price"] = "";
+                  tempObj["remark"] = outInfo[i].remark;
+                  // tempObj["manufacturer"] = this.getManufacturer(outInfo[i].manufacturer)
+                  tempObj["manufacturer"] = outInfo[i].manufacturer
+                  tempObj["batch_number"] = outInfo[i].batch_number;
+                  tempObj["drug_type"] = this.GetDrugTypeName(outInfo[i].drug.drug_type) 
+                  tempObj["dose"] = "";
+                  tempObj["dose_unit"] = "";
+                  tempObj["min_number"] = "";
+                  // tempObj["dealer"] = this.getDealer(outInfo[i].dealer) 
+                  tempObj["dealer"] = outInfo[i].dealer
+                  tempObj["number"] = "";
+                  tempObj["warehouse_info_id"] = outInfo[i].warehouse_info_id;
+                  tempObj["count"] = (outInfo[i].count).toString();
+                  tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+                  tempObj["retail_price"] = 0;
+                  tempObj["last_price"] = "";
+                  tempObj["stock_count"] = "";
+                  tempObj["total_count"] = 0;
+                  tempObj["max_unit_fisrt"] = 0;
+                  tempObj["min_unit_fisrt"] = 0;
+                  tempObj["total_price"] = 0;
+                  tempObj["patient_id"] = outInfo[i].patient_id
+                  tempObj["product_date"] = this.getTimeOne(outInfo[i].product_date);
+                  tempObj["expiry_date"]=this.getTimeOne(outInfo[i].expiry_date)
+                  tempObj["class_type"] = ""
+                  tempObj["drug_name"] = outInfo[i].drug.drug_name
+                  tempObj["name"] = outInfo[i].drug.dose + outInfo[i].drug.dose_unit + "*" + outInfo[i].drug.min_number+outInfo[i].drug.min_unit +"/"+outInfo[i].drug.max_unit
+                 
+                  this.recordInfo.recordData.push(tempObj);
+                }
+              }
+            
+              if(outOne.is_check == 2){
                this.showCheck = true
                this.showReturnCheck = false
              }
-             if(outInfo.is_check == 1){
+             if(outOne.is_check == 1){
                 this.showCheck = false
                 this.showReturnCheck = true
              }
               this.manufacturerList = response.data.data.manufacturerList
               this.dealerList = response.data.data.dealerList
               this.drugTypeList = response.data.data.drugTypeList
-              console.log("out_info",outInfo)
-              const tempObj = {};
-              this.patient_id = outInfo.patient_id
-              this.warehouse_out_time = this.getTimeOne(outInfo.sys_record_time);
-              this.warehouse_out_id  = outInfo.warehouse_out_id
-              tempObj["id"] = outInfo.id;
-              tempObj["drug_id"] = outInfo.drug_id;
-              tempObj["max_unit"] = outInfo.count_unit;
-              tempObj["min_unit"] = outInfo.min_unit, 
-              tempObj["return_count"] = "";
-              tempObj["price"] = "";
-              tempObj["remark"] = outInfo.remark;
-              tempObj["manufacturer"] = this.getManufacturer(outInfo.manufacturer)
-              tempObj["batch_number"] = outInfo.batch_number;
-              tempObj["drug_type"] = this.GetDrugTypeName(outInfo.drug.drug_type) 
-              tempObj["dose"] = "";
-              tempObj["dose_unit"] = "";
-              tempObj["min_number"] = "";
-              tempObj["dealer"] = this.getDealer(outInfo.dealer) 
-              tempObj["number"] = "";
-              tempObj["warehouse_info_id"] = outInfo.warehouse_info_id;
-              tempObj["count"] = (outInfo.count).toString();
-              tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
-              tempObj["retail_price"] = 0;
-              tempObj["last_price"] = "";
-              tempObj["stock_count"] = "";
-              tempObj["total_count"] = 0;
-              tempObj["max_unit_fisrt"] = 0;
-              tempObj["min_unit_fisrt"] = 0;
-              tempObj["total_price"] = 0;
-              tempObj["patient_id"] = outInfo.patient_id
-              tempObj["product_date"] = this.getTimeOne(outInfo.product_date);
-              tempObj["expiry_date"]=this.getTimeOne(outInfo.expiry_date)
-              tempObj["class_type"] = ""
-              tempObj["drug_name"] = outInfo.drug.drug_name
-              tempObj["name"] = outInfo.drug.dose + outInfo.drug.dose_unit + "*" + outInfo.drug.min_number+outInfo.drug.min_unit +"/"+outInfo.drug.max_unit
-              this.recordInfo.recordData = []
-              this.recordInfo.recordData.push(tempObj);
+             
+              this.patient_id = outOne.patient_id
+              this.warehouse_out_time = this.getTimeOne(outOne.warehouse_out_time);
+              this.warehouse_out_id  = outOne.id
+             
           }
         })
       },
@@ -1246,9 +1257,11 @@
             return name;
        },
        GetDrugTypeName(drug_type){
+        console.log("haaaaaaaaaaaaaaaaa",drug_type)
+        console.log("bbbbbbbbbbbbbb",this.drugTypeList)
             var name = ""
             for(let i=0;i<this.drugTypeList.length;i++){
-            if(drug_type == this.drugTypeList[i].value){
+            if(drug_type == this.drugTypeList[i].id){
                 name = this.drugTypeList[i].name
             }
             }
@@ -1260,8 +1273,10 @@
             warehouse_out_id:this.warehouse_out_id,
             patient_id:this.patient_id,
          }
+         this.loading = true
         checkSelfOutDrugQuery(params).then(response=>{
           if(response.data.state ==1){
+            this.loading = false
             var warehousingOutInfoList = response.data.data.warehousingOutInfoList
               var msg =response.data.data.msg
               if(msg == 1){
@@ -1289,8 +1304,10 @@
            warehouse_out_id:this.warehouse_out_id,
            patient_id:this.patient_id,
          }
+         this.loading = true
         returnCheckSelfOutDrugQuery(params).then(response=>{
            if(response.data.state ==1){
+            this.loading = false
             var out = response.data.data.out
             this.$message.success("反审核成功!")
             this.showCheck = true

src/xt_pages/stock/selfPreparedMedicine/newDrugQuery.vue

@@ -4,7 +4,7 @@
           v-loading="loading"
           element-loading-text="拼命加载中">
           <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称" ></el-input>
-          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+          <el-button  type="primary" icon="el-icon-search" @click="seach" style="margin-bottom: 10px;">搜索</el-button>
              <el-table
               :row-style="{ color: '#303133' }"
               :header-cell-style="{
@@ -34,26 +34,26 @@
       
               <el-table-column label="入库数量" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.sum_in_count}} {{scope.row.drug.min_unit }}
+                  {{getSumInCount(scope.row.child)}} {{scope.row.drug.min_unit }}
                  </template>
               </el-table-column>
             
               <el-table-column label="出库数量" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.sum_act_out_count}} {{scope.row.drug.min_unit }}
+                  {{getSumActCount(scope.row.child)}}  {{scope.row.drug.min_unit }}
                </template>
               </el-table-column>
   
               <el-table-column label="退库数量" align="center">
                 <template slot-scope="scope">
-                    {{scope.row.sum_cancel_count}} {{scope.row.drug.min_unit }}
+                    {{getSumCancelCount(scope.row.child)}} {{scope.row.drug.min_unit }}
                 </template>
               </el-table-column>
   
                <el-table-column label="实际出库" align="center">
                 <template slot-scope="scope">
                   <span>
-                    {{scope.row.sum_out_count}} {{scope.row.drug.min_unit }}
+                    {{getSumOutCount(scope.row.child)}} {{scope.row.drug.min_unit }}
                  </span>
                </template>
               </el-table-column>
@@ -61,7 +61,7 @@
               <el-table-column label="剩余库存" align="center">
                 <template slot-scope="scope">
                   <span>
-                    {{ scope.row.flush_count }} {{scope.row.drug.min_unit }}
+                    {{getSumFlushCount(scope.row.child) }} {{scope.row.drug.min_unit }}
                   </span>
                 </template>
               </el-table-column>
@@ -91,7 +91,7 @@
              <el-pagination
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :page-sizes="[10, 50, 100,200,300,400,500,1000]"
+              :page-sizes="[500,1000]"
               :page-size="10"
               background
               align="right"
@@ -137,7 +137,7 @@
        manufacturerList:[],
        page:1,
        total:0,
-       limit:10,
+       limit:1000,
        pageone:1,
        totalone:0,
        keyword:"",
@@ -190,7 +190,7 @@
          }
         specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
        
-        this.$router.push({path:"/stock/selfwarehouse/selfdrugflow?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count})
+        this.$router.push({path:"/stock/selfwarehouse/selfdrugflow?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count+"&patient_id="+val.patient_id})
       },
       toClickOne(val){
         var manufacturer_name = ""
@@ -202,7 +202,7 @@
          }
         specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
 
-        this.$router.push({path:"/stock/selfwarehouse/selfdrugbatchnumber?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count})
+        this.$router.push({path:"/stock/selfwarehouse/selfdrugbatchnumber?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count+"&patient_id="+val.patient_id})
       },
     
       open(){
@@ -218,8 +218,41 @@
         getSelfDrugQuery(params).then(response=>{
            if(response.data.state == 1){
               var list = response.data.data.list
+              console.log("list==================",list)
+              if(list!=null && list.length >0){
+                 let dataInfo = {}
+                 list.forEach((item, index) => {
               
-              this.tableList =list
+                  let { drug_id } = item
+                  if (!dataInfo[drug_id]) {
+                    dataInfo[drug_id] = {
+                      drug_id:item.drug_id,
+                      drug:item.drug,
+                      advice_name:item.drug.drug_name,
+                      child: [],
+                      count:0,
+                      patient_id:0,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+              
+
+                if(arr!=null && arr.length >0){
+                  for(let i=0;i<arr.length;i++){
+                    for(let j=0;j<list.length;j++){
+                      if(arr[i].drug_id == list[j].drug_id){
+                          arr[i].child.push(list[j])
+                      }
+                    }
+                  }
+                }
+                console.log("arr----------------",arr)
+
+                this.tableList = []
+                this.tableList = arr
+              }
+           
               var total =  response.data.data.total
               this.total = total
               this.manufacturerList = response.data.data.manufacturerList
@@ -387,6 +420,41 @@
         toPrint(){
           this.$router.push("/good/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
         },
+        getSumInCount(val){
+          var in_count =0
+          for(let i=0;i<val.length;i++){
+             in_count +=val[i].sum_in_count
+          }
+          return in_count
+        },
+        getSumActCount(val){
+          var in_count =0
+          for(let i=0;i<val.length;i++){
+             in_count +=val[i].sum_act_out_count
+          }
+          return in_count
+        },
+        getSumCancelCount(val){
+          var in_count =0
+          for(let i=0;i<val.length;i++){
+             in_count +=val[i].sum_cancel_count
+          }
+          return in_count
+        },
+        getSumOutCount(val){
+          var in_count =0
+          for(let i=0;i<val.length;i++){
+             in_count +=val[i].sum_out_count
+          }
+          return in_count
+        },
+        getSumFlushCount(val){
+          var in_count =0
+          for(let i=0;i<val.length;i++){
+             in_count +=val[i].flush_count
+          }
+          return in_count
+        }
     },
     created(){
       this.getlist()

src/xt_pages/stock/selfPreparedMedicine/patientDrugQuery.vue

@@ -4,7 +4,7 @@
         element-loading-text="拼命加载中">
          <el-container>
                <div style="width:27%">
-                <el-row style="white-space:nowrap;display:flex;line-height: 31px;">
+                <!-- <el-row style="white-space:nowrap;display:flex;line-height: 31px;">
                    <span style="font-size:14px;color:#606266"> 时间:</span>
                     <el-date-picker
                       size="small"
@@ -32,7 +32,7 @@
                         value-format="yyyy-MM-dd"
                         @change="endTimeChange"
                     ></el-date-picker>
-                </el-row>
+                </el-row> -->
                 <el-row></el-row>
                  <el-row>
                    <el-col :span="24" style="display:flex">
@@ -86,8 +86,8 @@
 
                    <el-tab-pane label="患者使用列表">
                      <div style="float:right;margin-bottom:10px">
-                      <el-button type="primary" @click="toPrint">打印</el-button>
-                      <el-button type="primary" @click="exportList">导出</el-button>
+                      <!-- <el-button type="primary" @click="toPrint">打印</el-button>
+                      <el-button type="primary" @click="exportList">导出</el-button> -->
                       </div>
                      <el-table
                           :data="tableList"
@@ -102,11 +102,20 @@
                         >
                      <el-table-column
                        prop="date"
-                       label="名称"
+                       label="药品名称"
                       align="center"
                       >
                       <template slot-scope="scope">
-                        {{scope.row.drug_name}}
+                        {{scope.row.drug.drug_name}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                       prop="date"
+                       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.drug.max_unit }}
                       </template>
                     </el-table-column>
                      <el-table-column
@@ -114,7 +123,7 @@
                       label="生产厂家"
                       align="center">
                       <template slot-scope="scope">
-                        {{scope.row.manufacturer}}
+                        {{ getManufacturName(scope.row.drug.manufacturer) }}
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -127,13 +136,71 @@
                      </el-table-column>
                       <el-table-column
                        prop="name"
-                      label="数量"
+                      label="入库数量"
+                      align="center">
+                      <template slot-scope="scope">
+                         {{ scope.row.sum_in_count }}
+                      </template>
+                     </el-table-column>
+
+                     <el-table-column
+                       prop="name"
+                      label="出库数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{ scope.row.sum_out_count }}
+                      </template>
+                     </el-table-column>
+
+                     <el-table-column
+                       prop="name"
+                      label="退库数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{ scope.row.sum_cancel_count }}
+                      </template>
+                     </el-table-column>
+
+                     <el-table-column
+                       prop="name"
+                      label="实际出库"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{ scope.row.sum_act_out_count }}
+                      </template>
+                     </el-table-column>
+
+
+                     
+                     <el-table-column
+                       prop="name"
+                      label="剩余库存"
                       align="center">
                       <template slot-scope="scope">
-                         {{getCount(scope.row.child,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+                        {{ scope.row.flush_count }}
                       </template>
                      </el-table-column>
 
+                     <el-table-column label="操作" align="center" width="200px">
+               
+                      <template slot-scope="scope">
+                        <el-button
+                          size="small"
+                          type="primary"
+                          @click="toClick(scope.row)"
+                        >库存流水
+                        </el-button>
+                        <el-button
+                          size="small"
+                          type="primary"
+                          @click="toClickOne(scope.row)"
+                        >批次
+                        </el-button>
+        
+                      
+                        </template>
+                    </el-table-column>
+
                      </el-table>
                       <el-pagination
                         @size-change="handleSizeChange"
@@ -200,6 +267,24 @@ export default {
     endTimeChange(){
       this.handleCurrentChange(this.patient)
     },
+    getManufacturName(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 manufacturer_name
+      },
+    getDearName(id){
+        var dear_name = ""
+        for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+            dear_name = this.dealerList[i].dealer_name
+          }
+        }
+        return dear_name
+    },
     getlist(){
         this.loading = true
         var params = {
@@ -231,45 +316,9 @@ export default {
      getSelfDrugWarehouseOutDetailByPatientId(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list233223232323",list)
-          var outlist = response.data.data.outlist
-          this.manufacturerList = response.data.data.manufacturerList
-          if(list!=null && list.length > 0){
-            for(let i=0;i<list.length;i++){
-              if(list[i].count_unit == list[i].drug.max_unit){
-                 list[i].count = list[i].count * list[i].drug.min_number
-              }
-            }
-          }
-          let dataInfo = {}
-          list.forEach((item, index) => {
-            let { drug_id } = item
-            if (!dataInfo[drug_id]) {
-              dataInfo[drug_id] = {
-                drug_id,
-                child: [],
-                dose:item.drug.dose,
-                dose_unit:item.drug.dose_unit,
-                min_number:item.drug.min_number,
-                min_unit:item.drug.min_unit,
-                max_unit:item.drug.max_unit,
-                drug_name:item.drug.drug_name,
-                manufacturer:this.getManufacturName(item.manufacturer),
-              }
-            }
-          })
-          let arr = Object.values(dataInfo)
-          arr.forEach((item,index)=>{
-            for(let i=0;i<outlist.length;i++){
-               if(item.drug_id == outlist[i].drug_id){
-                 item.child.push(outlist[i])
-               }
-            }
-          })
-        
-        
-          this.tableList = arr
+          this.tableList = list
           this.total = response.data.data.total
+          this.manufacturerList = response.data.data.manufacturerList
         }
      })
    },
@@ -411,7 +460,33 @@ export default {
           }
         }
         return patient_name
+       },
+       toClick(val){
+       
+       var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.drug.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
        }
+      specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
+     
+      this.$router.push({path:"/stock/selfwarehouse/selfdrugflow?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count+"&patient_id="+val.patient_id})
+    },
+    toClickOne(val){
+      var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.drug.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+      specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
+
+      this.$router.push({path:"/stock/selfwarehouse/selfdrugbatchnumber?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count+"&patient_id="+val.patient_id})
+    },
+      
   },
   created(){
     var nowDate = new Date();

src/xt_pages/stock/selfPreparedMedicine/selfDrugBatchNumber.vue

@@ -6,7 +6,7 @@
       <div class="app-container ">
         <div class="cell clearfix">
          药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
-         库存: {{this.$route.query.over_plus}}
+         <!-- 库存: {{this.$route.query.over_plus}} -->
          规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
          厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
         </div>
@@ -266,6 +266,7 @@
              end_time:this.end_time,
              page:this.page,
              limit:this.limit,
+             patient_id:this.$route.query.patient_id,
          }
         getSelfDrugBatchNumberList(params).then(response=>{
            if(response.data.state ==1){

src/xt_pages/stock/selfPreparedMedicine/selfDrugFlow.vue

@@ -6,7 +6,7 @@
       <div class="app-container ">
         <div class="cell clearfix">
          药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
-         库存: {{this.$route.query.over_plus}}
+         库存: {{this.$route.query.overCount}}{{ drug.min_unit }}
          规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
          厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
         </div>
@@ -79,12 +79,13 @@
                <span v-if="scope.row.consumable_type == 12">调拨出库</span>
                <span v-if="scope.row.consumable_type == 13">调拨入库</span>
                <span v-if="scope.row.consumable_type == 15">结算出库</span>
+               <span v-if="scope.row.consumable_type == 20">处方出库</span>
              </template>
           </el-table-column>
           <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
              <template slot-scope="scope">
                <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
-                <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12 || scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12 || scope.row.consumable_type == 15 || scope.row.consumable_type==20">{{scope.row.warehouse_out_order_number}}</span>
                 <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
                 <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
                 <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
@@ -270,15 +271,17 @@
              end_time:this.end_time,
              page:this.page,
              limit:this.limit,
+             patient_id:this.$route.query.patient_id,
          }
         getSelfDrugFlow(params).then(response=>{
            if(response.data.state ==1){
               var list = response.data.data.list
+             
               this.tableList =list
               var total =  response.data.data.total
               this.total = total
               this.drug =response.data.data.drug
-              this.patients= response.data.data.patients
+              this.patientList= response.data.data.patients
            }
         })
       },

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -90,10 +90,10 @@
         <!-- <el-button size="small" icon="el-icon-delete" @click="batchDelete"
           >删除</el-button
         > -->
-        <el-button size="small" type="primary" @click="drugPrint()"
+        <!-- <el-button size="small" type="primary" @click="drugPrint()"
           >打印</el-button
         >
-        <el-button size="small" type="primary" @click="toExport()" :disabled="exportLoding">导出</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>
@@ -238,10 +238,7 @@
           color: '#606266',
         }"
       >
-        <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_name }}
@@ -537,11 +534,11 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouse();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouse();
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -551,7 +548,7 @@ export default {
       } else {
         this.startTime = this.getTimestamp(val);
         this.start_time = val;
-        this.GetWarehouse();
+        this.getAllSelfDrugWarehouse();
       }
     },
     endTimeChange(val) {
@@ -561,7 +558,7 @@ export default {
         this.end_time = "";
       } else {
         this.end_time = val;
-        this.GetWarehouse();
+        this.getAllSelfDrugWarehouse();
       }
     },
     getTimestamp(time) {
@@ -690,9 +687,35 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
+         this.tableDataList = []
          getSelfDrugWarehouseInfoById(val.id).then(response=>{
           if(response.data.state ==1){
             var info = response.data.data.info
+            console.log("info==================",info)
+            for(let i=0;i<info.length;i++){
+              const tempObj = {};
+              tempObj["id"] = info[i].id;
+              tempObj["drug_id"] = info[i].drug_id;
+              tempObj["drug_name"] = info[i].drug.drug_name;
+              tempObj["max_unit"] = info[i].max_unit;
+              tempObj["min_unit"] = info[i].min_unit,
+              tempObj["product_date"] = this.getTimeOne(info[i].product_date);
+              tempObj["expiry_date"] = this.getTimeOne(info[i].expiry_date);
+              tempObj["warehousing_count"] = info[i].warehousing_count.toString();
+              tempObj["remark"] = info[i].remark;
+              tempObj["dealer"] =this.getDealer(info[i].dealer) 
+              tempObj["manufacturer"] = this.getManufacturer(info[i].manufacturer);
+              tempObj["batch_number"] = info[i].batch_number;
+              tempObj["drug_type"] =this.GetDrugTypeName(info[i].drug.drug_type) 
+              tempObj["number"] = info[i].number;
+              tempObj["count_unit"] = info[i].max_unit;
+              tempObj["name"] = info[i].drug.dose + info[i].drug.dose_unit + "*" + info[i].drug.min_number+info[i].drug.min_unit +"/"+info[i].drug.max_unit
+             
+              this.tableDataList.push(tempObj);
+          
+            }
+            console.log("i报个=-----------------------",this.tableDataList)
+         
 
             var warehouseInfo =  response.data.data.warehouseInfo
 
@@ -713,27 +736,8 @@ export default {
              this.drugTypeList = response.data.data.drugTypeList
              var warehouseInfo  =  response.data.data.warehouseInfo
              this.warehousing_id  = warehouseInfo.id
-             const tempObj = {};
-             
-             tempObj["id"] = info.id;
-             tempObj["drug_id"] = info.drug_id;
-             tempObj["drug_name"] = info.drug.drug_name;
-             tempObj["max_unit"] = info.max_unit;
-             tempObj["min_unit"] = info.min_unit,
-             tempObj["product_date"] = this.getTimeOne(info.product_date);
-             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
-             tempObj["warehousing_count"] = info.warehousing_count.toString();
-             tempObj["remark"] = info.remark;
-             tempObj["dealer"] =this.getDealer(info.dealer) 
-             tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
-             tempObj["batch_number"] = info.batch_number;
-             tempObj["drug_type"] =this.GetDrugTypeName(info.drug.drug_type) 
-             tempObj["number"] = info.number;
-             tempObj["count_unit"] = info.max_unit;
-           
-             tempObj["name"] = info.drug.dose + info.drug.dose_unit + "*" + info.drug.min_number+info.drug.min_unit +"/"+info.drug.max_unit
-             this.tableDataList = []
-             this.tableDataList.push(tempObj);
+ 
+          
           }
 
        })

src/xt_pages/stock/selfPreparedMedicine/warehouseOut.vue

@@ -106,10 +106,10 @@
         <!-- <el-button size="small" icon="el-icon-delete" @click="batchDelete"
           >删除</el-button
         > -->
-        <el-button size="small" type="primary" @click="drugPrint()"
+        <!-- <el-button size="small" type="primary" @click="drugPrint()"
           >打印</el-button
         >
-        <el-button size="small" type="primary" @click="toExport()" :disabled="exportLoding">导出</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>
@@ -251,10 +251,6 @@
           color: '#606266',
         }"
       >
-        <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_name }}
@@ -285,8 +281,14 @@
           </template>
         </el-table-column>
 
-      
 
+        <el-table-column label="使用患者" align="center">
+          <template slot-scope="scope">
+             {{getPatientName(scope.row.patient_id )}}
+          </template>
+        </el-table-column>
+
+      
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
             {{scope.row.manufacturer}}
@@ -332,7 +334,7 @@ import {
 import { getAllDrugList } from "@/api/data";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
-  import { getallPatientList,getAllSelfDrugWarehouseOutList,deleteSelfWarehouseOutList,getAllSelfDrugWarehouseOut,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
+  import { getallPatientList,deleteSelfWarehouseOutList,getAllSelfDrugWarehouseOut,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
 export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
@@ -430,6 +432,7 @@ export default {
       doctorList:[],
       recordDataList:[],
       loading:false,
+      patientList:[],
     };
   },
 
@@ -580,6 +583,15 @@ export default {
     },
     handleDelete: function (index, row) {
 
+        if(row.is_check == 1){
+            this.$message.error("该出库单已经审核,无法删除!")
+            return false
+        }
+        if(row.is_sys ==1 ){
+          this.$message.error("自动出库,无法删除!")
+          return false
+        }
+
         this.$confirm('确定删除吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -940,9 +952,48 @@ export default {
          return user_name
       },
       getSelfDrugWarehouseOutById(id){
+        this.recordDataList = []
         getSelfDrugWarehouseOutById(id).then(response=>{
           if(response.data.state ==1){
               var outInfo = response.data.data.outInfo
+              if(outInfo!=null && outInfo.length >0){
+                 for(let i=0;i<outInfo.length;i++){
+                  const tempObj = {};
+                  tempObj["id"] = outInfo[i].id;
+                  tempObj["drug_id"] = outInfo[i].drug_id;
+                  tempObj["max_unit"] = outInfo[i].count_unit;
+                  tempObj["min_unit"] = outInfo[i].min_unit, 
+                  tempObj["return_count"] = "";
+                  tempObj["price"] = "";
+                  tempObj["remark"] = outInfo[i].remark;
+                  tempObj["manufacturer"] = this.getManufacturer(outInfo[i].manufacturer)
+                  tempObj["batch_number"] = outInfo[i].batch_number;
+                  tempObj["drug_type"] = this.GetDrugTypeName(outInfo[i].drug.drug_type) 
+                  tempObj["dose"] = "";
+                  tempObj["dose_unit"] = "";
+                  tempObj["min_number"] = "";
+                  tempObj["dealer"] = this.getDealer(outInfo[i].dealer) 
+                  tempObj["number"] = "";
+                  tempObj["warehouse_info_id"] = outInfo[i].warehouse_info_id;
+                  tempObj["count"] = (outInfo[i].count).toString();
+                  tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+                  tempObj["retail_price"] = 0;
+                  tempObj["last_price"] = "";
+                  tempObj["stock_count"] = "";
+                  tempObj["total_count"] = 0;
+                  tempObj["max_unit_fisrt"] = 0;
+                  tempObj["min_unit_fisrt"] = 0;
+                  tempObj["total_price"] = 0;
+                  tempObj["patient_id"] = outInfo[i].patient_id
+                  tempObj["product_date"] = this.getTimeOne(outInfo[i].product_date);
+                  tempObj["expiry_date"]=this.getTimeOne(outInfo[i].expiry_date)
+                  tempObj["class_type"] = ""
+                  tempObj["drug_name"] = outInfo[i].drug.drug_name
+                  tempObj["name"] = outInfo[i].drug.dose + outInfo[i].drug.dose_unit + "*" + outInfo[i].drug.min_number+outInfo[i].drug.min_unit +"/"+outInfo[i].drug.max_unit
+                
+                  this.recordDataList.push(tempObj);
+                 }
+              }
               this.isShow = true
               if(outInfo.is_check == 2){
                this.showCheck = true
@@ -956,43 +1007,13 @@ export default {
               this.dealerList = response.data.data.dealerList
               this.drugTypeList = response.data.data.drugTypeList
               console.log("out_info",outInfo)
-              const tempObj = {};
+            
               this.patient_id = outInfo.patient_id
               this.warehouse_out_time = this.getTimeOne(outInfo.sys_record_time);
               this.warehouse_out_id  = outInfo.warehouse_out_id
-              tempObj["id"] = outInfo.id;
-              tempObj["drug_id"] = outInfo.drug_id;
-              tempObj["max_unit"] = outInfo.count_unit;
-              tempObj["min_unit"] = outInfo.min_unit, 
-              tempObj["return_count"] = "";
-              tempObj["price"] = "";
-              tempObj["remark"] = outInfo.remark;
-              tempObj["manufacturer"] = this.getManufacturer(outInfo.manufacturer)
-              tempObj["batch_number"] = outInfo.batch_number;
-              tempObj["drug_type"] = this.GetDrugTypeName(outInfo.drug.drug_type) 
-              tempObj["dose"] = "";
-              tempObj["dose_unit"] = "";
-              tempObj["min_number"] = "";
-              tempObj["dealer"] = this.getDealer(outInfo.dealer) 
-              tempObj["number"] = "";
-              tempObj["warehouse_info_id"] = outInfo.warehouse_info_id;
-              tempObj["count"] = (outInfo.count).toString();
-              tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
-              tempObj["retail_price"] = 0;
-              tempObj["last_price"] = "";
-              tempObj["stock_count"] = "";
-              tempObj["total_count"] = 0;
-              tempObj["max_unit_fisrt"] = 0;
-              tempObj["min_unit_fisrt"] = 0;
-              tempObj["total_price"] = 0;
-              tempObj["patient_id"] = outInfo.patient_id
-              tempObj["product_date"] = this.getTimeOne(outInfo.product_date);
-              tempObj["expiry_date"]=this.getTimeOne(outInfo.expiry_date)
-              tempObj["class_type"] = ""
-              tempObj["drug_name"] = outInfo.drug.drug_name
-              tempObj["name"] = outInfo.drug.dose + outInfo.drug.dose_unit + "*" + outInfo.drug.min_number+outInfo.drug.min_unit +"/"+outInfo.drug.max_unit
-              this.recordDataList = []
-              this.recordDataList.push(tempObj);
+
+              // this.patientList =response.data.data.patients
+      
           }
         })
       },