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

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/batch_print/batch_print_order_seventyfive.vue

@@ -151,9 +151,9 @@
                     white-space: normal;
                   "
                 >
-                {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}
+                <span v-if="record.dialysis_order.dialysis_dialyszers!=''&& record.dialysis_order.dialysis_dialyszers!=0" > {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}</span>
 
-                <span v-if="record.dialysis_order.dialysis_strainer!=''"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
+                <span v-if="record.dialysis_order.dialysis_strainer!='' && record.dialysis_order.dialysis_strainer!=0"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1644,7 +1644,9 @@
                             "
                             width="50"
                           >
-                            置换量<br />(ml)
+                            置换量<br />
+                            <span v-if="org_id!=10598 && org_id!=10567">(ml)</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>
                           <td

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/DialysisPrintOrderSix.vue

@@ -1734,8 +1734,8 @@
                         <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">(ml)</span>
-                          <span v-if="org_id==10598">(L)</span>
+                          <span v-if="org_id!=10598 && org_id!=10567">(ml)</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>
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 0 || org_id == 10598">KT/V</td>

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

@@ -92,7 +92,7 @@
             </div>
           </div>
         </div>
-        <div style="text-align: center;border: 1px solid black;width: 99%;padding: 3px 0;font-size: 18px;">
+        <div style="text-align: center;border: 1px solid black;width: 99%;padding: 5px 0;">
           透前情况
         </div>
         <div style="border: 1px solid black;border-top: none;width: 99%;border-bottom: none;">
@@ -124,7 +124,7 @@
               }}
               </div>
             </div>
-            <div class="inline_block" style="flex: 2;" >
+            <div class="inline_block" style="flex: 1;" >
               透析（滤）器：
               <div class="under_line"
                 style=" width: 40%;
@@ -132,13 +132,15 @@
                   white-space: normal;
                 "
               >
-                <span v-if="dialysisOrder !=null" >
+                <span v-if="dialysisOrder !=null&&dialysisOrder.dialysis_dialyszers!='' && dialysisOrder.dialysis_dialyszers!=0" >
+
                   {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
                 </span>
-                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
-                   /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
-                </span>
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!='' && dialysisOrder.dialysis_strainer!=0" >
 
+                    /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
+                </span>
+              
               </div>
             </div>
             <div class="inline_block" style="flex: 1;" >
@@ -368,7 +370,7 @@
             </div>
           </div>
           <!-- 特殊医嘱 -->
-          <div class="row" style="padding-bottom: 10px;">
+          <div class="row" >
             <div class="inline_block" style="width: 100%;">
               特殊医嘱：
               <div class="under_line"
@@ -402,8 +404,8 @@
                     letter-spacing: 5px;
                     text-align: center;
                     font-weight: 520;
-                    font-size: 18px;
-                    padding: 3px 8px;
+                    font-size: 16px;
+                    padding: 0px 8px;
                     line-height: 30px;
                   "
                 >
@@ -515,17 +517,17 @@
         </div>
         <!-- 透析监测 -->
         <div style="width: 99%;">
-          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+          <table class="inside_table" border="1" style="border-collapse: collapse;width: 100%;text-align: center;border-top: none;">
             <tbody>
-              <tr style="line-height: 30px;">
+              <tr style="line-height: 30px; padding: 8px 5px">
                 <td
                   colspan="13"
                   style="
                     letter-spacing: 5px;
                     text-align: center;
                     font-weight: 520;
-                    font-size: 18px;
-                    padding: 3px 8px;
+                    font-size: 16px;
+                    padding: 0px 8px;
                     line-height: 30px;
                   "
                 >
@@ -562,7 +564,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 +572,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 +588,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 +596,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)">
@@ -739,7 +743,7 @@
             </div>
           </div>
 
-          <div class="row" style="display: flex;padding-bottom: 10px;">
+          <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 1">
               透后体重：
               <div class="under_line"
@@ -789,8 +793,8 @@
           </div>
         </div>
         <!-- 透析小结 -->
-        <div style="width: 99%;border: 1px solid black;height: 100px;white-space: normal;">
-          <div style="height: 60px;padding: 5px;">
+        <div style="width: 99%;border: 1px solid black;height: 120px;white-space: normal;">
+          <div style="height: 80px;padding: 5px;">
             <div style="margin-bottom: 10px;">
               宣教知识：
               <span class="under_line"style="white-space: normal;width: 80%;">

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -6,7 +6,7 @@
       <el-table-column align="center" prop="day" width="70" label="序号">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.groupno" placeholder=""></el-input>
+            <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.groupno" placeholder=""></el-input>
           </div>
         </template>
       </el-table-column>
@@ -28,10 +28,10 @@
       <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.single_dose" @input="getAllChange(scope)"
+            <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.single_dose" @input="getAllChange(scope)"
                       style="width:50%;"></el-input>
             <!-- <div>{{scope.row.single_dose_unit}}</div> -->
-            <el-select :disabled="prescription.is_medicine_status"  v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+            <el-select :disabled="scope.row.is_medicine == 1"  v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
                        @change="getAllChange(scope)">
               <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
               <el-option :label="scope.row.drug.dose_unit"
@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="100" label="用法">
         <template slot-scope="scope">
-          <el-select :disabled="prescription.is_medicine_status"  v-model="scope.row.delivery_way" placeholder="请选择">
+          <el-select :disabled="scope.row.is_medicine == 1"  v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
                     v-for="(item,index) in drugways"
                     :key="index"
@@ -55,7 +55,7 @@
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
-          <el-select  :disabled="prescription.is_medicine_status"  v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChange(scope)">
+          <el-select  :disabled="scope.row.is_medicine == 1"  v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChange(scope)">
             <el-option
                     v-for="item,index in efs"
                     :key="index"
@@ -70,7 +70,7 @@
       <el-table-column align="center" prop="day" width="70" label="天数">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input  :disabled="prescription.is_medicine_status"  v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
+            <el-input  :disabled="scope.row.is_medicine == 1"  v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
             {{'天'}}
           </div>
         </template>
@@ -79,10 +79,10 @@
       <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)"
+            <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)"
                       style="width:50%" placeholder=""></el-input>
             <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
-            <el-select :disabled="prescription.is_medicine_status"  v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+            <el-select :disabled="scope.row.is_medicine == 1"  v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
                        @change="getPrescribingNumberUnit(scope)">
               <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
               <el-option :label="scope.row.drug.max_unit"
@@ -103,7 +103,7 @@
       </el-table-column>
       <el-table-column align="center" prop="hosp_appr_flag" width="100" label="医院审批标志">
         <template slot-scope="scope">
-          <el-select :disabled="prescription.is_medicine_status"  v-model="scope.row.hosp_appr_flag" placeholder="请选择">
+          <el-select :disabled="scope.row.is_medicine == 1"  v-model="scope.row.hosp_appr_flag" placeholder="请选择">
             <el-option label="审批通过" value="1"></el-option>
             <el-option label="无须审批" value="3"></el-option>
             <el-option label="审批不通过" value="2"></el-option>
@@ -112,7 +112,7 @@
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
+          <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
@@ -335,7 +335,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.is_medicine_status){
+        if (row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法删除')
           return
         }

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1332,7 +1332,7 @@ export default {
                 order_status: prescription.order_status,
                 pre_time: preTime,
                 med_type: parseInt(prescription.med_type),
-                is_medicine_status: is_medicine,
+                is_medicine_status: prescription.is_medicine,
 
               }
               this.prescriptions.push(obj)
@@ -1674,9 +1674,9 @@ export default {
 
                       }
                       tempAdvice.push(obj)
-                      if (prescription.advices[b].is_medicine == 1){
-                        is_medicine = true
-                      }
+                      // if (prescription.advices[b].is_medicine == 1){
+                      //   is_medicine = true
+                      // }
                     }
 
                     //项目
@@ -1756,7 +1756,7 @@ export default {
                       order_status: prescription.order_status,
                       pre_time: preTime,
                       med_type: parseInt(prescription.med_type),
-                      is_medicine_status: is_medicine,
+                      is_medicine: prescription.is_medicine,
 
                     }
                     this.prescriptions.push(obj)
@@ -1911,7 +1911,7 @@ export default {
                       order_status: 0,
                       pre_time: nowTime,
                       med_type: '',
-                      is_medicine_status:false,
+                      is_medicine_status:0,
                     }
 
                     obj.med_type = 14
@@ -2247,7 +2247,7 @@ export default {
                       order_status: prescription.order_status,
                       pre_time: preTime,
                       med_type: parseInt(prescription.med_type),
-                      is_medicine_status: is_medicine,
+                      is_medicine_status: prescription.is_medicine,
 
                     }
                     this.prescriptions.push(obj)
@@ -2359,7 +2359,7 @@ export default {
                         order_status: 1,
                         pre_time: preTime,
                         med_type: '',
-                        is_medicine_status:false,
+                        is_medicine_status:0,
 
                       }
                       if (prescription.med_type == 0 || prescription.med_type == '') {
@@ -2386,7 +2386,7 @@ export default {
                       order_status: 0,
                       pre_time: nowTime,
                       med_type: '',
-                      is_medicine_status:false
+                      is_medicine_status:0
 
                     }
 
@@ -2721,7 +2721,7 @@ export default {
                     order_status: prescription.order_status,
                     pre_time: preTime,
                     med_type: parseInt(prescription.med_type),
-                    is_medicine_status: is_medicine,
+                    is_medicine_status: prescription.is_medicine,
 
                   }
                   this.prescriptions.push(obj)
@@ -2832,7 +2832,7 @@ export default {
                       order_status: 1,
                       pre_time: preTime,
                       med_type: '',
-                      is_medicine_status:false,
+                      is_medicine_status:0,
 
                     }
                     if (prescription.med_type == 0 || prescription.med_type == '') {
@@ -2860,7 +2860,7 @@ export default {
                     order_status: 0,
                     pre_time: nowTime,
                     med_type: '',
-                    is_medicine_status:false,
+                    is_medicine_status:0,
 
                   }
 
@@ -3266,7 +3266,7 @@ export default {
                       order_status: prescription.order_status,
                       pre_time: preTime,
                       med_type: parseInt(prescription.med_type),
-                      is_medicine_status: is_medicine,
+                      is_medicine_status: prescription.is_medicine,
 
                     }
                     this.prescriptions.push(obj)
@@ -3385,7 +3385,7 @@ export default {
                         order_status: 1,
                         pre_time: preTime,
                         med_type: '',
-                        is_medicine_status: false,
+                        is_medicine_status: 0,
 
 
                       }
@@ -3415,7 +3415,7 @@ export default {
                       order_status: 0,
                       pre_time: nowTime,
                       med_type: '',
-                      is_medicine_status: false,
+                      is_medicine_status: 0,
 
 
                     }
@@ -3723,7 +3723,7 @@ export default {
                       order_status: prescription.order_status,
                       pre_time: preTime,
                       med_type: parseInt(prescription.med_type),
-                      is_medicine_status: is_medicine,
+                      is_medicine_status: prescription.is_medicine,
 
                     }
                     this.prescriptions.push(obj)
@@ -3844,7 +3844,7 @@ export default {
                         order_status: 1,
                         pre_time: preTime,
                         med_type: '',
-                        is_medicine_status: false,
+                        is_medicine_status: 0,
 
 
                       }
@@ -3873,7 +3873,7 @@ export default {
                       order_status: 0,
                       pre_time: nowTime,
                       med_type: '',
-                      is_medicine_status: false,
+                      is_medicine_status: 0,
 
 
                     }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3366,10 +3366,16 @@ export default {
 
     },
     removeTab(targetName) {
-      if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5 || this.curPrescriptions.is_medicine_status) {
-        this.$message.error('该处方已经结算或者记账或者已发药，无法删除')
+      if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5 ) {
+        this.$message.error('该处方已经结算或者记账，无法删除')
         return
       }
+      for(let i = 0; i < this.curPrescriptions.advices.length; i++){
+        if(this.curPrescriptions.advices[i].is_medicine == 1){
+          this.$message.error('该处方已发药，无法删除')
+          return
+        }
+      }
       this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
         confirmButtonText: '确 定',
         cancelButtonText: '取 消',
@@ -3940,7 +3946,7 @@ export default {
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-            
+
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -6,7 +6,7 @@
             <el-table-column align="center" prop="day" width="70" label="序号" fixed>
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.groupno" placeholder="" @input="getAllIndex(scope.row)"></el-input>
+                        <el-input :disabled="scope.row.is_medicine == 1" v-model="scope.row.groupno" placeholder="" @input="getAllIndex(scope.row)"></el-input>
                     </div>
                 </template>
             </el-table-column>
@@ -26,11 +26,11 @@
             <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.single_dose" @input="getAllChangeTwo(scope)"
+                        <el-input :disabled="scope.row.is_medicine == 1" v-model="scope.row.single_dose" @input="getAllChangeTwo(scope)"
                                   style="width:50%;"></el-input>
                         <!-- <div>{{scope.row.single_dose_unit}}</div> -->
                         <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
-                                   @change="getAllChangeTwo(scope)" :disabled="prescription.is_medicine_status" >
+                                   @change="getAllChangeTwo(scope)" :disabled="scope.row.is_medicine == 1" >
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
                           <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
 
@@ -43,7 +43,7 @@
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
                 <template slot-scope="scope">
-                    <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.delivery_way" placeholder="请选择">
+                    <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.delivery_way" placeholder="请选择">
                         <el-option
                                 v-for="(item,index) in drugways"
                                 :key="index"
@@ -55,7 +55,7 @@
             </el-table-column>
             <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
                 <template slot-scope="scope">
-                    <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChangeTwo(scope)">
+                    <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChangeTwo(scope)">
                         <el-option
                                 v-for="item,index in efs"
                                 :key="index"
@@ -69,7 +69,7 @@
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.day" @input="getAllChangeTwo(scope)" placeholder=""></el-input>
+                        <el-input :disabled="scope.row.is_medicine == 1" v-model="scope.row.day" @input="getAllChangeTwo(scope)" placeholder=""></el-input>
                         {{'天'}}
                     </div>
                 </template>
@@ -78,11 +78,11 @@
             <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input :disabled="prescription.is_medicine_status" v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)"
+                        <el-input :disabled="scope.row.is_medicine == 1" v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)"
                                   style="width:50%" placeholder=""></el-input>
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
-                        <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
-                                   @change="getPrescribingNumberUnit(scope)">
+                        <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getPrescribingNumberUnit(scope.row)">
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
                             <el-option :label="scope.row.drug.max_unit"
                                        v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
@@ -102,7 +102,7 @@
             </el-table-column>
             <el-table-column align="center" prop="hosp_appr_flag" width="100" label="医院审批标志">
                 <template slot-scope="scope">
-                    <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.hosp_appr_flag" placeholder="请选择">
+                    <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.hosp_appr_flag" placeholder="请选择">
                         <el-option label="审批通过" value="1"></el-option>
                         <el-option label="无须审批" value="3"></el-option>
                         <el-option label="审批不通过" value="2"></el-option>
@@ -117,7 +117,7 @@
 
           <el-table-column align="center" prop="is_self_drug" width="100" label="医嘱性质" v-if="this.$store.getters.xt_user.org_id == 10206 || this.$store.getters.xt_user.org_id == 0">
             <template slot-scope="scope">
-              <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.is_self_drug" placeholder="请选择">
+              <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.is_self_drug" placeholder="请选择">
                 <el-option label="非自备药" value="0"></el-option>
                 <el-option label="自备药" value="1"></el-option>
               </el-select>
@@ -127,13 +127,13 @@
 
           <el-table-column align="center" prop="drug_way_count" width="100" label="给药途径次数" >
             <template slot-scope="scope">
-              <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.drug_way_count" :title="scope.row.drug_way_count" placeholder=""></el-input>
+              <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.drug_way_count" :title="scope.row.drug_way_count" placeholder=""></el-input>
             </template>
           </el-table-column>
 
             <el-table-column align="center" prop="remark" width="50" label="备注">
                 <template slot-scope="scope">
-                    <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
+                    <el-input :disabled="scope.row.is_medicine == 1"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
             <el-table-column align="center" width="40" prop="name" label="操作" fixed="right">
@@ -372,7 +372,8 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.is_medicine_status){
+        console.log(row)
+        if (row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法删除')
           return
         }
@@ -526,7 +527,7 @@
       },
       getAllChangeTwo(scope) {
         console.log("战国阿道夫阿道夫阿道夫",scope)
-        if (this.prescription.is_medicine_status){
+        if (scope.row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
@@ -574,7 +575,7 @@
       },
 
       getPrescribingNumberUnit(scope) {
-        if (this.prescription.is_medicine_status){
+        if (scope.row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
@@ -608,7 +609,7 @@
         }
       },
       changePrescribingNumber(scope) {
-        if (this.prescription.is_medicine_status){
+        if (scope.row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }

src/xt_pages/outpatientTool/PrescriptionSmmary.vue

@@ -0,0 +1,305 @@
+<template>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+
+      <div class="mainRight">
+        <el-tabs v-model="titleType">
+          <el-tab-pane label="明细" name="明细"></el-tab-pane>
+          <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+        </el-tabs>
+<!--        <detail v-if="titleType == '明细'"></detail>-->
+<!--        <gather v-if="titleType == '汇总'"></gather>-->
+        <pdetail v-if="titleType == '明细'"></pdetail>
+        <pgather  v-if="titleType == '汇总'"></pgather>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import Pdetail from './components/pdetail.vue'
+import Pgather from './components/pgather.vue'
+
+
+const moment = require('moment')
+
+export default {
+  components: {
+    Pgather,
+    Pdetail,
+    Gather,
+    Settle,
+    Detail,
+    SummaryDetail,
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      titleType: '明细'
+    }
+  },
+  methods: {},
+  created() {
+
+  },
+
+  mounted() {
+
+  },
+  watch: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.new-main-contain {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.app-container {
+  height: 100%;
+}
+
+.mainCell {
+  height: 36px;
+  display: flex;
+  align-items: center;
+}
+
+.mainLeft {
+  width: 200px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+.el-radio {
+  margin-right: 5px;
+}
+
+}
+.mainRight {
+  margin-left: 10px;
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+
+.cellSpan {
+  min-width: 80px;
+  display: inline-block;
+  margin-right: 10px;
+}
+
+}
+.mainCenter {
+  display: flex;
+  flex: 1;
+}
+
+.centerLeft {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+.el-form-item {
+  width: 32%;
+  margin-right: 1%;
+  float: left;
+}
+
+.el-form-item__label {
+  text-align: left;
+}
+
+}
+.backColor {
+  background: #f6f8f9;
+  height: 5px;
+  margin-bottom: 5px;
+}
+
+.tabsBox {
+  position: relative;
+  height: 76%;
+  overflow-y: auto;
+  margin-bottom: 60px;
+
+.el-tabs__item {
+  padding: 0 10px;
+}
+
+}
+.preTabs {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+.el-tabs__content {
+  flex: 1;
+  overflow-y: auto;
+}
+
+}
+
+.costBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+}
+
+.addTab {
+  position: absolute;
+  right: 0;
+  top: 14px;
+  z-index: 20;
+}
+
+.centerRight {
+  width: 300px;
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.rightTab {
+  height: 40px;
+  width: 100%;
+  border: 1px solid #d2d2d2;
+  box-sizing: border-box;
+
+p {
+  width: 50%;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  background: #eee;
+  float: left;
+}
+
+> p:last-child {
+  border-left: 1px solid #d2d2d2;
+  float: right;
+}
+
+.activeP {
+  background: #409EFF;
+  color: #fff;
+}
+
+}
+.comfirmBox {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.mainHeader {
+  width: 100%;
+  background: #fff;
+  position: fixed;
+  z-index: 100;
+  height: 36px;
+}
+
+.titleBox {
+  position: fixed;
+  z-index: 99;
+  background: #fff;
+}
+
+.fixedCell {
+  position: fixed;
+  z-index: 99;
+  right: 30px;
+  background: #fff;
+  width: 300px;
+  display: flex;
+  justify-content: space-between;
+}
+</style>
+
+<style lang="scss">
+.centerLeft {
+
+.el-form-item__label {
+  text-align: left;
+}
+
+}
+.tabsBox {
+
+.el-tabs__item {
+  padding: 0 10px;
+}
+
+.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+  padding: 0 10px;
+}
+
+.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+  padding: 0 10px;
+}
+
+.el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+  padding: 0 10px;
+}
+
+}
+.centerRight {
+
+.el-tabs__nav-scroll {
+  display: flex;
+}
+
+.el-tabs__nav {
+  margin: 0 auto;
+}
+
+.el-table th .cell, .el-table td .cell {
+  padding: 0 2px;
+}
+
+}
+.preTabs {
+
+.el-tabs__content {
+
+}
+
+}
+.rightTabs {
+  height: 100%;
+
+
+.el-tabs__content {
+
+}
+
+}
+.centerDialog {
+
+.el-dialog__body {
+  max-height: calc(100vh - 100px) !important;
+  padding: 0 20px;
+}
+
+}
+</style>

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -0,0 +1,866 @@
+<template>
+  <!-- <div class="main-contain outpatientChargesManagement">
+      <div class="position">
+          <bread-crumb :crumbs='crumbs'></bread-crumb>
+      </div> -->
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+        <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+        <!--@click="Action">-->
+        <!--导出-->
+        <!--</el-button>-->
+        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                  @keyup.enter.native='searchAction'
+                  placeholder="请输入患者姓名"
+                  class="filter-item"/>
+        <el-select size="small" v-model="item_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeItem">
+          <el-option
+            label="全部"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+
+        <el-select size="small" v-model="item_time_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
+          <el-option
+            label="处方时间"
+            value="0">
+          </el-option>
+          <el-option
+            label="结算时间"
+            value="1">
+          </el-option>
+        </el-select>
+
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="handleDateChange"
+          end-placeholder="结束日期">
+        </el-date-picker>
+        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+      </div>
+      <div>
+        <!-- <el-popover
+          placement="bottom"
+          width="210"
+          trigger="click">
+          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+        </el-popover> -->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              :span-method="merge"
+              show-summary
+              :summary-method="getTotal"
+              max-height="600"
+
+              v-loading="detail_loading"
+              highlight-current-row>
+
+      <el-table-column align="center" prop="name" label="患者名字">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" label="处方日期">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <!--<el-table-column align="center" prop="name" label="患者类型">-->
+      <!--<template slot-scope="scope"></template>-->
+      <!--</el-table-column>-->
+      <el-table-column align="center" prop="name" label="费用类型">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="处方类型">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" label="项目名称">
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="规格型号">
+        <template slot-scope="scope">{{scope.row.item_spec}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="数量">
+        <template slot-scope="scope">{{scope.row.count}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="单位">
+        <template slot-scope="scope">{{scope.row.count}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="单价">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="金额">
+        <template slot-scope="scope">
+          <div>{{((scope.row.price*scope.row.count).toFixed(2))}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" label="是否结算">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" label="结算日期">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+
+  <!-- </div> -->
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummaryDetail } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+import axios from 'axios'
+import pako from 'pako';
+// import NewStatementPrint from './newStatementPrint'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      pickerOptions: {
+        disabledDate(time) {
+          // 获取当前日期
+          const now = new Date();
+
+          // 设置一个月后的日期
+          const oneMonthLater = new Date();
+          oneMonthLater.setMonth(oneMonthLater.getMonth() + 1);
+
+          // 如果当前日期在一个月后之后，则禁用
+          return time.getTime() > oneMonthLater.getTime() || time.getTime() < now.getTime();
+        },
+      },
+      detail_loading: false,
+      tempArr: [],
+      pos: 0,
+
+      sameRowArr: [],
+      keywords: '',
+      tableData: [],
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      item_time_type:'0',
+      items: [
+        { id: 1, name: '未结算' },
+        { id: 2, name: '已结算' },
+      ]
+
+    }
+  },
+  methods: {
+    handleDateChangetwo(value) {
+      this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
+
+
+      }).catch(() => {
+      })
+
+      // let start_time = this.chargeDate[0]
+      // let end_time = this.chargeDate[1]
+      // const dateObj1 = new Date(start_time);
+      // const dateObj2 = new Date(end_time);
+      //
+      // // 计算两个日期之间的月份差
+      // const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
+      //   (dateObj2.getMonth() - dateObj1.getMonth());
+      // if (monthDifference >= 1){
+      //   this.$message.error("时间间隔不能超出一个月")
+      //   return
+      // }else{
+      //   this.getSummaryDetailList()
+      // }
+
+    },
+
+    handleDateChange(value) {
+      // let start_time = this.chargeDate[0]
+      // let end_time = this.chargeDate[1]
+      // const dateObj1 = new Date(start_time);
+      // const dateObj2 = new Date(end_time);
+      //
+      // // 计算两个日期之间的月份差
+      // const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
+      //   (dateObj2.getMonth() - dateObj1.getMonth());
+      // if (monthDifference >= 1){
+      //   this.$message.error("时间间隔不能超出一个月")
+      //   return
+      // }else{
+      //   this.getSummaryDetailListtwo()
+      // }
+      this.getSummaryDetailList()
+
+
+    },
+    Action(){
+      var that = this
+      axios.get('http://127.0.0.1:9531/handelExcel', {
+        params: {}
+      })
+        .then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg)
+
+
+            return false
+          } else {
+
+            var list = []
+            for(let i = 0; i < response.data.data.list.length; i++){
+              let team =  response.data.data.list[i]
+              for(let b = 0; b < team.list.length; b++){
+                let name = ""
+                if(team.list[b].type == 2){
+                  name = team.list[b].project.project_name
+                }else{
+
+                  name = team.list[b].good_info.good_name
+
+                }
+
+                let obj = {
+                  '客户组合编码': team.id,
+                  '客户组合名称': team.project_team,
+                  '客户单项编码': team.list[b].id,
+                  '客户单项名称': name,
+                  '中心组合编码': '',
+                  '中心组合名称': '',
+                  '中心单项编码': '',
+                  '中心单项名称': '',
+                }
+
+                list.push(obj)
+              }
+            }
+
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+              const filterVal = [ '客户组合编码', '客户组合名称', '客户单项编码', '客户单项名称', '中心组合编码', '中心组合名称', '中心单项编码', '中心单项名称']
+              const data = that.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: "消费明细"
+              })
+            })
+
+
+          }
+        })
+        .catch(function(error) {
+
+        })
+
+
+
+
+    },formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    unique(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+    },
+    uniquepid(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
+    },
+    changeDate() {
+      this.getSummaryDetailList()
+    },
+    changeItem() {
+      this.getSummaryDetailList()
+    },changeTimeItem(){
+
+      this.getSummaryDetailList()
+
+    },
+    searchAction() {
+      this.item_type = '0'
+      this.getSummaryDetailList()
+
+    },  getSummaryDetailListtwo() {
+      this.detail_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.detail_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.detail_loading = false
+
+          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+
+
+          }).catch(() => {
+          })
+
+
+        }
+
+
+
+
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
+
+      })
+    },
+    getSummaryDetailList() {
+      this.detail_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords,
+        time_type:this.item_time_type
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.detail_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+
+
+          this.detail_loading = false
+
+          this.tableData = []
+          let tempPatients = []
+          let tempPatientsTwo = []
+          //
+          let tempData = response.data
+          let allData =  response.data
+          tempData = this.uniquepid(tempData)
+          //
+          let order_infos = []
+          //
+          for (let i = 0; i < tempData.length; i++) {
+            let obj = {
+              patient_id: tempData[i].p_id,
+              name: tempData[i].p_name,
+              orders: []
+            }
+            for (let b = 0; b < allData.length; b++) {
+              if (tempData[i].p_id == allData[b].p_id) {
+                obj.orders = obj.orders.concat(allData[b])
+              }
+            }
+            tempPatients.push(obj)
+          }
+          console.log(tempPatients)
+          //
+          for (let i = 0; i < tempPatients.length; i++) {
+            let obj = {
+              patient_id: tempPatients[i].patient_id,
+              name: tempPatients[i].name,
+              order_info: []
+            }
+            let orders = tempPatients[i].orders
+
+            for (let c = 0; c < orders.length; c++) {
+              let newObj = {}
+              newObj['count'] = orders[c].cnt
+              newObj['price'] = orders[c].pric
+              newObj['item_total'] = orders[c].det_item_fee_sumamt
+
+              if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
+                newObj['type'] = 1
+                newObj['item_name'] = orders[c].item_name
+                newObj['item_id'] = orders[c].item_id
+
+                if (orders[c].min_unit != orders[c].dose_unit) {
+                  newObj['item_spec'] =  orders[c].dose + orders[c].dose_unit + '*' + orders[c].min_number + orders[c].min_unit + '/' + orders[c].max_unit
+                } else {
+
+                  newObj['item_spec'] = ''
+                }
+
+              }
+              if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
+                newObj['type'] = 2
+                newObj['item_id'] = orders[c].item_id
+
+                if (orders[c].p_type == 2) {
+                  newObj['item_spec'] =""
+                  newObj['item_name'] = orders[c].item_name
+
+
+                } else if (orders[c].p_type == 3) {
+                  newObj['item_spec'] =  orders[c].specification_name
+                  newObj['item_name'] = orders[c].item_name
+
+
+                }
+              }
+              obj.order_info.push(newObj)
+              order_infos.push(orders.order_info)
+            }
+            tempPatientsTwo.push(obj)
+          }
+          console.log(tempPatientsTwo)
+
+          //
+          for (let d = 0; d < tempPatientsTwo.length; d++) {
+            tempPatientsTwo[d]['new_order_info'] = []
+            let project = []
+            let advice = []
+            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+              if (tempPatientsTwo[d].order_info[b].type == 1) {
+                advice.push(tempPatientsTwo[d].order_info[b])
+              } else {
+                project.push(tempPatientsTwo[d].order_info[b])
+              }
+            }
+            project = this.uniqueProjectAndAdvice(project)
+            advice = this.uniqueProjectAndAdvice(advice)
+
+            for (let i = 0; i < project.length; i++) {
+              let obj = {}
+              let count = 0
+              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
+                  count = count + tempPatientsTwo[d].order_info[a].count
+                }
+              }
+
+
+
+              obj['price'] = project[i].price
+              obj['type'] = project[i].type
+              obj['item_name'] = project[i].item_name
+              obj['item_spec'] = project[i].item_spec
+              obj['item_total'] = project[i].item_total
+
+              obj['item_id'] = project[i].item_id
+              obj['name'] = tempPatientsTwo[d].name
+              obj['patient_id'] = tempPatientsTwo[d].patient_id
+              obj['count'] = count
+              tempPatientsTwo[d].new_order_info.push(obj)
+            }
+
+            for (let i = 0; i < advice.length; i++) {
+              let obj = {}
+              let count = 0
+              for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
+                if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
+                  count = count + tempPatientsTwo[d].order_info[a].count
+                }
+              }
+
+              obj['price'] = advice[i].price
+              obj['type'] = advice[i].type
+              obj['item_name'] = advice[i].item_name
+              obj['item_spec'] = advice[i].item_spec
+              obj['item_id'] = advice[i].item_id
+              obj['name'] = tempPatientsTwo[d].name
+              obj['item_total'] = advice[i].item_total
+              obj['patient_id'] = tempPatientsTwo[d].patient_id
+              obj['count'] = count
+              tempPatientsTwo[d].new_order_info.push(obj)
+            }
+
+          }
+          for (let i = 0; i < tempPatientsTwo.length; i++) {
+            let total = 0
+            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+              let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+              if (new_name != undefined){
+                if (new_name.length != 0) {
+                  console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
+                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
+                }
+
+
+
+              }
+
+
+            }
+            tempPatientsTwo[i]['total'] = total
+          }
+          for (let i = 0; i < tempPatientsTwo.length; i++) {
+            // console.log(111,tempPatientsTwo[i].total)
+            if (tempPatientsTwo[i].new_order_info.length > 0) {
+
+              for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                // console.log('2 ' + new_name)
+                //
+                // new_name = new_name.replace('（ ', '')
+                // new_name = new_name.replace(' ）', '')
+
+                let obj = {
+                  name: tempPatientsTwo[i].name,
+                  patient_id: tempPatientsTwo[i].patient_id,
+                  price: tempPatientsTwo[i].new_order_info[b].price,
+                  type: tempPatientsTwo[i].new_order_info[b].type,
+                  item_name: tempPatientsTwo[i].new_order_info[b].item_name,
+                  item_id: tempPatientsTwo[i].new_order_info[b].item_id,
+                  count: tempPatientsTwo[i].new_order_info[b].count,
+                  item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
+                }
+
+
+                // if(b == 0){
+                obj['total'] = tempPatientsTwo[i].total
+                // }else{
+                //   obj['total'] = 0
+                // }
+                this.tableData.push(obj)
+
+
+
+
+              }
+            }
+          }
+          console.log( this.tableData)
+          this.handleSpanTempArr()
+          // this.tableData = tempPatientsTwo
+
+          // console.log(tempPatientsTwo.length)
+          //
+          let advices = []
+          let projects = []
+          let goods = []
+          for(let i = 0; i < order_infos.length; i++){
+            if(order_infos[i].advice_id > 0 && order_infos[i].project_id == 0){
+              advices.push(order_infos[i].advice)
+            }
+            if(order_infos[i].advice_id == 0 && order_infos[i].project_id > 0){
+              if(order_infos[i].project.type == 3){
+                goods.push(order_infos[i].project)
+              }
+            }
+            if(order_infos[i].advice_id == 0 && order_infos[i].project_id > 0){
+              if(order_infos[i].project.type == 2){
+                projects.push(order_infos[i].project)
+              }
+            }
+          }
+
+        }
+
+
+
+
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
+
+      })
+    }, uniqueProjectAndAdvice(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, sort(arr) {
+      for (var i = 0; i < arr.length - 1; i++) {
+        for (var j = 0; j < arr.length - i - 1; j++) {
+          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+            var hand = arr[j]
+            arr[j] = arr[j + 1]
+            arr[j + 1] = hand
+
+          }
+        }
+      }
+      return arr
+    }, handleSpanTempArr() {
+      this.tempArr = []
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tempArr.push(1)
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+            this.tempArr[this.pos] += 1
+            this.tempArr.push(0)
+          } else {
+            this.tempArr.push(1)
+            this.pos = i
+          }
+        }
+      }
+
+      let sameRowArr = [], sIdx = 0
+      this.tableData.forEach((item, index) => {
+        item.index = index
+        if (index === 0) {
+          sameRowArr.push([index])
+        } else {
+          if (item.patient_id === this.tableData[index - 1].patient_id) {
+            sameRowArr[sIdx].push(index)
+          } else {
+            sIdx = sIdx + 1
+            sameRowArr.push([index])
+          }
+        }
+      })
+      this.sameRowArr = sameRowArr
+    }, merge({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0 || columnIndex === 6) {
+        const _row = this.tempArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    }, export_detail() {
+
+      let list = []
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+        let item_name = order.item_name
+        let count = order.count
+        let price = order.price.toFixed(2)
+        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
+        let total = order.total.toFixed(2)
+
+        let obj = {
+          '患者姓名': name,
+          '项目名称': item_name,
+          '数量': count,
+          '单价': price,
+          '费用': pay_sumamt,
+          '费用总额': total
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '明细',
+          ref: this.$refs['table'].$el
+        })
+      })
+
+    }, formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }, getTotal(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'total') {
+          // sums[index] = values.reduce((prev, curr) => {
+          //   const value = Number(curr)
+          //   if (!isNaN(value)) {
+          //     return prev + curr
+          //   } else {
+          //     return prev
+          //   }
+          // }, 0)
+          // sums[index] = sums[index].toFixed(2)
+          let num = 0
+          data.map(item => {
+            num += item.price * item.count
+          })
+          sums[index] = num.toFixed(2)
+        } else {
+          sums[index] = ''
+        }
+      })
+
+      return sums
+    }
+  },
+  created() {
+    this.getSummaryDetailList()
+
+  }
+}
+</script>

src/xt_pages/outpatientTool/components/pgather.vue

@@ -0,0 +1,576 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+        <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+        <!--@click="Action">-->
+        <!--导出-->
+        <!--</el-button>-->
+        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                  @keyup.enter.native='searchAction'
+                  placeholder="请输入患者姓名"
+
+                  class="filter-item"/>
+        <el-select size="small" v-model="item_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeItem">
+          <el-option
+            label="全部"
+            value="0">
+          </el-option>
+          <el-option
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+        <el-select size="small" v-model="item_time_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
+          <el-option
+            label="处方时间"
+            value="0">
+          </el-option>
+          <el-option
+            label="结算时间"
+            value="1">
+          </el-option>
+        </el-select>
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期">
+        </el-date-picker>
+        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+      </div>
+      <div>
+        <!-- <el-popover
+          placement="bottom"
+          width="210"
+          trigger="click">
+          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+        </el-popover> -->
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="tables"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              v-loading="gather_loading"
+              show-summary
+              max-height="600"
+              :span-method="merge"
+              :summary-method="getTotal"
+              highlight-current-row>
+
+      <el-table-column align="center" prop="name" label="费用分类">
+        <template slot-scope="scope">{{ scope.row.name }}</template>
+      </el-table-column>
+      <!--<el-table-column align="center" prop="name" label="患者类型">-->
+      <!--<template slot-scope="scope"></template>-->
+      <!--</el-table-column>-->
+
+      <el-table-column align="center" prop="item_name" label="处方类型">
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="price" label="项目名称">
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="sum" label="费用总额">
+        <template slot-scope="scope">
+          <div>{{scope.row.sum.toFixed(2)}}</div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+</template>
+
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummaryDetail } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+// import NewStatementPrint from './newStatementPrint'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      gather_loading:false,
+      crumbs: [],
+      tempArr: [],
+      sameRowArr: [],
+      keywords: '',
+      pos:0,
+
+      tableData: [],
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      item_time_type:'0',
+      items: [
+        { id: 1, name: '药品' },
+        { id: 2, name: '所有项目' },
+        { id: 4, name: '检验费' },
+        { id: 5, name: '治疗费' },
+        { id: 6, name: '护理费' },
+        { id: 7, name: '其他' },
+
+        { id: 3, name: '耗材' },
+
+      ]
+
+    }
+  },
+  methods: {
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    unique(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+    },
+    changeDate() {
+      // console.log(this.chargeDate)
+      this.getSummaryDetailList()
+    },changeTimeItem(){
+      this.getSummaryDetailList()
+    },
+    changeItem() {
+      this.getSummaryDetailList()
+    }, uniquepid(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
+    },
+    searchAction() {
+      this.item_type = '0'
+      this.getSummaryDetailList()
+    },
+    getSummaryDetailList() {
+      this.gather_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords,
+        time_type:this.item_time_type,
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.gather_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.gather_loading = false
+
+          let tempPatients = []
+          let tempPatientsTwo = []
+          this.tableData = []
+          let tempData = response.data
+          let data = response.data
+          let orders = this.uniquepid(tempData)
+          console.log(orders)
+
+          for (let i = 0; i < orders.length; i++) {
+            let obj = {
+              patient_id: orders[i].p_id,
+              name: orders[i].p_name,
+              orders: []
+            }
+            for (let b = 0; b < data.length; b++) {
+              if (orders[i].p_id == data[b].p_id) {
+                obj.orders = obj.orders.concat(data[b])
+              }
+            }
+            tempPatients.push(obj)
+          }
+          console.log(tempPatients)
+
+          for (let i = 0; i < tempPatients.length; i++) {
+            let obj = {
+              patient_id: tempPatients[i].patient_id,
+              name: tempPatients[i].name,
+              order_info: []
+            }
+            let orders = tempPatients[i].orders
+            for (let c = 0; c < orders.length; c++) {
+              let newObj = {}
+
+              newObj['count'] = orders[c].cnt
+              newObj['price'] = orders[c].pric
+              if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
+                newObj['type'] = 1
+                newObj['item_name'] = orders[c].item_name
+                newObj['item_id'] = orders[c].item_id
+
+              }
+              if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
+                newObj['item_id'] = orders[c].item_id
+                if (orders[c].p_type == 2) {
+                  newObj['type'] = 2
+                  newObj['item_name'] = orders[c].item_name
+                } else if (orders[c].p_type == 3) {
+                  newObj['type'] = 3
+                  newObj['item_name'] = orders[c].item_name
+                }
+              }
+              obj.order_info.push(newObj)
+            }
+            tempPatientsTwo.push(obj)
+          }
+          console.log(tempPatientsTwo)
+
+          for (let d = 0; d < tempPatientsTwo.length; d++) {
+            tempPatientsTwo[d]['new_order_info'] = []
+            let project = []
+            let advice = []
+            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
+              if (tempPatientsTwo[d].order_info[b].type == 1) {
+                advice.push(tempPatientsTwo[d].order_info[b])
+              } else {
+                project.push(tempPatientsTwo[d].order_info[b])
+              }
+            }
+            // project = this.uniqueProjectAndAdvice(project)
+            // advice = this.uniqueProjectAndAdvice(advice)
+
+            let obj = {}
+            let price = 0
+
+            let obj2 = {}
+            let price2 = 0
+
+            let obj3 = {}
+            let price3 = 0
+
+            for (let i = 0; i < project.length; i++) {
+              if (project[i].type == 2) {
+                price = parseFloat(price.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
+              } else if (project[i].type == 3) {
+                price3 = parseFloat(price3.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
+              }
+            }
+
+
+            for (let i = 0; i < advice.length; i++) {
+              price2 = parseFloat(price2.toString()) + parseFloat((parseFloat(advice[i].count.toString()) * parseFloat(advice[i].price.toString()).toFixed(2)).toString())
+            }
+
+
+            switch (parseInt(this.item_type)) {
+              case 0:
+
+                obj['sum'] = price + price2 + price3
+                obj['price'] = price
+                obj['item_name'] = '项目'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+
+                obj2['sum'] = 0
+                obj2['price'] = price2
+                obj2['item_name'] = '药品'
+                obj2['name'] = tempPatientsTwo[d].name
+                obj2['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj2)
+
+                obj3['sum'] = 0
+                obj3['price'] = price3
+                obj3['item_name'] = '耗材'
+                obj3['name'] = tempPatientsTwo[d].name
+                obj3['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj3)
+                break
+              case 1:
+                obj2['sum'] = price2
+                obj2['price'] = price2
+                obj2['item_name'] = '药品'
+                obj2['name'] = tempPatientsTwo[d].name
+                obj2['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj2)
+                break
+              case 2:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '项目'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 3:
+                obj3['sum'] = price3
+                obj3['price'] = price3
+                obj3['item_name'] = '耗材'
+                obj3['name'] = tempPatientsTwo[d].name
+                obj3['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj3)
+                break
+              case 4:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '检验'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 5:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '治疗'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 6:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '护理'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 7:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '其他'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+
+            }
+
+
+
+          }
+
+          this.handleSpanTempArr()
+          // this.tableData = tempPatientsTwo
+
+          // console.log(tempPatientsTwo.length)
+          //
+
+        }
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
+
+      })
+    }, uniqueProjectAndAdvice(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, sort(arr) {
+      for (var i = 0; i < arr.length - 1; i++) {
+        for (var j = 0; j < arr.length - i - 1; j++) {
+          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+            var hand = arr[j]
+            arr[j] = arr[j + 1]
+            arr[j + 1] = hand
+
+          }
+        }
+      }
+      return arr
+    }, handleSpanTempArr() {
+      this.tempArr = []
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tempArr.push(1)
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+            this.tempArr[this.pos] += 1
+            this.tempArr.push(0)
+          } else {
+            this.tempArr.push(1)
+            this.pos = i
+          }
+        }
+      }
+
+      let sameRowArr = [], sIdx = 0
+      this.tableData.forEach((item, index) => {
+        item.index = index
+        if (index === 0) {
+          sameRowArr.push([index])
+        } else {
+          if (item.patient_id === this.tableData[index - 1].patient_id) {
+            sameRowArr[sIdx].push(index)
+          } else {
+            sIdx = sIdx + 1
+            sameRowArr.push([index])
+          }
+        }
+      })
+      this.sameRowArr = sameRowArr
+    }, merge({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0 || columnIndex === 3) {
+        const _row = this.tempArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    }, getTotal(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        console.log(data)
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'sum') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] = sums[index].toFixed(2)
+        } else {
+          sums[index] = ''
+        }
+      })
+
+      return sums
+    }, export_detail() {
+
+      let list = []
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+        let item_name = order.item_name
+        let pay_sumamt = order.price.toFixed(2)
+        let total = order.sum.toFixed(2)
+
+
+        let obj = {
+          '患者姓名': name,
+          '项目类别': item_name,
+          '费用': pay_sumamt,
+          '费用总额':total,
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = [ '患者姓名', '项目名称', '费用', '费用总额']
+        const filterVal = [ '患者姓名', '项目名称', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '汇总',
+          ref:this.$refs['tables'].$el
+        })
+      })
+
+    }, formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }
+  },
+  created() {
+    this.getSummaryDetailList()
+
+  }
+}
+</script>

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -45,7 +45,7 @@
         :editable="false"
         style="width: 150px;"
         type="date"
-       
+
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
@@ -57,7 +57,7 @@
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        
+
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
@@ -323,6 +323,7 @@
         var projectInfo = this.getPojectInfo(this.query.project_id, val)
         console.log(projectInfo)
         this.item_name = projectInfo.item_name
+        this.query.range_type = projectInfo.range_type
 
         this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
@@ -384,8 +385,14 @@
 
       },
       getPojectInfo(project_id, item_id) {
+        console.log(project_id)
+        console.log(item_id)
+        console.log(this.all_inspection_reference)
+
+
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
           if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].item_id == item_id) {
+            console.log(this.all_inspection_reference[i])
             return this.all_inspection_reference[i]
           }
         }

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)