Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/patient.js

@@ -70,6 +70,7 @@ export function createPatientDialysisSolution(id, solution, mode) {
 }
 
 export function editPatientDialysisSolution(patient, id, solution, mode) {
+  
   return request({
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id + '&mode=' + mode,
     method: 'put',
@@ -380,3 +381,94 @@ export function deleteDryWeight(id, data) {
     data: data
   })
 }
+
+
+export function saveVasularAccess(params){
+   
+  return request({
+    url:"/api/patient/savevasularaccess",
+    method:"Get",
+    params:params
+  })
+} 
+
+export function getAllVascularAccessList(params){
+  
+  return request({
+    url:"/api/patient/getallvascualraccesslist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getVascularAccessByDetail(id,params){
+  
+  return request({
+    url:"/api/patient/getvascularaccessbydetial?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function updatedVasularAccess(params){
+  
+  return request({
+    url:"/api/patient/updatevasularaccess",
+    method:"get",
+    params:params
+  })
+}
+
+export function DeleteVascularAccess(id,params){
+  
+  return request({
+    url:"/api/patient/deletevascularaccess?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function savePasswayAssessment(params){
+  
+  return request({
+    url:"/api/patient/savepasswayassessment",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAllPassWayAssessmentList(params){
+  
+  return request({
+    url:"/api/patient/getallpasswayassessment",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPassWayAssessmentById(id,params){
+  
+  return request({
+    url:"/api/patient/getpasswayassmentbyid?id="+id,
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updatePasswayAssessment(params){
+  
+  return request({
+    url:"/api/patient/updatepasswayassesment",
+    method:"get",
+    params:params
+  })
+}
+
+export function DeletePassWayAssessMent(id,params){
+  
+  return request({
+    url:"/api/patient/deletepasswayassessment?id="+id,
+    method:"get",
+    params:params
+  })
+}

src/router/index_路由未分离前.js

@@ -604,6 +604,7 @@ export const xt_asyncRouterMap = [
         name: 'weight',
         meta: { title: 'weight', noCache: true }
       },
+   
       {
         path: '/patients/patient/:id/dialysisRecord',
         component: () => import('@/xt_pages/user/dialysisRecord'),
@@ -886,7 +887,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      }
+      },
+     
     ]
   },
   {

src/router/modules/dialysis.js

@@ -328,6 +328,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentyEight',
+      component: () =>
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyEight'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyFive',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirty',
       component: () =>

src/router/modules/patient.js

@@ -62,6 +62,29 @@ export default {
       noCache: true
     }
   },
+
+  {
+    path: '/patients/patient/:id/vascularAccess',
+    component: () => import('@/xt_pages/user/vascularAccess'),
+    hidden: true,
+    is_menu: false,
+    name: 'vascularAccess',
+    meta: {
+      title: 'vascularAccess',
+      noCache: true
+    }
+  },
+  {
+    path: '/patients/patient/:mid/vascularAccessDetail/:pid',
+    component: () => import('@/xt_pages/user/vascularAccessDetail'),
+    hidden: true,
+    is_menu: false,
+    name: 'vascularAccessDetail',
+    meta: {
+      title: 'vascularAccessDetail',
+      noCache: true
+    }
+  },
   {
     path: '/patients/patient/:id/dialysisRecord',
     component: () => import('@/xt_pages/user/dialysisRecord'),

src/router/modules/selfPreparedMedicine.js

@@ -16,7 +16,7 @@ export default {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),
       name: 'stockquery',
-      meta: { title: '库存查询', noCache: true } 
+      meta: { title: '库存查询', noCache: true }
 
     },
 
@@ -61,6 +61,32 @@ export default {
        hidden:true,
        is_menu:false,
        meta:{title:'selfStockPrint',noCache:true}
-     }
+     },
+
+     {
+      path: '/stock/stockprint',
+      component: () => import('@/xt_pages/stock/stockPrint'),
+      name: 'stockqueryprint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockprint', noCache: true }
+     },
+
+     {
+      path: '/stock/in/detail/print',
+      component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
+      name: 'stockInDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInDetailPrint',noCache: true }
+    },
+    {
+      path: '/stock/out/detail',
+      component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
+      name: 'stockOutDetailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutDetailPrint',noCache: true }
+    },
   ]
 }

src/router/modules/stock.js

@@ -233,6 +233,41 @@ export default {
         title: '出库打印',
         noCache: true
       }
-    }
+    },
+
+    {
+      path: '/stock/drugStockInOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugInOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/stock/drugStockOutOrderDetailPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugOutOrderDetailPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/stock/drugQueryPrint',
+      component: () => import('@/xt_pages/stock/drugs/drugQueryPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'drugQueryPrint',
+      meta: {
+        title: '药品入库单打印',
+        noCache: true
+      }
+    },
   ]
 }

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -249,6 +249,17 @@
                         <!--"-->
                         <!--&gt;</check-box>-->
                       </div>
+                      <div v-if="org_id == 9987" class="inline_block" style="width:200px;margin-left: 30px;">
+                          透前血压:
+                          <span class="under_line" style="width:50px;">
+                              &nbsp;{{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}}
+                          </span>
+                          <span style='width:10px'>/</span>
+                          <span class="under_line" style="width:50px;">
+                              &nbsp;{{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
+                          </span>
+                          <span style='width:30px'>mmHg</span>
+                        </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">
                       <div class="inline_block">
@@ -1399,6 +1410,17 @@
                             )
                           "
                         ></check-box>
+                        <check-box
+                          v-if="org_id == 9987"
+                          text="低血糖"
+                          :checked="
+                            isValueIndexOfCheck(
+                              record.assessment_after_dislysis,
+                              'complication',
+                              '低血糖'
+                            )
+                          "
+                        ></check-box>
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;">
@@ -1960,6 +1982,7 @@ export default {
   },
   created() {
     var xtuser = this.$store.getters.xt_user;
+    this.org_id = xtuser.org.id
     this.orgname = xtuser.org.org_name;
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -539,7 +539,7 @@
                                 {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }}
                             </span>
                         </td>
-                        <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                        <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
                         <td>
                             <span v-if="monitor.symptom || monitor.dispose || monitor.result">
                                 {{ monitor.symptom + "，" + monitor.dispose + "，" + monitor.result }}

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -209,6 +209,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 28">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 30">
         <el-button
           size="small"
@@ -797,6 +807,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
       } else if (this.template_id == 25) {
         this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
+      }else if(this.template_id == 28){
+         this.$router.push({path:"/dialysis/print/batch/twentyEight"})
       } else if (this.template_id == 30) {
         this.$router.push({ path: "/dialysis/print/batch/thirty" });
       } else if (this.template_id == 32) {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -20,6 +20,13 @@
 
         </li>
 
+         <li v-if="isShow('置换速度')">
+          <label>置换速度 : </label>
+          <span class="content">{{displace_speed }}</span>
+            <span class="unit">ml/min</span>
+        </li>
+
+
         <li v-if="isShow('透析液配方')">
           <label>透析液配方 : </label>
           <span class="content">{{ dialysate_formulation }}</span>
@@ -559,6 +566,9 @@ export default {
     },
     antioxidant_commodity_name:function(){
       return this.getValueStr('antioxidant_commodity_name','antioxidant_commodity_name')
+    },
+    displace_speed:function(){
+      return this.getValueStr('displace_speed','displace_speed')
     }
   },
   created() {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -88,6 +88,7 @@
       :last_prescription="last_dialysis_prescribe"
       :dry_weight="last_dryWeight_dislysis"
       :schedual="temp_schedual"
+      :lastAssessment="lastAssessment"
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
@@ -113,6 +114,7 @@
       :predialysis_evaluation="predialysis_evaluation"
       :admin_users="admin_users"
       :dry_weight="last_dryWeight_dislysis"
+      :lastAssessment="lastAssessment"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -506,6 +508,13 @@ export default {
       default: () => {
         return [];
       }
+    },
+    lastAssessment:{
+     // 最后一条血管通路(处理今天录的)
+     type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {
@@ -542,7 +551,7 @@ export default {
       lastDialysisPrescribe,
       lastDryWeightDislysis,
       schedual,
-      system_prescribe
+      system_prescribe,
     ) {
 
       this.$refs.assessmentBefore.setLastRecord(
@@ -598,7 +607,7 @@ export default {
     showAssessmentBefore: function() {
       console.log(this.last_predialysis_evaluation)
 
-      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation);
+      this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
       this.$refs.doubleCheck.show();

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

@@ -743,6 +743,12 @@
         default: () => {
           return []
         }
+      },
+      lastAssessment:{
+        type:Array,
+         default: () => {
+          return []
+        }
       }
 
     },
@@ -752,6 +758,7 @@
         this.lastDryWeightDislysis = lastDryWeightDislysis
       },
       isShow(name) {
+        
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
@@ -760,6 +767,7 @@
         }
         return false
       },
+
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
        
@@ -812,6 +820,7 @@
 
           if (lastDryWeightDislysis != null) {
             this.weight_adjust.weight = lastDryWeightDislysis.dry_weight
+           
             this.$set(
               this.assessmentBeforeDislysis,
               'dry_weight',
@@ -825,6 +834,9 @@
             }
           }
 
+
+
+
           if (this.lastPredialysisEvaluation != null) {
             for (var key in this.lastPredialysisEvaluation){
               if (key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'dry_weight' && key != 'weight_before'){
@@ -837,6 +849,30 @@
               }
             }
           }
+          
+         //最后一次血管通路
+
+         if(this.lastAssessment!=null){
+           var blood_id = 0
+           for(let i= 0;i<this.blood_access_part_opera.length;i++){
+              if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
+                 blood_id = this.blood_access_part_opera[i].id
+              }
+           }
+            this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
+            this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
+          } else {
+            if (this.lastPredialysisEvaluation != null) {
+               var blood_id = 0
+                for(let i= 0;i<this.blood_access_part_opera.length;i++){
+                    if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
+                      blood_id = this.blood_access_part_opera[i].id
+                    }
+                }
+              this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
+              this.assessmentBeforeDislysis.blood_access_part_id = this.lastPredialysisEvaluation.blood_access_part_id
+            }
+          }
 
         } else {
          

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

@@ -252,7 +252,17 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          
 
+           <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
+            <el-form-item label="置换速度(ml/min)">
+               <el-input
+                v-model="dialysisPrescription.displace_speed"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+ 
           <el-col
             :span="8"
             v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
@@ -454,14 +464,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29)" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24)" v-show="totalShow">
             <el-form-item label="置换液总量(ml)">
               <el-input
                 v-model="dialysisPrescription.displace_liqui_value"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24" v-show="totalShow">
             <el-form-item label="置换液总量(L)">
               <el-input
                 v-model="dialysisPrescription.displace_liqui_value"
@@ -1151,7 +1161,13 @@
           return { id: 0 }
         }
       },
-      scheudle_mode:Number
+      scheudle_mode:Number,
+      lastAssessment: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
     },
     computed: {
       dialysis_date: function() {
@@ -1273,6 +1289,7 @@
           blood:"",
           irrigation:"",
           antioxidant_commodity_name:"",
+          displace_speed:"",
         },
 
         anticoagulant: {
@@ -1423,7 +1440,7 @@
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
 
         this.treatment_mode = this.$store.getters.treatment_mode
-        console.log("99999",this.treatment_mode)
+        // console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(
           'hemodialysis',
           'perfusion_apparatus'
@@ -1821,6 +1838,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
+     
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1893,6 +1911,8 @@
         } else {
           last_weight_after = this.last_record.weight_after
         }
+        
+ 
 
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
@@ -1911,7 +1931,10 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
+
             weight_before = 0
+
+           
           }
 
         } else {
@@ -1919,6 +1942,30 @@
         }
 
 
+          //获取最后一次血管通路
+         if(this.predialysis!=null){
+            if(this.lastAssessment!=null){
+              var blood_id = 0
+              for(let i= 0;i<this.blood_access_option.length;i++){
+                  if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
+                    blood_id = this.blood_access_option[i].id
+                  }
+              }
+               console.log("中国人名职员",this.lastAssessment)
+               this.dialysisPrescription.blood_access = blood_id
+            }else{
+              if(this.last_prescription!=null){
+                  var blood_id = 0
+                  for(let i= 0;i<this.blood_access_option.length;i++){
+                      if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
+                        blood_id = this.blood_access_option[i].id
+                      }
+                  }   
+                   this.dialysisPrescription.blood_access = blood_id
+              }
+            }
+           
+         }
 
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(

src/xt_pages/dialysis/details/index.vue

@@ -217,6 +217,7 @@
         <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
         <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
       </div>
+
       <nav-igation
         ref="nav"
         title="弹窗导航"
@@ -265,9 +266,12 @@
         @assessmentAfterDislysis="assessmentAfterDislysisFunc"
         :system_prescribe="system_prescribe"
         :his_is_open="his_is_open"
+        :lastAssessment="lastAssessment"
       >
       </nav-igation>
 
+
+
       <basic-infor
         :patient="patient"
         :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
@@ -630,6 +634,7 @@ export default {
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
       lastDryWeightDislysis: { id: 0 },
+      lastAssessment:{id:0},
       headNurses: [],
       lastDialysisPrescribe: { id: 0 },
       //
@@ -971,21 +976,19 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          // console.log("患者排班信息99999999",schedual)
+        
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
             }
           }
-          // console.log('透析处方', prescription)
+        
           var solution = resp.data.solution // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
-          // console.log('receiver_treatment_access', receiver_treatment_access)
+         
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
          
-        
-
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1015,20 +1018,21 @@ export default {
           var aliquid_info = resp.data.aliquid_info
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
-          // console.log('上次透前评估', lastPredialysisEvaluation)
+        
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0
             }
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord
-          var lastAssessmentAfterDislysis =
-            resp.data.lastAssessmentAfterDislysis
+          var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
-          // console.log("最后一次干体重",lastDryWeightDislysis)
+         
           var system_prescribe = resp.data.system_prescribe
-
+           
+          var lastAssessment =  resp.data.lastAssessment
+          console.log("最后一次血管通路",lastAssessment)
           this.$refs.nav.setLastRecord(
             lastPredialysisEvaluation,
             lastMonitorRecord,
@@ -1036,7 +1040,8 @@ export default {
             lastDialysisPrescribe,
             lastDryWeightDislysis,
             schedual,
-            system_prescribe
+            system_prescribe,
+            lastAssessment,
           )
 
           var headNurses = resp.data.headNurse
@@ -1047,6 +1052,7 @@ export default {
           this.lastAssessmentAfterDislysis = lastAssessmentAfterDislysis
           this.lastDialysisPrescribe = lastDialysisPrescribe
           this.lastDryWeightDislysis = lastDryWeightDislysis
+          this.lastAssessment = lastAssessment
           this.headNurses = headNurses
           this.system_prescribe = system_prescribe
 
@@ -1109,8 +1115,7 @@ export default {
           this.dialysis_order =
             dialysis_order == null ? { id: 0 } : dialysis_order
 
-          // this.$refs.stat_order.setAdvices(this.doctor_advices)
-          // this.$refs.monitoring.setRecords(this.monitor_records)
+         
 
           this.admin_users = resp.data.doctors
           this.devices = resp.data.devices
@@ -1121,9 +1126,7 @@ export default {
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
           
-          // var stockType =  resp.data.stockType
-          // this.stockType = stockType
-          // console.log("stockTYPW",stockType)
+      
           
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -137,6 +137,19 @@
                         <!--&nbsp;-->
                       </div>
                     </td>
+                    <td v-if="org_id == 9987" width="80">透前血压:</td>
+                    <td v-if="org_id == 9987" width="50">
+                      <div class="under-line">
+                        &nbsp;{{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}}
+                      </div>
+                    </td>
+                    <td v-if="org_id == 9987" width='10'>/</td>
+                    <td v-if="org_id == 9987" width="50">
+                      <div class="under-line">
+                        &nbsp;{{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "" }}
+                      </div>
+                    </td>
+                    <td v-if="org_id == 9987" width='30'>mmHg</td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -702,7 +715,7 @@
                 <tbody>
                   <tr>
                     <td width="55">并发症:</td>
-                    <td width="600">
+                    <td :width="org_id == 9987 ? 670 : 600">
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血压') > -1 ? true : false" showValue="低血压"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('高血压') > -1 ? true : false" showValue="高血压"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('心律失常') > -1 ? true : false" showValue="心律失常"></label-box>
@@ -714,6 +727,7 @@
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('心衰') > -1 ? true : false" showValue="心衰"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('腹痛') > -1 ? true : false" showValue="腹痛"></label-box>
                       <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
+                      <label-box v-if="org_id == 9987" :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血糖') > -1 ? true : false" showValue="低血糖"></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="dialysis-print-box">
     <div class="dialysis-print-order">
-      <!-- <div class="order-yy-name">{{ orgname }}</div> -->
+    
       <div class="order-title">{{ orgname }}&nbsp;&nbsp;血液净化治疗记录单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
@@ -39,12 +39,7 @@
         </tr>
         </tbody>
       </table>
-      <!-- <div style="display:flex:font-size:14px">
-        <span style="width:50px;text-align:text-algin">诊 断:</span>
-        <div class="under-line" style="text-align:left">
-          &nbsp;{{ patientInfo.diagnose }}
-        </div>
-      </div> -->
+     
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
         <tr>
@@ -63,6 +58,7 @@
         </tr>
         </tbody>
       </table>
+
       <table class="print-table" border="1">
         <tbody>
         <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -377,11 +377,11 @@
                       <div>
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="好"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量差-A') > -1 ? true : false" showValue="A"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('A端血流量差') > -1 ? true : false" showValue="A"></label-box>
                         /
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量差-V') > -1 ? true : false" showValue="V"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('V端血流量差') > -1 ? true : false" showValue="V"></label-box>
                         差&nbsp;
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
                       </div>
                     </td>
                   </tr>
@@ -559,7 +559,7 @@
                 <table class="table-box">
                     <tbody>
                         <tr>
-                            <td width='110'>透析频率(次/周)</td>
+                            <td width='120'>透析频率(次/周)</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}
@@ -583,12 +583,18 @@
                             </td>
                             <td width='20'></td>
                             <td width='80'>灌流器</td>
-                            <td width='120'>
+                            <td width='100'>
                                 <div class="under-line">
                                     &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? getDialyzerPerfusionApparatus(prescription.dialyzer_perfusion_apparatus,'灌流器') : '' }}
                                 </div>
                             </td>
-                            <td></td>
+                            <td width='70'>置换速度</td>
+                            <td width='90'>
+                                <div class="under-line">
+                                    &nbsp;{{ prescription.displace_speed ? prescription.displace_speed:'' }}
+                                </div>
+                            </td>
+                            
                         </tr>
                     </tbody>
                 </table>
@@ -649,14 +655,14 @@
                                     &nbsp;<span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
                                 </div>
                             </td>
-                            <td width='10'>mg</td>
+                            <td width='10'>U</td>
                             <td width='40'>追加</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;<span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi }}</span>
                                 </div>
                             </td>
-                            <td width='20'>mg/h</td>
+                            <td width='20'>U/h</td>
                             <td width='40'>提前</td>
                             <td width='50'>
                                 <div class="under-line">
@@ -682,8 +688,8 @@
                     <td width="20">钙</td>
                     <td width="180">
                       (
-                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="1.25"></label-box>
-                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="1.5"></label-box>
+                        <label-box :isChecked="false" showValue="1.25"></label-box>
+                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="1.5"></label-box>
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钙') > -1 ? true : false" showValue="1.75"></label-box>
                       )
                     </td>
@@ -728,7 +734,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('肝素')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDispose(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -741,7 +747,7 @@
                     <td width='50'>
                         <div class="under-line">
                             &nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('+NS')>-1">
-                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^0-9]/ig,"") : '' }}
+                                {{ afterdialysis.sealing_fluid_dispose ? getSealingFluidDisposetwo(afterdialysis.sealing_fluid_dispose).replace(/[^\d.]/g,"") : '' }}
                             </span>
                         </div>
                     </td>
@@ -1547,6 +1553,27 @@ export default {
         if(arr[i] == "肝素10ml"){
           strname = "肝素10ml"
         }
+        if(arr[i] == "肝素1.1ml"){
+          strname = "肝素1.1ml"
+        }
+        if(arr[i] == "肝素1.2ml"){
+          strname = "肝素1.2ml"
+        }
+       if(arr[i] == "肝素1.3ml"){
+          strname = "肝素1.3ml"
+        }
+        if(arr[i] == "肝素1.4ml"){
+          strname = "肝素1.4ml"
+        }
+       if(arr[i] == "肝素1.5ml"){
+          strname = "肝素1.5ml"
+        }
+       if(arr[i] == "肝素1.6ml"){
+          strname = "肝素1.6ml"
+        }
+       if(arr[i] == "肝素1.7ml"){
+          strname = "肝素1.7ml"
+        }
       }
       return strname
     },
@@ -1564,6 +1591,27 @@ export default {
         if(arr[i] == "+NS10ml"){
           strname = "+NS10ml"
         }
+        if(arr[i] == "+NS1.1ml"){
+          strname = "+NS1.1ml"
+        }
+        if(arr[i] == "+NS1.2ml"){
+          strname = "+NS1.2ml"
+        }
+       if(arr[i] == "+NS1.3ml"){
+          strname = "+NS1.3ml"
+        }
+       if(arr[i] == "+NS1.4ml"){
+          strname = "+NS1.4ml"
+        }
+       if(arr[i] == "+NS1.5ml"){
+          strname = "+NS1.5ml"
+        }
+       if(arr[i] == "+NS1.6ml"){
+          strname = "+NS1.6ml"
+        }
+      if(arr[i] == "+NS1.7ml"){
+          strname = "+NS1.7ml"
+        }
       }
       return strname
     },

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -169,7 +169,7 @@
                 {{scope.row.mission_count?scope.row.mission_count:''}}
               </template>
             </el-table-column>
-             
+
               <!-- change_nurse_count:total_change_nurse,
                 diffcult_nurse_count:total_diffcult_nurse,
                 new_fistula_nurse_count:total_new_fistula_nurse,
@@ -390,13 +390,13 @@
         this.loading = true
         this.tableData = []
         this.modeList = []
-        console.log("params",params)
+        // console.log("params",params)
         GetNurseWorkloadTableData(params)
           .then(rs => {
             var resp = rs.data
-             
+
             if (resp.state == 1) {
-            
+
               let total_cure = 0
               let total_puncture = 0
               let total_mission = 0
@@ -405,12 +405,12 @@
               let total_new_fistula_nurse = 0
               let total_start_nurse = 0
               this.loading = false
-              
+
               for (let i = 0; i < resp.data.data.length; i++) {
                 total_cure = total_cure + resp.data.data[i].cure_count
                 total_puncture = total_puncture + resp.data.data[i].puncture_count
                 total_mission = total_mission + resp.data.data[i].mission_count
-                
+
                 total_change_nurse = total_change_nurse + resp.data.data[i].change_nuser_count
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
@@ -427,7 +427,7 @@
                 new_nuser_count:total_new_fistula_nurse,
                 start_nuser_count:total_start_nurse,
               })
-             
+
               var dialysisCount = resp.data.dialysisCount
                 console.log("dialysisCount",dialysisCount)
               for(let i=0;i<dialysisCount.length;i++){
@@ -522,13 +522,13 @@
           this.monthValue = ''
           sessionStorage.setItem("nurse_start_time", val)
           sessionStorage.removeItem("nurseMonth");
-          
+
           this.GetNurseWorkloadChartData(this.query)
           this.GetNurseWorkloadTableData(this.query)
 
         }
 
-      }, 
+      },
        GetNurseWorkloadChartData(params) {
 
         this.bar.xAxis.data = []
@@ -666,7 +666,7 @@
       this.query.end_time = year + '-' + month + '-' + day
       this.query.start_time = year + '-' + last_month + '-' + day
       this.query.statistics_type = 1
-      
+
       this.start_time = year + '-' + last_month + '-' + day
       this.end_time = year + '-' + month + '-' + day
 
@@ -699,7 +699,7 @@
         this.end_time = ''
       }
       // console.log('this.query2',this.query)
-      
+
       this.GetAllNurse()
       this.GetNurseWorkloadChartData(this.query)
       this.GetNurseWorkloadTableData(this.query)

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -8,14 +8,14 @@
       type="primary"
       >打印
     </el-button>
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -575,7 +575,7 @@ export default {
         excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '耗材出库明细'
+           filename: '耗材退库明细'
          })
           this.downloadLoading = false
         })

src/xt_pages/stock/detail/print.vue

@@ -171,6 +171,7 @@
             var stockTotal = response.data.data.stockTotal
             console.log("stocktOTl",stockTotal)
             this.stockTotal = stockTotal
+            console.log("导出数据",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -9,14 +9,14 @@
       >打印
     </el-button>
 
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -576,7 +576,7 @@ export default {
         excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '耗材出库明细'
+           filename: '耗材退货明细'
          })
           this.downloadLoading = false
         })

src/xt_pages/stock/detail/stockInDetail.vue

@@ -9,14 +9,14 @@
       >打印
     </el-button>
 
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
 
     <div class="cell clearfix">
       <el-input
@@ -201,7 +201,8 @@ import {
   deleteCancelStock,
   GetAllConfig,
   getStockDetail,
-  getPrintStockGood
+  getPrintStockGood,
+  
 } from "@/api/stock";
 
 export default {
@@ -232,6 +233,8 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
+
+    this.getPrintStockGood()
   },
   data() {
     return {
@@ -264,21 +267,25 @@ export default {
       selectedTableData: [],
       dealer: [],
       tableList:[],
-      goodUnit:[]
+      goodUnit:[],
+      stockTotal:[]
     };
   },
   methods: {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeDealer: function(val) {
       this.dealer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -388,7 +395,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+            // this.tableList.push(obj)
           }
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -444,10 +451,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -456,6 +465,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -465,6 +475,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -625,57 +636,115 @@ export default {
         }
       });
     },
-    exportList(){
+   getPrintStockGood(){
+     const params = {
+       start_time:this.start_time,
+       end_time:this.end_time,
+       type:1,
+     }
+   
+     getPrintStockGood(params).then(response=>{
+        if(response.data.state == 1){
+          var stockTotal =  response.data.data.stockTotal
+        
+          this.stockTotal = stockTotal
+          var list =  response.data.data.list
+         
+          for(let i=0;i<list.length;i++){
+            if (list[i].query_warehousing_info.length > 0) {
+               this.tableList.push(list[i])
+             }
+          }
+         
        
-     let dataInfo = {}
-     this.tableList.forEach((item, index) => {
-     let { good_id } = item
-     if (!dataInfo[good_id]) {
-        dataInfo[good_id] = {
-        child: [],
-        good_id: item.good_id,
-        count:0,
-        total:0,
-        price:0.0,
-        remark:""
-      }
-      }
+       
+        }
      })
-     let list = Object.values(dataInfo)
-    
-     list.map(item=>{
-     for(let i=0;i<this.tableList.length;i++){
-       if(item.good_id == this.tableList[i].good_id){
-           item.child.push(this.tableList[i])
-         }
+   },
+
+    calCount(stock) {
+        let total = 0
+        var array = []
+        array = stock.query_warehousing_info
+        for (let i = 0; i < array.length; i++) {
+         total = total + array[i].warehousing_count
         }
-      })
+        return total
+      },
 
-     for(let k=0;k<list.length;k++){
-       for(let z=0;z<list[k].child.length;z++){
-          if(list[k].good_id == list[k].child[z].good_id){
-             list[k].count += list[k].child[z].warehousing_count
-             list[k].price = list[k].child[0].price
-             list[k].remark = list[k].child[0].remark
+     calTotal(stock) {
+       var array = []
+       array = stock.query_warehousing_info
+        let total_price = 0.0
+        for (let i = 0; i < array.length; i++) {
+         total_price = total_price + array[i].warehousing_count * array[i].price  
+        }
+        return  Math.floor(total_price * 100) / 100
+      }, 
+      calTotalPrice() {
+        var amountPrice = 0
+        for (let i = 0; i < this.tableList.length; i++) {
+          var obj = this.tableList[i]
+          var len = 0
+          len = obj.query_warehousing_info.length
+          let total_price = 0.0
+          for (let a = 0; a < len; a++) {
+           total_price = total_price + obj.query_warehousing_info[a].total_price   
           }
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, 
+      getStockCount(id){
+        
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+      },
+      getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
+        }
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
+      },
+    
+    exportList(){
+       var obj = {index:"合计",total:0}
+       obj.total = this.calTotalPrice()
+      for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+        this.tableList[i].count = this.calCount(this.tableList[i])
+        this.tableList[i].total = this.calTotal(this.tableList[i])
+        this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
+        this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
+
        }
-     }
+       this.tableList.push(obj)
+       console.log("数据222222",this.tableList)
     
-      
-      for(let i=0;i<list.length;i++){
-          list[i].index = i+1
-          list[i].drug_name =  this.typeNameOne(list[i].good_id) 
-          list[i].drug_spec =  this.specificationName(list[i].good_id)
-          list[i].min_unit = this.getUnit(list[i].child[0].GoodInfo.good_unit)
-          list[i].total = list[i].price * list[i].count
-        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
+       
+       const data = this.formatJson(filterVal, this.tableList)
        
-       const data = this.formatJson(filterVal, list)
-       console.log("data",data)
-      
         excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -8,14 +8,14 @@
       type="primary"
       >打印
     </el-button>
-     <!-- <el-button
+     <el-button
       style="float: right;margin-right:10px"
       size="small"
       icon="el-icon-printer"
       @click="exportList"
       type="primary"
       >导出
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -195,7 +195,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
@@ -225,6 +225,7 @@ export default {
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
+    this.getPrintStockGood()
   },
   data() {
     return {
@@ -256,17 +257,20 @@ export default {
       selectedTableData: [],
       dealer: [],
       goodUnit:[],
-      tableList:[]
+      tableList:[],
+      stockTotal:[]
     };
   },
   methods: {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -328,7 +332,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+            
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -372,7 +376,7 @@ export default {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            this.tableList.push(obj)
+           
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -429,10 +433,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getPrintStockGood()
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -441,6 +447,7 @@ export default {
         this.start_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     endTimeChange(val) {
@@ -450,6 +457,7 @@ export default {
         this.end_time = "";
       } else {
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -617,26 +625,115 @@ export default {
         }
       });
     },
+    getPrintStockGood(){
+      const params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        type:3,
+      }
+      console.log("params",params)
+      getPrintStockGood(params).then(response=>{
+          if(response.data.state == 1){
+            var stockTotal =  response.data.data.stockTotal
+            console.log("stockTotal",stockTotal)
+            this.stockTotal = stockTotal
+            var list =  response.data.data.list
+            console.log("导出数据",list)
+            for(let i=0;i<list.length;i++){
+              if (list[i].query_warehouseout_info.length > 0) {
+                this.tableList.push(list[i])
+              }
+            }
+          console.log("表哥",this.tableList)
+          }
+      })
+    },
+     calCount(stock) {
+        let total = 0
+        var array = []
+        array = stock.query_warehousing_info
+        for (let i = 0; i < array.length; i++) {
+         total = total + array[i].warehousing_count
+        }
+        return total
+      },
+
+     calTotal(stock) {
+       var array = []
+       array = stock.query_warehousing_info
+        let total_price = 0.0
+        for (let i = 0; i < array.length; i++) {
+         total_price = total_price + array[i].warehousing_count * array[i].price  
+        }
+        return  Math.floor(total_price * 100) / 100
+      }, 
+      calTotalPrice() {
+        var amountPrice = 0
+        for (let i = 0; i < this.tableList.length; i++) {
+          var obj = this.tableList[i]
+          var len = 0
+          len = obj.query_warehouseout_info.length
+          let total_price = 0.0
+          for (let a = 0; a < len; a++) {
+           total_price = total_price + obj.query_warehouseout_info[a].total_price   
+          }
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, 
+      getStockCount(id){
+        
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+      },
+      getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
+        }
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
+      },
+   
+
      exportList(){
      
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].drug_name =  this.typeNameOne(this.tableList[i].good_id) 
-          this.tableList[i].drug_spec =  this.specificationName(this.tableList[i].good_id)
-          this.tableList[i].min_unit = this.getUnit(this.tableList[i].GoodInfo.good_unit)
-          this.tableList[i].total_price = this.getTotal(this.tableList[i].price,this.tableList[i].count)
-         
-        }
+      var obj = {index:"合计",total:0}
+       obj.total = this.calTotalPrice()
+       for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
+        this.tableList[i].count = this.getStockCount(this.tableList[i].id)
+        this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].price
+        this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].query_warehouseout_info[0].price).toFixed(2)
+        this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
+       }
+       this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'min_unit','count','price','total','remark']
        
 
       
 
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
-       
+     
         excel.export_json_to_excel({
            header: tHeader,
            data,

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

@@ -366,7 +366,46 @@ export default {
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
           this.cancelStockDate = drugInOrder
-          this.tableList = drugInOrder
+           let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 warehousing_count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:0
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list22333333",list)
+         for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          console.log("list2334444",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].warehousing_count!=null || list[i].child[j].warehousing_count != "" || list[i].child[j].warehousing_count!=0){
+                list[i].warehousing_count += list[i].child[j].warehousing_count
+                
+              }
+            }
+          }
+          for(let i=0;i<list.length;i++){
+            list[i].total_price = list[i].warehousing_count * list[i].price  
+          }
+          console.log("list666666666",list)
+          this.tableList = list
           var total = response.data.data.total
           this.total = total
         }
@@ -392,9 +431,18 @@ export default {
           this.tableList[i].index = i+1
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','warehousing_count','price','remark']
-       
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','warehousing_count','price','total_price','remark']
+       console.log("表格22222222",this.tableList)
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableList.length;i++){
+         obj.total_price += this.tableList[i].price * this.tableList[i].warehousing_count
+       }
+       for(let j=0;j<this.tableList.length;j++){
+         this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       this.tableList.push(obj)
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
        

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

@@ -388,7 +388,46 @@ export default {
           var order = response.data.data.order
           console.log("出库数据",order)
           this.tableData = order
-          this.tableList = order
+           let objInfo = {}
+          order.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:0,
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list2334444",list)
+          for(let i=0;i<order.length;i++){
+            list.map(item=>{
+              if(order[i].drug_id == item.drug_id){
+                 item.child.push(order[i])
+              }
+            })
+          }
+          
+          console.log("list22333333",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
+                list[i].count += list[i].child[j].count
+              }
+            }
+          }
+          for(let i=0;i<list.length;i++){
+             list[i].total_price = list[i].count * list[i].price
+          }
+          console.log("list666666666",list)
+          this.tableList = list
           var total = response.data.data.total
           this.total = total
         } 
@@ -414,9 +453,17 @@ export default {
           this.tableList[i].index = i+1
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','remark']
-       
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       let obj = {'index':'合计','total_price':0}
+       for(let i=0;i<this.tableList.length;i++){
+         obj.total_price += this.tableList[i].price * this.tableList[i].count
+       }
+       for(let j=0;j<this.tableList.length;j++){
+          this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       this.tableList.push(obj)
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
        

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -22,7 +22,6 @@
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
-               <td style="line-height: 50px" width="80">出货价</td>
               <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
@@ -48,10 +47,7 @@
                   {{item.price}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
-              </td>
-              <td style="line-height:50px">
-                  {{item.total_price}}
+                  {{(item.count * item.price).toFixed(2)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -63,7 +59,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -171,15 +167,52 @@
       getDrugOutDetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.order
-          console.log("drug3434444",drugInOrder)
-          this.cancelStockDate = drugInOrder
+          console.log("出库数据22",drugInOrder)
+          let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 count:0,
+                 price:item.price,
+                 remark:item.remark,
+                 total_price:"",
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list2334444",list)
+          for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          
+          console.log("list22333333",list)
+            for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
+                list[i].count += list[i].child[j].count
+              }
+            }
+          }
+          console.log("list666666666",list)
+          this.cancelStockDate = list
+        
         }
       })  
       },
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
-            total += this.cancelStockDate[i].total_price
+            total += this.cancelStockDate[i].price * this.cancelStockDate[i].count
          }
          return total
       }

src/xt_pages/stock/drugs/drugPrint.vue

@@ -22,6 +22,7 @@
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
 
@@ -45,6 +46,9 @@
               <td style="line-height:50px">
                   {{item.price}}
               </td>
+              <td style="line-height:50px">
+                 {{(item.warehousing_count*item.price).toFixed(2)}}
+              </td>
               <td style="line-height: 50px">
                  {{item.remark}}
               </td>
@@ -55,7 +59,7 @@
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
               <td></td>
             </tr>
 
@@ -164,7 +168,42 @@
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
-          this.cancelStockDate = drugInOrder
+
+          let objInfo = {}
+          drugInOrder.forEach((item,index)=>{
+             let { drug_id } = item
+             if(!objInfo[drug_id]){
+               objInfo[drug_id] = {
+                 drug_id,
+                 child:[],
+                 drug_name:item.drug_name,
+                 drug_spec:item.drug_spec,
+                 min_unit:item.min_unit,
+                 warehousing_count:0,
+                 price:item.price,
+                 remark:item.remark,
+               }
+             }
+          })
+          let list = Object.values(objInfo);
+          console.log("list22333333",list)
+         for(let i=0;i<drugInOrder.length;i++){
+            list.map(item=>{
+              if(drugInOrder[i].drug_id == item.drug_id){
+                 item.child.push(drugInOrder[i])
+              }
+            })
+          }
+          console.log("list2334444",list)
+          for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+              if(list[i].child[j].warehousing_count!=null || list[i].child[j].warehousing_count != "" || list[i].child[j].warehousing_count!=0){
+                list[i].warehousing_count += list[i].child[j].warehousing_count
+              }
+            }
+          }
+          console.log("list666666666",list)
+          this.cancelStockDate = list
           var total = response.data.data.total
           this.total = total
         }
@@ -174,7 +213,7 @@
       getTotal(){
         var total = 0
         for(let i=0;i<this.cancelStockDate.length;i++){
-           total += this.cancelStockDate[i].price
+           total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
         }
         return total
       }

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -0,0 +1,419 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-title">药品管理查询表</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">入库数量</td>
+              <td style="line-height: 50px" width="80">出库数量</td>
+              <td style="line-height: 50px" width="80">入库退货</td>
+              <td style="line-height: 50px" width="80">出库退库</td>
+              <td style="line-height: 50px" width="80">剩余库存</td>
+              <td style="line-height:50px" width="80">单价</td>
+           
+            </tr>
+
+            <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span> {{ item.drug_name }}</span>
+              </td>
+              <td style="line-height: 50px">
+                   <span>{{ item.drug_spec }}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  <span>{{ stockInCount(item) }}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span>{{ stockOutCount(item) }}</span>
+              </td>
+              <td> <span>{{ salesReturnCount(item) }}</span ></td>
+              <td> <span>{{ cancelStockCount(item) }}</span></td>
+              <td>
+                <span>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</span>
+             </td> 
+              <td style="line-height:50px">
+                  {{item.last_price}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
+  import { getDictionaryDataConfig } from "@/utils/data";
+  import {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10000,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        drugCategory:[],
+        drug_category:"",
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+   
+       GetAllDrugStockQueryList() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.$route.query.keyword,
+          drug_category:this.$route.query.drug_category,
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time,
+        }
+        console.log("parasm22222",Params)
+        this.WarehouseInfo.warehouseInfoDate = []
+        getAllDrugStockQueryList(Params).then(response => {
+          if (response.data.state == 0) {
+            
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            
+            this.total = response.data.data.total
+            var arr = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
+              
+            }
+            console.log("数据源头",this.WarehouseInfo.warehouseInfoDate)
+          }
+        })
+      },
+     getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
+      stockInCount: function(row) {
+        let total = 0
+        for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
+          total = total + row.query_drug_warehousing_info[i].warehousing_count
+        }
+        return total
+      },
+      salesReturnCount: function(row) {
+        let total = 0
+
+        for (let i = 0; i < row.query_drug_sales_return_info.length; i++) {
+          total = total + row.query_drug_sales_return_info[i].count
+        }
+        return total
+      },
+      stockOutCount: function(row) {
+        let total = 0
+
+        for (let i = 0; i < row.query_drug_warehouseout_info.length; i++) {
+          total = total + row.query_drug_warehouseout_info[i].count
+        }
+        return total
+      },
+      cancelStockCount: function(row) {
+        let total = 0
+        for (let i = 0; i < row.query_drug_cancel_stock_info.length; i++) {
+          total = total + row.query_drug_cancel_stock_info[i].count
+        }
+        return total
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use: this.is_use,
+          is_charge: this.is_charge,
+          is_inject: this.is_inject
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+            console.log("list222222",this.list)
+          }
+        })
+      },
+    },
+    created() {
+      this.GetAllDrugStockQueryList()
+      var drugCategory = getDictionaryDataConfig('system','drug_category')
+      this.drugCategory.push(...drugCategory)
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -14,9 +14,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">入库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266"
-            >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
-          >
+          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -243,6 +242,12 @@ export default {
     },
     editRecord: function() {
       this.$emit("edit-record");
+    },
+    printOrder(){
+      this.$router.push({
+        name: "drugInOrderDetailPrint",
+        query: { id: this.$route.query.id }
+      });
     }
   }
 };

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-title">药品入库登记表</div>
+         
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height:50px" width="80">总价</td>
+            </tr>
+
+            <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                 <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                 <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.drug_id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                   <span>{{ item.warehousing_count }}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td style="line-height:50px">
+                <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
+             </td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td colspan="5"></td>
+              <td>{{allPrice.toFixed(2)}}</td>
+            </tr>
+            </tbody>
+          </table>
+        
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import {getDrugWarehouseInfoList} from "@/api/drug/drug_stock";
+  import {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+        Warehouse: {
+          loading: false,
+          warehouseDate: [],
+          tableCurrentIndex: ""
+        },
+
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: [],
+          warehouse: {}
+        },
+        allPrice:0,
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+        page:1,
+        limit:10000,
+        keywords:""
+      }
+    },
+    methods: {
+      getDateOne(){
+        return "入库日期: "+this.start_time +"~"+this.end_time
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+     
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      GetOrderDetail: function(order_id) {
+        const params = {
+          id: order_id
+        };
+      getDrugWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+          }
+          console.log("数据源",this.WarehouseInfo.warehouseInfoDate)
+          var total_price = 0
+          for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
+            total_price += this.WarehouseInfo.warehouseInfoDate[i].warehousing_count * this.WarehouseInfo.warehouseInfoDate[i].price
+          }
+          console.log("total_price",total_price)
+          this.allPrice = total_price
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+        }
+      });
+    },
+     getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use: this.is_use,
+          is_charge: this.is_charge,
+          is_inject: this.is_inject
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+            console.log("list222222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+    },
+    created() {
+      const order_id = this.$route.query.id;
+      this.GetOrderDetail(order_id);
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -686,8 +686,10 @@ export default {
     },
 
     jump(id){
+    
       this.GetOrderDetailTwo(id)
       this.userList=[]
+      this.dialogVisibleTwo = true
     },
 
      GetOrderDetailTwo(order_id) {
@@ -699,6 +701,7 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.userList=[]
             var total = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
               var obj = response.data.data.list[i]
@@ -706,7 +709,7 @@ export default {
               this.userList.push(obj)
               total = total + response.data.data.list[i].count
             }
-            this.userList=[]
+           
             this.userList.push({
               is_total: 1,
               total: total,

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -11,7 +11,8 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>&nbsp;&nbsp;
+          <span><el-button size="small" type="primary" @click="printOrder">打印</el-button></span>
         </el-row>
       </div>
 
@@ -253,9 +254,12 @@
           }
         })
         this.sameRowArr = sameRowArr
-
-
-
+      },
+      printOrder(){
+        this.$router.push({
+          name: "drugOutOrderDetailPrint",
+          query: { id: this.$route.query.id }
+        });
       }
     }
   }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">药品出库登记表</div>
+         
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="">总价</td>
+            </tr>
+
+            <tr v-for="(item,index) in warehousingOutInfo.warehousingOutData" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{getUnit(item.drug_id)}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="5"></td>
+               <td>{{allPrice.toFixed(2)}}</td>
+             </tr>
+            </tbody>
+          </table>
+        
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import {  getDrugWarehouseOutInfo } from '@/api/drug/drug_stock'
+  import {getBaseDrugLibList} from '@/api/data'
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        isEdit: 0,
+        checked: false,
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        dealer: [],
+
+        warehousingOutInfo: {
+          loading: false,
+          warehousingOutData: [],
+          info: {}
+        },
+        allPrice:0,
+        start_time:"",
+        end_time:"",
+        list:[],
+        is_use:"",
+        is_charge:"",
+        is_inject:"",
+        page:1,
+        limit:10000,
+        keywords:""
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+    GetOrderDetail: function(order_id) {
+            const params = {
+            'id': order_id
+            }
+            getDrugWarehouseOutInfo(params).then(response => {
+            if (response.data.state == 0) {
+
+                this.$message.error(response.data.msg)
+                return false
+            } else {
+              for (let i = 0; i < response.data.data.list.length; i++) {
+                this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+               }
+               var total_price = 0
+               for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+                 total_price += this.warehousingOutInfo.warehousingOutData[i].count * this.warehousingOutInfo.warehousingOutData[i].price
+               }
+               this.allPrice = total_price
+               this.warehousingOutInfo.info = response.data.data.info
+               this.handleSpanTempArr()
+            }
+            })
+        },
+        getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use: this.is_use,
+          is_charge: this.is_charge,
+          is_inject: this.is_inject
+        }
+        getBaseDrugLibList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+            console.log("list222222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(this.list[i].id == id){
+            name = this.list[i].min_unit
+          }
+        }
+        return name
+      },
+    },
+    created() {
+      const order_id = this.$route.query.id
+      this.GetOrderDetail(order_id)
+      this.getList()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/query.vue

@@ -12,6 +12,14 @@
         >设置
         </el-button
         >
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="printOrder"
+        >打印
+      </el-button>
       <el-button
           size="small"
           class="filter-item"
@@ -106,6 +114,12 @@
             >{{ stockInCount(scope.row) }}</span
             >
           </template>
+        </el-table-column>
+         <el-table-column label="单价" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.last_price}}</span
+            >
+          </template>
         </el-table-column>
         <el-table-column label="入库退货" align="center">
           <template slot-scope="scope">
@@ -292,9 +306,7 @@
             this.total = response.data.data.total
             var arr = []
             for (let i = 0; i < response.data.data.list.length; i++) {
-              this.WarehouseInfo.warehouseInfoDate.push(
-                response.data.data.list[i]
-              )
+              this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
               arr.push(response.data.data.list[i])
             }
             console.log("数据源头",arr)
@@ -413,8 +425,8 @@
       },
        exportStock(){
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
+         const tHeader = ['药品名称', '规格名称', '入库数量','单价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','last_price','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
        
         
          const data = this.formatJson(filterVal, this.tableData)
@@ -423,7 +435,7 @@
          excel.export_json_to_excel({
            header: tHeader,
            data,
-           filename: '自备药查询'
+           filename: '药品查询'
          })
           this.downloadLoading = false
         })
@@ -439,6 +451,12 @@
       },
       changeDrug(){
        this.GetAllDrugStockQueryList()
+      },
+      printOrder(){
+        this.$router.push({
+          name: "drugQueryPrint",
+          query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time}
+        });
       }
     }
   }

src/xt_pages/stock/stockInOrderDetail.vue

@@ -14,9 +14,7 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">入库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266"
-            >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
-          >
+          <span style="color: #606266">入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span>
         </el-row>
       </div>
 
@@ -36,14 +34,16 @@
         >
       </div>
 
-      <div class="cell clearfix" style="margin-top: 10px">
-     
-        <el-button size="small" icon="el-icon-edit" @click="editRecord"
-          >编辑</el-button
-        >
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
-          >删除</el-button
-        >
+      <div style="display:flex;justify-content: space-between;align-items: center;margin: 12px 0;">
+        <div>
+          <el-button size="small" icon="el-icon-edit" @click="editRecord"
+            >编辑</el-button
+          >
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
+            >删除</el-button
+          >
+        </div>
+        <el-button size="small" type="primary" @click="printOrder">打印</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -309,6 +309,12 @@ export default {
     },
     editRecord: function() {
       this.$emit("edit-record");
+    },
+    printOrder(){
+       this.$router.push({
+        name: "stockInDetailPrint",
+        query: { id: this.$route.query.id }
+      });
     }
   }
 };

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -0,0 +1,311 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">耗材入库登记单</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <td width="80">耗材名称</td>
+                                    <td width="80">规格型号</td>
+                                    <td width="80">单位</td>
+                                     <td width="80">进货价</td>
+                                    <td width="80">入库数量</td> 
+                                    <td width="80">总价</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
+                                    <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
+                                    <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
+                                    <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                    <td>{{item.price}}</td>
+                                    <td>{{item.warehousing_count}}</td> 
+                                    <td>{{(item.warehousing_count*item.price).toFixed(2)}}</td>
+                                </tr>
+                                <tr>
+                                  <td>合计</td>
+                                  <td colspan="4"></td>
+                                  <td>{{allPrice.toFixed(2)}}</td>
+                               </tr>
+                            </tbody>
+                        </table>
+
+                        <div style="display:flex;margin-top:20px;float:right;">
+                            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+                            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+                            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import {
+  GetAllConfig,
+  getWarehouseInfoList,
+  getGoodInfoList
+} from "@/api/stock";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '入库单打印' },
+          ],
+            isEdit: 0,
+            checked: false,
+            signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+            goodType: [],
+            goodInfo: [],
+            manufacturer: [],
+            dealer: [],
+            Warehouse: {
+                loading: false,
+                warehouseDate: [],
+                tableCurrentIndex: ""
+            },
+
+            WarehouseInfo: {
+                loading: false,
+                warehouseInfoDate: [],
+                warehouse: {}
+            },
+            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            allPrice:0,
+            page: 1,
+            limit: 10000,
+            keyword: "",
+            is_use:"",
+            good_kind:"",
+            is_charge:"",
+            list:[]
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+      
+        GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+            } else {
+            this.manufacturer = response.data.data.manufacturer;
+            this.dealer = response.data.data.dealer;
+            this.goodInfo = response.data.data.goodInfo;
+            this.goodType = response.data.data.goodType;
+            }
+        });
+        },
+       
+     GetOrderDetail: function(order_id) {
+        const params = {
+            id: order_id
+        };
+        getWarehouseInfoList(params).then(response => {
+            if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+            } else {
+             var obj = ""
+            for (let i = 0; i < response.data.data.info.length; i++) {
+                this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+            }
+            this.WarehouseInfo.warehouse = response.data.data.warehousing;
+            var total_price = 0
+            for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
+               total_price += this.WarehouseInfo.warehouseInfoDate[i].warehousing_count * this.WarehouseInfo.warehouseInfoDate[i].price   
+            }
+            this.allPrice = total_price
+            console.log("total_price",total_price)
+            console.log("数据222222222",this.WarehouseInfo.warehouseInfoDate)
+            }
+        });
+       },
+      
+    getSpecificationName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == id) {
+          name = this.goodInfo[i].specification_name;
+        }
+      }
+      return name;
+    },
+    getTypeName: function(id) {
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+    getTypeNameOne:function(id){
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name;
+     },
+     getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          good_kind:this.good_kind,
+          is_charge: this.is_charge,
+        }
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+           
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+            console.log("list22222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(id == this.list[i].id){
+             name = this.list[i].good_unit
+          }
+        }
+        return this.getGoodUnit(name)
+      },
+      getGoodUnit(id){
+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+          if(id == this.$store.getters.good_unit[i].id){
+
+            return this.$store.getters.good_unit[i].name
+          }
+        }
+        return ""
+      },
+    },
+    created(){
+
+      const order_id = this.$route.query.id;
+      this.GetConfigInfo();
+      this.GetOrderDetail(order_id);
+      this.getList()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -11,7 +11,7 @@
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">出库单号：{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
         </el-row>
       </div>
 
@@ -22,9 +22,12 @@
         <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
       </div>
 
-      <div class="filter-container" style="margin-top: 10px">
-        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
+      <div style="display:flex;justify-content: space-between;align-items: center;margin: 12px 0;">
+        <div>
+          <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
+        </div>
+        <el-button size="small" type="primary" @click="printOrder">打印</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -230,6 +233,7 @@
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+          
             console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
             this.handleSpanTempArr()
           }
@@ -340,7 +344,14 @@
             }
          }
          return count
-      }
+      },
+
+     printOrder(){
+       this.$router.push({
+        name: "stockOutDetailPrint",
+        query: { id: this.$route.query.id,warehouse_out_time:this.$route.query.warehouse_out_time }
+      });
+    }
     }
   }
 </script>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -0,0 +1,326 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">耗材出库登记单</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <td width="80">耗材名称</td>
+                                    <td width="80">规格型号</td>
+                                    <td width="80">单位</td>
+                                     <td width="80">出货价</td>
+                                    <td width="80">出库数量</td> 
+                                    <td width="80">总价</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for='(item,index) in warehousingOutInfo.warehousingOutData' :key="index">
+                                    <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
+                                    <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
+                                    <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                    <td>{{item.price}}</td>
+                                    <td>{{getOutStockCount(item.good_id)}}</td> 
+                                    <td>{{(getOutStockCount(item.good_id)*item.price).toFixed(2)}}</td>
+                                </tr>
+                                <tr>
+                                  <td>合计</td>
+                                  <td colspan="4"></td>
+                                  <td>{{allPrice.toFixed(2)}}</td>
+                               </tr>
+                            </tbody>
+                        </table>
+
+                        <div style="display:flex;margin-top:20px;float:right;">
+                            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+                            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+                            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList } from "@/api/stock";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '入库单打印' },
+          ],
+           isEdit: 0,
+            checked: false,
+            signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+            goodType: [],
+            goodInfo: [],
+            manufacturer: [],
+            dealer: [],
+
+            warehousingOutInfo: {
+            loading: false,
+            warehousingOutData: [],
+            info: {}
+            },
+            stockCount:[],
+            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            allPrice:0,
+            page: 1,
+            limit: 10000,
+            keyword: "",
+            is_use:"",
+            good_kind:"",
+            is_charge:"",
+            list:[]
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+
+        GetConfigInfo() {
+            GetAllConfig().then(response => {
+            if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+            } else {
+                this.manufacturer = response.data.data.manufacturer
+                this.dealer = response.data.data.dealer
+                this.goodInfo = response.data.data.goodInfo
+                this.goodType = response.data.data.goodType
+            }
+            })
+        },
+       GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getWarehouseOutInfo(params).then(response => {
+          if (response.data.state == 0) {
+
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+           
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+            }
+            this.warehousingOutInfo.info = response.data.data.info
+            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
+            var total_price = 0
+            for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
+              total_price += this.getOutStockCount(this.warehousingOutInfo.warehousingOutData[i].good_id)*this.warehousingOutInfo.warehousingOutData[i].price
+            }
+           this.allPrice = total_price
+          }
+        })
+      },
+
+       GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("stockCount",stockCount)
+              this.stockCount = stockCount
+           }
+        })
+      },
+      
+       getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+       getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
+       getTypeNameOne: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].good_name
+          }
+        }
+        return name
+      },
+      getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
+      },
+       getList() {
+        this.goodInfo.loading = true
+        let params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          is_use:this.is_use,
+          good_kind:this.good_kind,
+          is_charge: this.is_charge,
+        }
+        getGoodInfoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.list = []
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.list.push(response.data.data.list[i])
+            }
+            console.log("list22222",this.list)
+          }
+        })
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.list.length;i++){
+          if(id == this.list[i].id){
+             name = this.list[i].good_unit
+          }
+        }
+        return this.getGoodUnit(name)
+      },
+      getGoodUnit(id){
+        for (let i = 0; i <this.$store.getters.good_unit.length; i++ ){
+          if(id == this.$store.getters.good_unit[i].id){
+
+            return this.$store.getters.good_unit[i].name
+          }
+        }
+        return ""
+      },
+      
+    },
+    created(){
+
+      const order_id = this.$route.query.id;
+      const warehouse_out_time = this.$route.query.warehouse_out_time
+      this.GetConfigInfo()
+      this.GetOrderDetail(order_id)
+      this.GetTotalCount(warehouse_out_time)
+      this.getList()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockPrint.vue

@@ -26,6 +26,7 @@
                                     <td width="80">耗材类型</td>
                                     <td width="80">规格型号</td>
                                     <td width="80">入库数量</td>
+                                    <td width="80">进货价</td>
                                     <td width="80">入库退货</td>
                                     <td width="80">实际入库</td>
                                     <td width="80">出库数量</td>
@@ -41,6 +42,7 @@
                                     <td>{{item.type.type_name}}</td>
                                     <td>{{item.specification_name}}</td>
                                     <td>{{stockInCount(item)}}</td>
+                                    <td>{{item.price}}</td>
                                     <td>{{salesReturnCount(item)}}</td>
                                     <td> {{ stockInCount(item) - salesReturnCount(item) }}</td>
                                     <td>{{ stockOutCount(item) }}</td>
@@ -122,6 +124,13 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
           }
+          for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
+            if(this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info.length>0){
+              this.WarehouseInfo.warehouseInfoDate[i].price = this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price
+            }else{
+              this.WarehouseInfo.warehouseInfoDate[i].price = ""
+            }
+          }
          }
             console.log("打印数据源头",this.WarehouseInfo.warehouseInfoDate)
           });

src/xt_pages/stock/stockQuery.vue

@@ -100,6 +100,11 @@
             <span>{{getUnit(scope.row.good_unit)}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.query_warehousing_info.length>0">{{scope.row.query_warehousing_info[0].price?scope.row.query_warehousing_info[0].price:""}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             <span
@@ -259,6 +264,16 @@ export default {
             this.WarehouseInfo.warehouseInfoDate[i].realOutCount =  this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
 
             this.WarehouseInfo.warehouseInfoDate[i].overplus = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i]) - this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) + this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
+
+            if(this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info.length>0){
+              this.WarehouseInfo.warehouseInfoDate[i].price = this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price
+              this.WarehouseInfo.warehouseInfoDate[i].all_price = (this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) * this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price).toFixed(2)
+            }else{
+             this.WarehouseInfo.warehouseInfoDate[i].price = ""
+             this.WarehouseInfo.warehouseInfoDate[i].all_price = ""
+            }
+
+
          }
         
         console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
@@ -368,11 +383,13 @@ export default {
     },
 
     exportList(){
+         console.log("2222222",this.WarehouseInfo.warehouseInfoDate)
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 
+         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 
          const data = this.formatJson(filterVal, this.WarehouseInfo.warehouseInfoDate)
-      
+         console.log("data",data)
+         
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/user/components/PatientSidebar.vue

@@ -94,6 +94,10 @@ export default {
               name: '1-6',
               label: '干体重'
             },
+            {
+              name:'1-7',
+              label:'血管通路'
+            },
             {
               name: '1-2',
               label: '病程管理'
@@ -171,6 +175,8 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/proeducation'
         })
+      }else if (name == '1-7'){
+        this.$router.push({path:'/patients/patient/'+this.id+'/vascularAccess'})
       }
     },
     changePatient(value) {
@@ -216,6 +222,7 @@ export default {
       return sex
     },
     querySearchAsync(keyword, cb) {
+      
       let key = ''
       if (keyword != undefined) {
         key = keyword
@@ -258,8 +265,10 @@ export default {
   },
   created() {
     var patientKey =  window.sessionStorage.getItem('patientKey')
+  
     console.log("patient",patientKey)
     var query = this.$route.path
+    console.log("query",this.$route.path)
     if(patientKey){
      this.treeKey = patientKey
      if(query.indexOf('edit') == -1){ 
@@ -277,7 +286,8 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/dryWeight'
         })
-      } else if (patientKey == '1-5') {
+      }
+       else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })
       }else if (patientKey == '2-1') {
         this.$router.push({
@@ -296,6 +306,7 @@ export default {
           path: '/patients/patient/' + this.id + '/proeducation'
         })
       }
+    
      }else{
        this.treeKey = "1-1"
        

src/xt_pages/user/dialysisRecord.vue

@@ -413,6 +413,7 @@ export default {
       this.getPatientDialysisRecords();
     },
     getPatientDialysisRecords() {
+      console.log("prams",this.queryParams)
       getPatientDialysisRecords(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.total = response.data.data.total;

src/xt_pages/user/dialysisSolution.vue

@@ -85,6 +85,17 @@
             <span>{{ getAdminUserName(scope.row.registrars_id) }}</span>
           </template>
         </el-table-column>
+        
+        <el-table-column
+          prop="created_time"
+          align="center"
+          label="创建日期"
+          min-width="60"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.created_time | parseTime("{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
 
         <el-table-column
           prop="updated_time"
@@ -1176,13 +1187,9 @@ export default {
           ) {
             mode = '3'
           }
-
-          editPatientDialysisSolution(
-            this.patientID,
-            this.addPlan.id,
-            this.addPlan,
-            mode
-          ).then(response => {
+          console.log("2233333",this.addPlan)
+          
+          editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
@@ -1216,6 +1223,7 @@ export default {
       })
     },
     submitNewSolution(formName) {
+     
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -1260,7 +1268,7 @@ export default {
       this.fetchPatientDialysisSolutions()
     },
     openEdit(index, row) {
-     
+      console.log("ro2333333",row)
       this.current_index = index
 
       this.addPlan.id = row.id
@@ -1324,7 +1332,7 @@ export default {
       this.addPlan.blood_access = row.blood_access
 
       this.addPlan.registrars_id = row.registrars_id
-
+      this.addPlan.created_time =  row.created_time
       this.dialogVisible = true
       this.isEdit = true
       if(row.dialysate_formulation==0){
@@ -1398,7 +1406,8 @@ export default {
 
         dialysis_duration: '3.30',
         dialysis_duration_hour: '3',
-        dialysis_duration_minute: '30'
+        dialysis_duration_minute: '30',
+        created_time:"",
       }
       this.addPlanTypeChange()
 

src/xt_pages/user/vascularAccess.vue

@@ -0,0 +1,721 @@
+<template>
+  <div class="patient-container">
+    <patient-sidebar :id="patientID" defaultActive="1-6" v-on:tran-patient="onTranPatient"></patient-sidebar>
+    <div class="patient-app-container advice-container app-container">
+      <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
+         <span style="font-weight:bold;">血管通路列表</span>
+         <el-button size="medium" type="primary" @click="dialogVisible =true">新增</el-button>
+      </div>
+      <el-table class="oictable" :data="tableData" border style="width:100%">
+      <el-table-column prop="start_time" label="建立日期" width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{ getTime(scope.row.start_time, "{y}-{m}-{d}")}}</span>
+          </template>
+     </el-table-column>
+      <el-table-column prop="blood_access_part_opera_id" label="血管通路" align="center" width="120">
+        <template slot-scope="scope">
+           <router-link
+              :to="'/patients/patient/' + scope.row.patient_id+'/vascularAccessDetail/'+scope.row.id"
+              style="color:#409eff;width:100%;display:block;"
+            >{{ scope.row.blood_access_part_opera_id }}
+            </router-link
+            >
+        </template>
+     </el-table-column>
+     <el-table-column prop="blood_access_part_id" label="血管通路部位" width="200" align="center">
+        <template slot-scope="scope">
+           <span>{{scope.row.blood_access_part_id}}</span>  
+        </template>
+     </el-table-column>
+      <el-table-column prop="inflow_pass" label="流入-流出道" width="100" align="center">
+         <template slot-scope="scope">
+            <span>{{scope.row.inflow_pass}}</span>
+         </template>
+      </el-table-column>
+      <el-table-column prop="date" label="首次启用日期" width="120" align="center">
+          <template slot-scope="scope">
+            <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="date" label="默认到处方" align="center" width="100">
+          <template slot-scope="scope">
+             <span v-if="scope.row.user_status == 1">启用</span>
+             <span v-if="scope.row.user_status == 2">停用</span>
+          </template>
+      </el-table-column>
+       <el-table-column prop="date" label="停用日期" align="center" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>
+             <span v-if="scope.row.stop_time<0"></span>
+          </template>
+      </el-table-column>
+       <el-table-column prop="date" label="停用原因" align="center" width="120">
+          <template slot-scope="scope">
+             <span>{{scope.row.stop_reason}}</span>
+          </template>
+      </el-table-column>
+       <el-table-column prop="date" label="使用寿命(天)" align="center" width="120">
+          <template slot-scope="scope">
+           <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 == 0"></span> 
+           <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 != 0">{{(scope.row.stop_time - scope.row.start_time)/86400}}</span>
+          </template>
+      </el-table-column>
+       <el-table-column prop="date" label="备注" align="center" width="180">
+          <template slot-scope="scope">
+             <span>{{scope.row.remark}}</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="date" label="创始人" align="center" width="100">
+          <template slot-scope="scope">
+            <span>{{getDoctor(scope.row.creator)}}</span>
+          </template>
+      </el-table-column>
+       <el-table-column prop="date" fixed="right" label="操作" width="140" align="center">
+          <template slot-scope="scope">
+             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+               <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit-outline"
+                 
+                  @click="handleUpdateAdviceTemplate(scope.row.id)"
+                  >
+               </el-button>
+             </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                 <el-button
+                  size="small"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDeleteAdviceTemplate(scope.row.id, scope.$index)"
+                  >
+                 </el-button>
+              </el-tooltip>
+           </template>
+      </el-table-column>
+  </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10,20,50,100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        align="right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"></el-pagination>
+
+     <el-dialog
+         title="新增通路"
+         :visible.sync="dialogVisible"
+         width="60%"
+         center>
+      <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
+         <el-row :gutter="24">
+            <el-col :span="24">
+                <el-form-item label="通路项目:" :required="true" prop="access_project">
+                    <el-radio v-model="form.access_project" label="1">内瘘</el-radio>
+                    <el-radio v-model="form.access_project" label="2">导管</el-radio>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="建立日期:" :required="true" prop="start_time">
+                 <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
+                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:150px">
+                    <el-option
+                        v-for="item in blood_access_part_opera"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        >
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="血管通路部位:" :required="true" prop="blood_access_part_id">
+                  <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:150px"></el-input>
+               </el-form-item>
+            </el-col>
+         </el-row>
+          <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="流入-流出道:" :required="true" prop="inflow_pass">
+                 <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
+                    <el-option
+                        v-for="item in optionsPass"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+                  <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.first_start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="使用状态:" :required="true" prop="user_status">
+                 <el-select v-model="form.user_status" placeholder="请选择" style="width:150px" @change="changeStatus">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row v-show="show">
+            <el-col :span="8">
+               <el-form-item label="停用日期:">
+                  <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.stop_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row v-show="show">
+           <el-col>
+            <el-form-item label="停用原因:">
+               <el-input v-model="form.stop_reason"></el-input>
+            </el-form-item>
+           </el-col>  
+         </el-row>
+           <el-row>
+            <el-col>
+                <el-form-item label="备注:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+      </el-form>
+
+     <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveVasularAccess('form')">保存</el-button>
+     </span>
+     </el-dialog>
+
+
+
+      <el-dialog
+         title="编辑通路"
+         :visible.sync="editDialogVisible"
+         width="60%"
+         center>
+      <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
+         <el-row :gutter="24">
+            <el-col :span="24">
+                <el-form-item label="通路项目:" :required="true" prop="access_project">
+                    <el-radio v-model="form.access_project" label="1">内瘘</el-radio>
+                    <el-radio v-model="form.access_project" label="2">导管</el-radio>
+                </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="建立日期:" :required="true" prop="start_time">
+                 <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
+                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:150px">
+                    <el-option
+                        v-for="item in blood_access_part_opera"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        >
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="血管通路部位:" :required="true" prop="blood_access_part_id">
+                 <!-- <el-select v-model="form.blood_access_part_id" placeholder="请选择" style="width:150px">
+                    <el-option
+                        v-for="item in blood_access_part"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                  </el-select> -->
+
+                   <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:150px"></el-input>
+               </el-form-item>
+            </el-col>
+         </el-row>
+          <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="流入-流出道:" :required="true" prop="inflow_pass">
+                 <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
+                    <el-option
+                        v-for="item in optionsPass"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+                  <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.first_start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="使用状态:" :required="true" prop="user_status">
+                 <el-select v-model="form.user_status" placeholder="请选择" style="width:150px" @change="changeStatus">
+                    <el-option
+                        v-for="item in options"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row v-show="show">
+            <el-col :span="8">
+               <el-form-item label="停用日期:">
+                  <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.stop_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row v-show="show">
+           <el-col>
+            <el-form-item label="停用原因:">
+               <el-input v-model="form.stop_reason"></el-input>
+            </el-form-item>
+           </el-col>  
+         </el-row>
+           <el-row>
+            <el-col>
+                <el-form-item label="备注:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+      </el-form>
+
+     <span slot="footer" class="dialog-footer">
+        <el-button @click="editDialogVisible= false">取 消</el-button>
+        <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
+     </span>
+     </el-dialog>
+
+    </div>
+
+     <multi-select-box
+        :propsForm="InnerDialogProps"
+        v-on:dialog-comfirm="innerDialogComfirm"
+        v-on:dialog-cancle="innerDialogCancle"
+      ></multi-select-box>
+  </div>
+</template>
+<script>
+  const moment = require('moment')
+  import PatientSidebar from './components/PatientSidebar'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { saveVasularAccess,getAllVascularAccessList,getVascularAccessByDetail,updatedVasularAccess,DeleteVascularAccess } from '@/api/patient'
+
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import { getDataConfig } from '@/utils/data'
+  import multiSelectBox from '../dialysis/details/dialog/MultiSelectBox'
+    
+  export default {
+    name: 'doctorAdvice',
+    components: {
+      PatientSidebar,
+      multiSelectBox
+    },
+    data() {
+      return {
+        tableData: [],
+        nowtime: moment(new Date()).format('YYYY-MM-DD'),
+        page: 1,
+        limit: 10,
+        total: 0,
+        rules: {
+          start_time: [{ required: true, message: '请输入建立日期' }],
+          access_project: [{ required: true, message: '请选择通路项目' }],
+          blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
+          blood_access_part_id:[{required:true,message:"请选择血管通路"}],
+          inflow_pass:[{required:true,message:"请选择流入-流出道"}],
+          first_start_time:[{required:true,message:"请选择首次启用日期"}],
+          user_status:[{required:true,message:"请选择使用状态"}]
+        },
+        dialogVisible:false,
+        editDialogVisible:false,
+        form:{
+         id:0,
+         access_project:"1",
+         blood_access_part_id:"",
+         blood_access_part_opera_id:"",
+         inflow_pass:"",
+         start_time:moment(new Date()).format('YYYY-MM-DD'),
+         first_start_time:moment(new Date()).format('YYYY-MM-DD'),
+         stop_reason:"",
+         user_status:1,
+         remark:"",
+         stop_time:"",
+        },
+        options:[
+         {id:1,name:"启用"},
+         {id:2,name:"停用"}
+        ],
+        optionsPass:[
+          {id:1,name:"流入-动脉"},
+          {id:2,name:"流出-静脉"},
+        ],
+        blood_access_part_opera:[],
+        blood_access_part:[],
+        show:false,
+        doctorList:[],
+        InnerDialogProps: {
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
+      }
+    },
+    methods: {
+      clickuseradvicecell(row, column, cell, event) {
+      },
+      onTranPatient: function(tranPatient) {
+        this.currentPatient = tranPatient
+      },
+      CreateTime(time) {
+        return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
+      },
+   
+     
+    
+     
+      handleSizeChange(limit) {
+        this.limit = limit
+        this.getlist()
+      },
+      handleCurrentChange(page) {
+        this.page = page
+      
+        this.getlist()
+      },
+      changeStatus(val){
+        if(val == 1 ){
+          this.show = false
+        }
+        if(val == 2){
+          this.show = true
+        }
+      },
+      saveVasularAccess(formName){
+         this.$refs[formName].validate((valid)=>{
+           if(valid){
+              var blood_name = ""
+              for(let i=0;i<this.blood_access_part_opera.length;i++){
+                 if(this.blood_access_part_opera[i].id == this.form.blood_access_part_opera_id){
+                     blood_name = this.blood_access_part_opera[i].name
+                 }
+              }
+              var inflow_pass = ""
+              for(let i=0;i<this.optionsPass.length;i++){
+                 if(this.optionsPass[i].id == this.form.inflow_pass){
+                     inflow_pass = this.optionsPass[i].name
+                 }
+              }
+              console.log("params",this.form.blood_access_part_id)
+              
+              var params = {
+                patient_id:this.patientID,
+                access_project:parseInt(this.form.access_project),
+                start_time:this.form.start_time,
+                blood_access_part_opera_id:blood_name,
+                blood_access_part_id:this.form.blood_access_part_id,
+                inflow_pass:inflow_pass,
+                first_start_time:this.form.first_start_time,
+                user_status:this.form.user_status,
+                stop_reason:this.form.stop_reason,
+                remark:this.form.remark,
+                stop_time:this.form.stop_time
+              }
+              console.log("params",params)
+             saveVasularAccess(params).then(response=>{
+                if(response.data.state == 1){
+                   var access =  response.data.data.access
+                   console.log("access",access)
+                   this.$message.success("保存成功")
+                   this.dialogVisible = false
+                   this.getlist()
+                   this.form.blood_access_part_opera_id=""
+                   this.form.blood_access_part_id = ""
+                   this.inflow_pass = ""
+                   this.user_status = ""
+                   this.stop_reason = ""
+                   this.remark = ""
+                }
+             })
+           }  
+         })
+      },
+      getlist(){
+         var params = {
+               page:this.page,
+               limit:this.limit,
+               patient_id:this.patientID,
+           }
+        getAllVascularAccessList(params).then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list",list)
+             this.tableData = list
+             var total = response.data.data.total
+             console.log("total",total)
+             this.total = total
+             var doctor = response.data.data.doctor
+             console.log("doctor",doctor)
+             this.doctorList = doctor
+           }  
+        })   
+      },
+     getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp);
+        }
+        return "";
+     },
+     handleUpdateAdviceTemplate(id){
+        getVascularAccessByDetail(id).then(response=>{
+           if(response.data.state ==1){
+             var accessDetail =  response.data.data.accessDetail
+             console.log("accessDetail",accessDetail)
+             this.form.id = accessDetail.id
+             this.form.access_project = accessDetail.access_project.toString()
+             
+            
+
+             this.form.blood_access_part_id = accessDetail.blood_access_part_id
+             
+              var blood_part = 0
+              for(let i=0;i<this.blood_access_part_opera.length;i++){
+                 if(accessDetail.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
+                    blood_part = this.blood_access_part_opera[i].id
+                 }
+              }
+             this.form.blood_access_part_opera_id = blood_part
+             this.form.first_start_time = this.getTime(accessDetail.first_start_time,"{y}-{m}-{d}")
+
+             var inflow_id = 0
+             for(let i=0;i<this.optionsPass.length;i++){
+               if(this.optionsPass[i].name == accessDetail.inflow_pass){
+                  inflow_id = this.optionsPass[i].id
+               }
+             }
+             this.form.inflow_pass = inflow_id
+             this.form.remark = accessDetail.remark
+             this.form.start_time = this.getTime(accessDetail.start_time,"{y}-{m}-{d}")
+             this.form.stop_reason = accessDetail.stop_reason
+             this.form.stop_time = this.getTime(accessDetail.stop_time,"{y}-{m}-{d}")
+
+             this.form.user_status = accessDetail.user_status
+             if(accessDetail.user_status == 1){
+               this.show = false
+             }
+             if(accessDetail.user_status == 2){
+               this.show = true
+             }
+             this.editDialogVisible = true
+           }
+        }) 
+     },
+     getDoctor(id){
+       var name = ""
+       for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+       }
+       return name
+     },
+     handleDeleteAdviceTemplate(id,index){
+       this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          DeleteVascularAccess(id).then(response => {
+            if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.tableData.splice(index, 1);
+              this.$message.success("删除成功!")
+            }
+             
+            
+          });
+        })
+        .catch(() => {});
+     },
+     updatedVasularAccess(formName){
+        this.$refs[formName].validate((valid)=>{
+           if(valid){
+              var blood_name = ""
+              for(let i=0;i<this.blood_access_part_opera.length;i++){
+                 if(this.blood_access_part_opera[i].id == this.form.blood_access_part_opera_id){
+                     blood_name = this.blood_access_part_opera[i].name
+                 }
+              }
+            //   var blood_part = ""
+            //   for(let i=0;i<this.blood_access_part.length;i++){
+            //      if(this.form.blood_access_part_id == this.blood_access_part[i].id){
+            //         blood_part = this.blood_access_part[i].name
+            //      }
+            //   }
+              var inflow_pass = ""
+              for(let i=0;i<this.optionsPass.length;i++){
+                 if(this.optionsPass[i].id == this.form.inflow_pass){
+                     inflow_pass = this.optionsPass[i].name
+                 }
+              }
+              var params = {
+                id:this.form.id,
+                patient_id:this.patientID,
+                access_project:parseInt(this.form.access_project),
+                start_time:this.form.start_time,
+                blood_access_part_opera_id:blood_name,
+                blood_access_part_id:this.form.blood_access_part_id,
+                inflow_pass:inflow_pass,
+                first_start_time:this.form.first_start_time,
+                user_status:this.form.user_status,
+                stop_reason:this.form.stop_reason,
+                remark:this.form.remark,
+                stop_time:this.form.stop_time
+              }
+              console.log("编辑",params)
+              updatedVasularAccess(params).then(response=>{
+                if(response.data.state == 1){
+                  var access =  response.data.data.access
+                  console.log("access",access)
+                  this.$message.success("保存成功")
+                  this.editDialogVisible = false
+                  this.getlist()
+                }
+              })
+           }
+        })
+     },
+     rowClick(row){
+       console.log("row",row)
+       this.$router.push({path:'/patients/patient/'+this.patientID+'/vascularAccessDetail/'+row.id})
+     },
+       showInnerDialog: function(val) {
+        this.InnerDialogProps.visibility = true
+        switch (val) {
+        
+          case '17': // 血管通路
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.form.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
+            break
+
+        
+        }
+      },
+       innerDialogComfirm: function(val) {
+         this.InnerDialogProps.visibility = false
+         switch (val.type) {
+           case 'blood_access_part_id':
+           this.form.blood_access_part_id = val.value.join(',')
+           break
+        }
+      },
+      innerDialogCancle: function() {
+        this.InnerDialogProps.visibility = false
+      },
+    },
+    created() {
+      const id = this.$route.params && this.$route.params.id
+      console.log('id是设么', id)
+      this.patientID = parseInt(id)
+      
+      //血管通路
+      this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
+      console.log("血管通路",this.blood_access_part_opera)
+      //血管通路部位
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
+      console.log("血管通路部位",this.blood_access_part)
+      this.getlist()
+    }
+  }
+</script>
+
+<style>
+  .oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss">
+   ::-webkit-scrollbar{
+      height:15px;
+   }
+
+</style>
+

src/xt_pages/user/vascularAccessDetail.vue

@@ -0,0 +1,425 @@
+<template>
+  <div class="patient-container">
+    <patient-sidebar :id="patientID" defaultActive="1-6" v-on:tran-patient="onTranPatient"></patient-sidebar>
+    <div class="patient-app-container advice-container app-container">
+      <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
+         <span style="font-weight:bold;">通路详情</span>
+         <el-button size="medium" type="primary" @click="dialogVisible =true" style="margin-left:800px" >新增</el-button>
+      </div>
+      <div class="cell clearfix">
+         <span>启用日期:{{getTime(start_time,"{y}-{m}-{d}")}} &nbsp; 血管通路类型:{{blood_access_part_opera_id}}</span> 
+      </div>
+      <el-table  :data="tableData" border style="width:100%" >
+      <el-table-column  prop="start_time"   label="日期"  width="150"    align="center">
+          <template  slot-scope="scope">
+            <span>{{getTime(scope.row.start_time,"{y}-{m}-{d}")}}</span>
+          </template>
+     </el-table-column>
+      <el-table-column   prop="blood_access_part_opera_id" label="项目"   align="center" width="200">
+        <template slot-scope="scope">
+           <span>{{scope.row.blood_project}}</span>  
+        </template>
+     </el-table-column>
+      <el-table-column     prop="inflow_pass"    label="结果"    align="center">
+         <template slot-scope="scope">
+            <span>{{scope.row.blood_result}}</span>
+         </template>
+      </el-table-column>
+      <el-table-column     prop="date"    label="处理" width="120"     align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.blood_dealwith}}</span>
+          </template>
+      </el-table-column>
+      <el-table-column     prop="date"    label="评估人"      align="center">
+          <template slot-scope="scope">
+           {{getDoctor(scope.row.creator)}}
+          </template>
+      </el-table-column>
+  
+       <el-table-column   prop="date"  label="操作" width="140" align="center">
+          <template slot-scope="scope">
+             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+               <el-button
+                  type="primary"
+                  size="small"
+                  icon="el-icon-edit-outline"
+                 
+                  @click="handleUpdateAdviceTemplate(scope.row.id)"
+                  >
+               </el-button>
+             </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                 <el-button
+                  size="small"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDeleteAdviceTemplate(scope.row.id, scope.$index)"
+                  >
+                 </el-button>
+              </el-tooltip>
+           </template>
+      </el-table-column>
+  </el-table>
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10,20,50,100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        align="right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"></el-pagination>
+
+     <el-dialog
+         title="新增通路评估"
+         :visible.sync="dialogVisible"
+         width="60%"
+         center>
+      <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
+         <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="建立日期:" :required="true" prop="start_time">
+                 <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="评估人:" :required="true" prop="creator">
+                 <el-select v-model="form.creator" placeholder="请选择"  style="width:150px">
+                    <el-option
+                        v-for="item in doctorList"
+                        :key="item.admin_user_id"
+                        :label="item.user_name"
+                        :value="item.admin_user_id"
+                        >
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+         </el-row>
+       
+         <el-row>
+            <el-col>
+                <el-form-item label="项目:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_project"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+          <el-row>
+            <el-col>
+                <el-form-item label="结果:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_result"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+         <el-row>
+            <el-col>
+                <el-form-item label="处理:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_dealwith"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+      </el-form>
+
+     <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="savePasswayAssessment('form')">保存</el-button>
+     </span>
+     </el-dialog>
+
+     
+       <el-dialog
+         title="编辑通路评估"
+         :visible.sync="editDialogVisible"
+         width="60%"
+         center>
+      <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
+         <el-row :gutter="24">
+            <el-col :span="8">
+               <el-form-item label="建立日期:" :required="true" prop="start_time">
+                 <el-date-picker
+                    type="datetime"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    v-model="form.start_time"
+                    style="width:150px">
+                 </el-date-picker>
+               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+               <el-form-item label="评估人:" :required="true" prop="creator">
+                 <el-select v-model="form.creator" placeholder="请选择"  style="width:150px">
+                    <el-option
+                        v-for="item in doctorList"
+                        :key="item.admin_user_id"
+                        :label="item.user_name"
+                        :value="item.admin_user_id"
+                        >
+                    </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+         </el-row>
+       
+         <el-row>
+            <el-col>
+                <el-form-item label="项目:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_project"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+          <el-row>
+            <el-col>
+                <el-form-item label="结果:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_result"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+         <el-row>
+            <el-col>
+                <el-form-item label="处理:">
+                 <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.blood_dealwith"></el-input>
+                </el-form-item>
+            </el-col>  
+         </el-row>
+      </el-form>
+
+     <span slot="footer" class="dialog-footer">
+        <el-button @click="editDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="updatePasswayAssessment('form')">保存</el-button>
+     </span>
+     </el-dialog>
+
+      
+
+    </div>
+
+     
+  </div>
+</template>
+<script>
+  const moment = require('moment')
+  import PatientSidebar from './components/PatientSidebar'
+  import {getVascularAccessByDetail,savePasswayAssessment,getAllPassWayAssessmentList,getPassWayAssessmentById,updatePasswayAssessment,DeletePassWayAssessMent} from '@/api/patient'
+  import { uParseTime } from '@/utils/tools'
+  import { getDataConfig } from '@/utils/data'
+ 
+  export default {
+    name: 'doctorAdvice',
+    components: {
+      PatientSidebar,
+    },
+    data() {
+      return {
+        tableData: [],
+        nowtime: moment(new Date()).format('YYYY-MM-DD'),
+        page: 1,
+        limit: 10,
+        total: 0,
+        rules: {
+          start_time: [{ required: true, message: '请输入建立日期' }],
+          creator: [{ required: true, message: '请选择评估人' }],
+        },
+        dialogVisible:false,
+        editDialogVisible:false,
+        form:{
+         id:0,
+         start_time:moment(new Date()).format('YYYY-MM-DD'),
+         creator:this.$store.getters.xt_user.user.id,
+         blood_project:"",
+         blood_result:"",
+         blood_dealwith:"",
+        },
+        doctorList:[],
+        start_time:"",
+        blood_access_part_opera_id:"",
+        parent_id:"",
+        patientID:""
+      }
+    },
+    methods: {
+     clickuseradvicecell(row, column, cell, event) {
+      },
+      onTranPatient: function(tranPatient) {
+        this.currentPatient = tranPatient
+      },
+      handleSizeChange(limit) {
+        this.limit = limit
+        this.getlist()
+      },
+      handleCurrentChange(page) {
+        this.page = page
+      
+        this.getlist()
+      },
+   
+    
+    
+     getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp);
+        }
+        return "";
+     },
+
+ 
+     getVascularAccessByDetail(id){
+        getVascularAccessByDetail(id).then(response=>{
+           if(response.data.state ==1){
+             var accessDetail =  response.data.data.accessDetail
+             console.log("accessDetail",accessDetail)
+             this.start_time = accessDetail.start_time
+             this.blood_access_part_opera_id = accessDetail.blood_access_part_opera_id
+             var doctor = response.data.data.doctor
+             console.log("意思",doctor)
+             this.doctorList = doctor
+           }
+        }) 
+     },
+     getDoctor(id){
+       var name = ""
+       for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+       }
+       return name
+     },
+     handleDeleteAdviceTemplate(id,index){
+       this.$confirm("确认删除吗?", "删除", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          DeletePassWayAssessMent(id).then(response => {
+            if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.tableData.splice(index, 1);
+              this.$message.success("删除成功!")
+            }
+             
+            
+          });
+        })
+        .catch(() => {});
+     },
+    savePasswayAssessment(formName){
+       this.$refs[formName].validate((valid)=>{
+          if(valid){
+              var params = {
+                start_time:this.form.start_time,
+                creator:this.form.creator,
+                blood_project:this.form.blood_project,
+                blood_result:this.form.blood_result,
+                blood_dealwith:this.form.blood_dealwith,
+                patient_id:this.patientID,
+                parent_id:this.parent_id,
+              }
+              console.log("parasm",params)
+            savePasswayAssessment(params).then(response=>{
+               if(response.data.state == 1){
+                 var assessment =  response.data.data.assessment
+                 console.log("assessment",assessment)
+                 this.form.blood_project = ""
+                 this.form.blood_result = ""
+                 this.form.blood_dealwith = ""
+                 this.dialogVisible = false
+                 this.$message.success("保存成功")
+                 this.getlist()
+               }
+            })
+          }
+       })
+    },
+    getlist(){
+        const params = {
+          parent_id:this.parent_id,
+          patient_id:this.patientID, 
+          page:this.page,
+          limit:this.limit,
+        }
+       getAllPassWayAssessmentList(params).then(response=>{
+          if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("列表",list)
+             this.tableData = list
+             var total =  response.data.data.total
+             console.log("total",total)
+             this.total = total
+           }
+       }) 
+    },
+
+    handleUpdateAdviceTemplate(id){
+      console.log("id2222222",id)
+       getPassWayAssessmentById(id).then(response=>{
+           if(response.data.state == 1){
+              var assessment =  response.data.data.assessment
+              console.log("assesment",assessment)
+              this.editDialogVisible = true
+              this.form.id = assessment.id
+              this.form.start_time = this.getTime(assessment.start_time,"{y}-{m}-{d}")
+              this.form.creator = assessment.creator
+              this.form.blood_dealwith = assessment.blood_dealwith
+              this.form.blood_project = assessment.blood_project
+              this.form.blood_result = assessment.blood_result
+           }
+       })
+    },
+
+    updatePasswayAssessment(formName){
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+              var params = {
+                start_time:this.form.start_time,
+                creator:this.form.creator,
+                blood_project:this.form.blood_project,
+                blood_result:this.form.blood_result,
+                blood_dealwith:this.form.blood_dealwith,
+                id:this.form.id
+              }
+              console.log("parasm",params)  
+            updatePasswayAssessment(params).then(response=>{
+               if(response.data.state == 1){
+                  var assesment = response.data.data.assessment
+                  this.$message.success("保存成功")
+                  this.editDialogVisible = false
+                  this.getlist()
+               }
+            })
+         }
+       })
+    }
+   
+    },
+    created() {
+      const id = this.$route.params && this.$route.params.mid
+      this.patientID = parseInt(id)
+      const pid = this.$route.params&& this.$route.params.pid 
+      this.parent_id = parseInt(pid)
+      this.getVascularAccessByDetail(pid) 
+      this.getlist()
+    }
+  }
+</script>
+
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+   
+
+</style>
+