打印单

src/api/advice.js

@@ -363,6 +363,7 @@ export function EditNewDoctorAdvice(patient, id, advice, mode) {
 }
 
 export function CreateNewDoctorAdvice(id, advice, mode) {
+
   return request({
     url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
     method: "post",

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse,difficult_puncture_nurse,new_fistula_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -59,7 +59,9 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     schedual_type: schedual_type,
     mode: mode,
     washpipe_nurse:washpipe_nurse,
-    change_nurse:change_nurse
+    change_nurse:change_nurse,
+    difficult_puncture_nurse:difficult_puncture_nurse,
+    new_fistula_nurse:new_fistula_nurse
   }
   console.log("params",params)
   return request({

src/router/modules/dialysis.js

@@ -67,50 +67,50 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/dialysis/consumableDrugs_print',
-    //   component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'consumableDrugs_print',
-    //   meta: {
-    //     title: 'consumableDrugs_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/dialysisDrugs_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisDrugs_print',
-    //   meta: {
-    //     title: 'dialysisDrugs_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/dialysisParameters_print',
-    //   component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysisParameters_print',
-    //   meta: {
-    //     title: 'dialysisParameters_print',
-    //     noCache: true
-    //   }
-    // },
-    // {
-    //   path: '/dialysis/allSummary_print',
-    //   component: () => import('@/xt_pages/dialysis/allSummary_print'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'allSummary_print',
-    //   meta: {
-    //     title: 'allSummary_print',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/consumableDrugs_print',
+      component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'consumableDrugs_print',
+      meta: {
+        title: 'consumableDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisDrugs_print',
+      component: () => import('@/xt_pages/dialysis/dialysisDrugs_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisDrugs_print',
+      meta: {
+        title: 'dialysisDrugs_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/dialysisParameters_print',
+      component: () => import('@/xt_pages/dialysis/dialysisParameters_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysisParameters_print',
+      meta: {
+        title: 'dialysisParameters_print',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/allSummary_print',
+      component: () => import('@/xt_pages/dialysis/allSummary_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummary_print',
+      meta: {
+        title: 'allSummary_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/router/modules/qcd.js

@@ -233,8 +233,8 @@ export default {
       }
     },
     {
-      path: '/qcd/workAnalysis/doctor',
-      component: () => import('@/xt_pages/qcd/workAnalysis/doctor'),
+      path: '/qcd/workAnalysis/index',
+      component: () => import('@/xt_pages/qcd/workAnalysis/index'),
       name: 'workAnalysisDoctor',
       meta: {
         title: '工作量分析统计',

src/xt_pages/dialysis/PatientBox.vue

@@ -54,7 +54,9 @@
       </div>
       <div class="dislysisInfo">
         <p>体重(前/后kg):{{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</p>
-        <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</p>
+        <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
+       
+        </p>
         <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
       </div>
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
@@ -124,6 +126,7 @@
 </template>
 
 <script>
+
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPrescriptionDialog";

src/xt_pages/dialysis/consumableDrugs.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
+                <!-- <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+                </el-tab-pane> -->
                 <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/consumableDrugs_print.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="first">
                     <consumables></consumables>
                 </el-tab-pane>
-                <el-tab-pane label="透析药品" name="second">
+                <!-- <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane>
+                </el-tab-pane> -->
                 <el-tab-pane label="透析参数" name="third">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

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

@@ -39,6 +39,19 @@
           </el-select>
         </el-form-item>
 
+
+         <el-form-item label="疑难穿刺护士"  v-if="isShowFiled('疑难穿刺护士')">
+          <el-select v-model="form.difficult_puncture_nurse" placeholder="请选择疑难穿刺护士">
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="新开瘘护士"  v-if="isShowFiled('新开瘘护士')">
+            <el-select v-model="form.new_fistula_nurse" placeholder="请选择新开瘘护士">
+              <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+            </el-select>
+        </el-form-item>
+
      
         <el-form-item label="引血(ml/min)" v-if="template_id == 6">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
@@ -98,7 +111,9 @@
           start_time: '',
           puncture_nurse_id: '',
           blood_drawing: 100,
-          change_nurse:""
+          change_nurse:"",
+          difficult_puncture_nurse:"",
+          new_fistula_nurse:"",
         },
         schedual_type: 0,
         schedules_type: [
@@ -154,6 +169,8 @@
         this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
         this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
         this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
+        this.form.difficult_puncture_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id:this.dialysis_order.difficult_puncture_nurse
+        this.form.new_fistula_nurse = this.dialysis_order.id ==0?this.$store.getters.xt_user.user.id:this.dialysis_order.new_fistula_nurse
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -325,7 +342,7 @@
         this.loading = true
         let mode = '1'
 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -356,7 +373,8 @@
         ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
         ParamsQuery['washpipe_nurse'] = this.form.washpipe_nurse
         ParamsQuery['change_nurse'] = this.form.change_nurse
-
+        ParamsQuery['difficult_puncture_nurse'] = this.form.difficult_puncture_nurse
+        ParamsQuery['new_fistula_nurse'] = this.form.new_fistula_nurse
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"

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

@@ -1347,7 +1347,6 @@
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
 
 
-            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -30,6 +30,15 @@
           <label>换药护士 : </label>
           <span class="content">{{ change_nurse }}</span>
         </li>
+
+       <li v-if="isShow('疑难穿刺护士')">
+          <label>疑难穿刺护士 : </label>
+          <span class="content">{{ difficult_puncture_nurse }}</span>
+        </li>
+        <li v-if="isShow('新开瘘护士')">
+          <label>新开瘘护士 : </label>
+          <span class="content">{{ new_fistula_nurse }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
@@ -141,6 +150,18 @@
           return '-'
         }
         return this.admin_map[this.record.change_nurse] == null ? '' : this.admin_map[this.record.change_nurse].name
+      },
+      difficult_puncture_nurse:function(){
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.difficult_puncture_nurse] == null ? '' : this.admin_map[this.record.difficult_puncture_nurse].name
+      },
+      new_fistula_nurse:function(){
+         if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.new_fistula_nurse] == null ? '' : this.admin_map[this.record.new_fistula_nurse].name
       }
     },
     methods: {

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -135,16 +135,48 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="换药" align="center">
+              <template slot-scope="scope">
+                {{scope.row.change_nuser_count?scope.row.change_nuser_count:''}}
+
+              </template>
+            </el-table-column>
+
+             <el-table-column label="疑难穿刺" align="center">
+              <template slot-scope="scope">
+                {{scope.row.difficult_nuser_count?scope.row.difficult_nuser_count:''}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="开瘘" align="center">
+              <template slot-scope="scope">
+                {{scope.row.new_nuser_count?scope.row.new_nuser_count:''}}
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="上机" align="center" width="300">
+              <template slot-scope="scope">
+                {{scope.row.start_nuser_count?scope.row.start_nuser_count:''}}
+                <span v-if="getTotalCount(scope.row.admin_user_id)!=''">({{getTotalCount(scope.row.admin_user_id)}})</span>
+              </template>
+            </el-table-column>
+
 
             <el-table-column label="宣教/小结" align="center">
               <template slot-scope="scope">
                 {{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,
+                start_nurse_count:total_start_nurse, -->
             <el-table-column label="合计" align="center">
               <template slot-scope="scope">
-                {{scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count:''}}
+                {{scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count+scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count+scope.row.start_nuser_count:''}}
               </template>
             </el-table-column>
           </el-table>
@@ -195,6 +227,10 @@
           {value:1, name:"治疗"},
           {value:2, name:"穿刺"},
           {value:3, name:"宣教/小结"},
+          {value:4, name:"换药"},
+          {value:5, name:"疑难穿刺"},
+          {value:6, name:"开瘘"},
+          {value:7, name:"上机"},
         ],
         crumbs: [
           { path: false, name: "质控管理" },
@@ -306,7 +342,8 @@
               zoomLock: true // 锁定区域禁止缩放
             }
           ]
-        }
+        },
+        modeList:[],
       };
     },
     methods: {
@@ -348,29 +385,116 @@
       handleCurrentChange(page) {
         this.query.page = page;
         this.GetNurseWorkloadTableData(this.query)
-      },GetNurseWorkloadTableData(params) {
+      },
+      GetNurseWorkloadTableData(params) {
         this.loading = true
         this.tableData = []
+        this.modeList = []
+        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
+              let total_change_nurse = 0
+              let total_diffcult_nurse = 0
+              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
+                total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
                 this.tableData.push(resp.data.data[i])
-              }
+             }
               this.tableData.push( {
                 user_name:"合计",
                 cure_count:total_cure,
                 puncture_count:total_puncture,
-                mission_count:total_mission
+                mission_count:total_mission,
+                change_nuser_count:total_change_nurse,
+                difficult_nuser_count:total_diffcult_nurse,
+                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++){
+                if(dialysisCount[i].mode_id == 1){
+                  dialysisCount[i].mode_id = "HD"
+                }
+                if(dialysisCount[i].mode_id == 2){
+                  dialysisCount[i].mode_id = "HDF"
+                }
+                if(dialysisCount[i].mode_id == 3){
+                  dialysisCount[i].mode_id = "HD+HP"
+                }
+                 if(dialysisCount[i].mode_id == 4){
+                  dialysisCount[i].mode_id = "HP"
+                }
+                 if(dialysisCount[i].mode_id == 5){
+                  dialysisCount[i].mode_id = "HF"
+                }
+                 if(dialysisCount[i].mode_id == 6){
+                  dialysisCount[i].mode_id = "SCUF"
+                }
+                 if(dialysisCount[i].mode_id == 7){
+                  dialysisCount[i].mode_id = "IUF"
+                }
+                 if(dialysisCount[i].mode_id == 8){
+                  dialysisCount[i].mode_id = "HFHD"
+                }
+                 if(dialysisCount[i].mode_id == 9){
+                  dialysisCount[i].mode_id = "HFHD+HP"
+                }
+                 if(dialysisCount[i].mode_id == 10){
+                  dialysisCount[i].mode_id = "PHF"
+                }
+               if(dialysisCount[i].mode_id == 11){
+                  dialysisCount[i].mode_id = "HFR"
+                }
+                if(dialysisCount[i].mode_id == 12){
+                  dialysisCount[i].mode_id = "HDF+HP"
+                }
+                if(dialysisCount[i].mode_id == 13){
+                  dialysisCount[i].mode_id = "CRRT"
+                }
+               if(dialysisCount[i].mode_id == 14){
+                  dialysisCount[i].mode_id = "腹水回输"
+                }
+              }
+                let dataInfo = {}
+                dialysisCount.forEach((item, index) => {
+                let { start_nurse } = item
+                  if (!dataInfo[start_nurse]) {
+                    dataInfo[start_nurse] = {
+                      child: [],
+                      start_nurse: item.start_nurse,
+                    }
+                  }
+               })
+              let list = Object.values(dataInfo)
+              console.log("list222222",list)
+              list.map(item=>{
+              for(let i=0;i<dialysisCount.length;i++){
+                 if(item.start_nurse == dialysisCount[i].start_nurse){
+                    item.child.push(dialysisCount[i])
+                 }
+               }
+             })
+             console.log("listq23333",list)
+             this.modeList.push(...list)
             } else {
               this.loading = false
             }
@@ -398,19 +522,23 @@
           this.monthValue = ''
           sessionStorage.setItem("nurse_start_time", val)
           sessionStorage.removeItem("nurseMonth");
+          
           this.GetNurseWorkloadChartData(this.query)
           this.GetNurseWorkloadTableData(this.query)
 
         }
 
-      },  GetNurseWorkloadChartData(params) {
+      }, 
+       GetNurseWorkloadChartData(params) {
 
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
         this.percent = []
+        console.log("parasm",params)
         GetNurseWorkloadChartData(params)
           .then(rs => {
             var resp = rs.data
+            console.log("图标数据",resp)
             if (resp.state == 1) {
 
               for (let i = 0;  i < resp.data.data.length;i++){
@@ -424,6 +552,18 @@
                 }else if(this.query.statistics_type == 3){
                   this.bar.series[0].data.push(resp.data.data[i].mission_count)
                   this.percent.push(resp.data.data[i].mission_ratio)
+                }else if(this.query.statistics_type == 4){
+                  this.bar.series[0].data.push(resp.data.data[i].change_nuser_count)
+                  this.percent.push(resp.data.data[i].change_nurse_ratio)
+                }else if(this.query.statistics_type == 5){
+                  this.bar.series[0].data.push(resp.data.data[i].difficult_nuser_count)
+                  this.percent.push(resp.data.data[i].difficult_nurse_ratio)
+                }else if(this.query.statistics_type == 6){
+                  this.bar.series[0].data.push(resp.data.data[i].new_nuser_count)
+                  this.percent.push(resp.data.data[i].new_nurse_ratio)
+                }else if(this.query.statistics_type == 7){
+                  this.bar.series[0].data.push(resp.data.data[i].start_nuser_count)
+                  this.percent.push(resp.data.data[i].start_nurse_ratio)
                 }
               }
               this.getArrLength(this.bar.xAxis.data)
@@ -501,7 +641,22 @@
         d = d > 9 ? d : '0' + d;
         return y + '-' + m + '-' + d;
       },
-    },created(){
+      getTotalCount(adminuserid){
+        console.log("adminuserid",adminuserid)
+        console.log("333333",this.modeList)
+        var name = ""
+        for(let i=0;i<this.modeList.length;i++){
+          for(let j=0;j<this.modeList[i].child.length;j++){
+            if(adminuserid == this.modeList[i].child[j].start_nurse){
+               name += (this.modeList[i].child[j].mode_id+"-"+this.modeList[i].child[j].Count) + "次"+"、"
+            }
+          }
+        }
+        console.log("name22222",name)
+        return name.substr(0,name.length-1)
+      }
+    },
+    created(){
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -71,6 +71,12 @@
                   :label="item.name"
                   :value="item.id">
                 </el-option>
+               <!-- <el-option
+                  v-for="item,index in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+               </el-option> -->
               </el-select>
             </el-form-item>
             <el-form-item label="零价 : " prop="retail_price">
@@ -234,7 +240,7 @@
 
 
 <script>
-  import { getDictionaryDataConfig } from '@/utils/data'
+  import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
 
   export default {
     name: 'goodInfoDailog',
@@ -339,7 +345,9 @@
     methods: {
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
-
+      },
+      getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
       },
       show(id,form) {
         this.visible = true
@@ -456,6 +464,7 @@
       visible(val) {
         this.form = this.formValue
         this.good_unit = this.formValue.good_unit
+      
         if (this.isCreated == 1) {
           this.good_unit = ''
         }

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -8,6 +8,14 @@
       type="primary"
       >打印
     </el-button>
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -204,6 +212,7 @@ export default {
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.goodUnit = this.$store.getters.good_unit
   },
   data() {
     return {
@@ -232,7 +241,9 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
+      goodUnit:[]
     };
   },
   methods: {
@@ -331,6 +342,7 @@ export default {
         order_type: this.order_type,
         dealer: this.dealer_id
       };
+      
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -338,8 +350,10 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
+          console.log("数据源头",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
+            this.tableList.push(response.data.data.list[i])
           }
         }
       });
@@ -540,7 +554,44 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+      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].remark = this.tableList[i].GoodInfo.remark
+         
+        }
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','remark']
+       
+       const data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+      
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
+     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
+     },
   }
 };
 </script>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -8,6 +8,15 @@
       type="primary"
       >打印
     </el-button>
+
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -206,6 +215,7 @@ export default {
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.goodUnit = this.$store.getters.good_unit
   },
   data() {
     return {
@@ -234,7 +244,9 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
+      goodUnit:[]
     };
   },
   methods: {
@@ -333,14 +345,17 @@ export default {
         dealer: this.dealer_id
       };
       this.cancelStockDate = [];
+    
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
           this.total = response.data.data.total;
+          
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
+            this.tableList.push(response.data.data.list[i])
           }
         }
       });
@@ -541,7 +556,43 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+    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].remark = this.tableList[i].GoodInfo.remark
+        }
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','remark']
+       
+       const data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
+     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
+     },
   }
 };
 </script>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -9,6 +9,15 @@
       >打印
     </el-button>
 
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
+    </el-button>
+
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -222,6 +231,7 @@ export default {
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.goodUnit = this.$store.getters.good_unit
   },
   data() {
     return {
@@ -252,7 +262,9 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
+      goodUnit:[]
     };
   },
   methods: {
@@ -320,6 +332,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
@@ -369,10 +382,13 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
+          console.log("数据源头list2222222",response.data.data.list)
+
           for (let i = 0; i < response.data.data.list.length; i++) {
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
+            this.tableList.push(obj)
           }
           this.cancelStockDate.push({
             warehousing_order: "合计",
@@ -608,7 +624,78 @@ export default {
           end_time: this.end_time
         }
       });
-    }
+    },
+    exportList(){
+       
+     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])
+         }
+        }
+      })
+
+     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
+          }
+       }
+     }
+    
+      
+      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 data = this.formatJson(filterVal, list)
+       console.log("data",data)
+      
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材入库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
+     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
+     },
   }
 };
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -7,6 +7,14 @@
       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
     </el-button>
     <div class="cell clearfix">
       <el-input
@@ -216,6 +224,7 @@ export default {
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.goodUnit = this.$store.getters.good_unit
   },
   data() {
     return {
@@ -245,7 +254,9 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      goodUnit:[],
+      tableList:[]
     };
   },
   methods: {
@@ -307,6 +318,7 @@ export default {
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
+          
           this.$message.error(response.data.msg);
           return false;
         } else {
@@ -316,6 +328,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: "合计",
@@ -345,18 +358,21 @@ export default {
         order_type: this.order_type,
         dealer: this.dealer_id
       };
+      console.log("parasm334444444",Params)
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          
           this.total = response.data.data.total;
          
           for (let i = 0; i < response.data.data.list.length; i++) {
             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: "合计",
@@ -366,6 +382,7 @@ export default {
               warehouse_out_time: 0
             }
           });
+        
         }
       });
     },
@@ -599,7 +616,47 @@ export default {
           end_time: this.end_time
         }
       });
-    }
+    },
+     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)
+         
+        }
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','total_price','remark']
+       
+
+      
+
+       const data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
+     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
+     },
   }
 };
 </script>

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

@@ -8,6 +8,15 @@
       type="primary"
       >打印
     </el-button>
+
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -237,7 +246,8 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      tableData:[]
+      tableData:[],
+      tableList:[]
     };
   },
   methods: {
@@ -350,6 +360,7 @@ export default {
            var order =  response.data.data.order
            console.log("退库详细",order)
            this.tableData = order
+           this.tableList = order
            var total = response.data.data.total
            this.total = total
          } 
@@ -366,13 +377,35 @@ export default {
       return name
     },
 
-      getTime: function(val) {
+     getTime: function(val) {
       if (val == 0) {
         return "";
       } else {
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    exportList(){
+       for(let i=0;i<this.tableList.length;i++){
+          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 data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品退库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   }
 };
 </script>

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

@@ -7,6 +7,14 @@
       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
     </el-button>
     <div class="cell clearfix">
       <el-input
@@ -238,7 +246,8 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      tableData:[]
+      tableData:[],
+      tableList:[]
     };
   },
   methods: {
@@ -393,6 +402,7 @@ export default {
           var order = response.data.data.order
           console.log("order",order)
           this.tableData = order
+          this.tableList = order
           var total =  response.data.data.total
           this.total = total
         }
@@ -415,6 +425,28 @@ export default {
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    exportList(){
+       for(let i=0;i<this.tableList.length;i++){
+          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 data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品退货明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+    formatJson(filterVal, jsonData) {
+       return jsonData.map(v => filterVal.map(j => v[j]));
+    },
   }
 };
 </script>

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

@@ -9,6 +9,15 @@
       >打印
     </el-button>
 
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
+    </el-button>
+
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -248,7 +257,8 @@ export default {
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
+      dealer: [],
+      tableList:[],
     };
   },
   methods: {
@@ -356,6 +366,7 @@ export default {
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
           this.cancelStockDate = drugInOrder
+          this.tableList = drugInOrder
           var total = response.data.data.total
           this.total = total
         }
@@ -375,7 +386,29 @@ export default {
           }
       }
       return name
-    }
+    },
+     exportList(){
+        for(let i=0;i<this.tableList.length;i++){
+          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 data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品入库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   }
 };
 </script>

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

@@ -7,6 +7,14 @@
       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      icon="el-icon-printer"
+      @click="exportList"
+      type="primary"
+      >导出
     </el-button>
     <div class="cell clearfix">
       <el-input
@@ -246,7 +254,8 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      tableData:[]
+      tableData:[],
+      tableList:[]
     };
   },
   methods: {
@@ -379,6 +388,7 @@ export default {
           var order = response.data.data.order
           console.log("出库数据",order)
           this.tableData = order
+          this.tableList = order
           var total = response.data.data.total
           this.total = total
         } 
@@ -397,7 +407,30 @@ export default {
           }
       }
       return name
-    }
+    },
+
+     exportList(){
+        for(let i=0;i<this.tableList.length;i++){
+          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 data = this.formatJson(filterVal, this.tableList)
+       console.log("data",data)
+       
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品出库明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+     formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+     },
   }
 };
 </script>

src/xt_pages/stock/stockOutOrder.vue

@@ -499,10 +499,13 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          console.log("parsm",response.data.data)
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
+            
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
+          console.log("2222222",this.warehouseOutDate)
         }
       });
     },
@@ -562,7 +565,7 @@ export default {
       } else {
         this.GetWarehouseOut();
       }
-      this.GetWarehouseOut();
+     
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/user/doctorAdvice.vue

@@ -35,7 +35,7 @@
           size="small"
           @click="printThisInfo()"
           :type="
-            adviceType == 1 || adviceType == 3 || adviceType == 2
+            adviceType == 1 || adviceType == 3 || adviceType == 2 || adviceType == 4
               ? 'primary'
               : 'warning'
           "
@@ -153,12 +153,8 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.advice_type == 1">长嘱</span>
-            <span
-              v-else-if="
-                scope.row.advice_type == 3 || scope.row.advice_type == 2
-              "
-              >临嘱</span
-            >
+            <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
+            <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
             <span v-else></span>
           </template>
         </el-table-column>
@@ -584,9 +580,7 @@
             </el-col>
             <el-col :span="5">
               <el-button
-                :disabled="
-                  $store.getters.xt_user.subscibe.state == 3 ? true : false
-                "
+                :disabled="$store.getters.xt_user.subscibe.state == 3  ? true : false"
                 round
                 @click="openAdviceTemplate()"
                 >选择医嘱模板
@@ -2043,11 +2037,13 @@ export default {
       adviceTypeArr: [
         { value: 0, label: "全部" },
         { value: 1, label: "长期" },
-        { value: 3, label: "临时" }
+        { value: 3, label: "临时" },
+        { value: 4, label: "普通医嘱" },
       ],
       adviceTypeOptions: [
         { value: 1, label: "长期" },
-        { value: 3, label: "临时" }
+        { value: 3, label: "临时" },
+        { value: 4,  label: "普通医嘱" },
       ],
       stopType: 0,
       stopTypeArr: [
@@ -2324,8 +2320,9 @@ export default {
             mode = "1-2";
           } else if (this.groupForm.advice_type == 3) {
             mode = "1-1";
+          }else if (this.groupForm.advice_type == 4){
+            mode = "1-3"
           }
-        console.log("长期医嘱2222",this.medicals)
         console.log("长期医嘱3333",submitForm)
        
         if(this.private_drug_config != null&&this.private_drug_config.drug_start == 1){
@@ -2593,6 +2590,8 @@ export default {
         this.getAdviceConfig(1);
       } else if (this.groupForm.advice_type == 3) {
         this.getAdviceConfig(0);
+      }else if(this.groupForm.advice_type == 4){
+        this.getAdviceConfig(0)
       }
 
       this.templateForm = { id: "" };
@@ -3518,7 +3517,7 @@ export default {
             scanStyles: false
           });
         }, 1);
-      } else if (this.adviceType == 3 || this.adviceType == 2) {
+      } else if (this.adviceType == 3 || this.adviceType == 2 || this.adviceType == 4) {
         if (this.lstableData.length == 0) {
           this.$message.error("请勾选需要打印的医嘱!");
           return false;
@@ -4372,7 +4371,7 @@ export default {
           var doctoradvice = response.data.data.doctoradvice;
           // console.log("doctoradvice", doctoradvice);
           this.dataAdvice = doctoradvice;
-          if (this.adviceType === 3 || this.adviceType === 2) {
+          if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
             this.lstableData = this.dataAdvice;
             // console.log("---", this.multipleSelection);
           } else if (this.adviceType === 1) {