XMLWAN 3 år sedan
förälder
incheckning
97d4842833

+ 15 - 0
src/store/modules/globalConfig.js Visa fil

751
         zongliang_unit: 'mg',
751
         zongliang_unit: 'mg',
752
         gaimingcheng_unit: '',
752
         gaimingcheng_unit: '',
753
         gaijiliang_unit: ''
753
         gaijiliang_unit: ''
754
+      },
755
+      12: {
756
+        id: 12,
757
+        name: '无抗凝剂',
758
+        type: 1,
759
+        shouji: 2,
760
+        weichi: 2,
761
+        zongliang: 2,
762
+        gaimingcheng: -1,
763
+        gaijiliang: -1,
764
+        shouji_unit: 'mg',
765
+        weichi_unit: 'mg/h',
766
+        zongliang_unit: 'mg',
767
+        gaimingcheng_unit: '',
768
+        gaijiliang_unit: ''
754
       }
769
       }
755
     },
770
     },
756
     anticoagulants_set: {
771
     anticoagulants_set: {

+ 1 - 0
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Visa fil

411
              <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
411
              <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
412
              <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
412
              <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
413
              <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
413
              <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
414
+             <span v-if="scope.row.monitor_anticoagulant == 12">无抗凝剂</span>
414
              <span v-if="scope.row.monitor_anticoagulant_value!=''">({{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }})</span>
415
              <span v-if="scope.row.monitor_anticoagulant_value!=''">({{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }})</span>
415
 
416
 
416
             </template>
417
             </template>

+ 1 - 0
src/xt_pages/dialysis/details/dialysisMonitoring.vue Visa fil

75
             <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
75
             <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
76
             <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
76
             <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
77
             <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
77
             <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
78
+            <span v-if="monitor.monitor_anticoagulant == 12">无抗凝剂</span>
78
             <span v-if="monitor.monitor_anticoagulant_value!=''">({{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }})</span>
79
             <span v-if="monitor.monitor_anticoagulant_value!=''">({{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }})</span>
79
           </td>
80
           </td>
80
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>
81
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>

+ 0 - 7
src/xt_pages/qcd/workAnalysis/nurse.vue Visa fil

149
               </template>
149
               </template>
150
             </el-table-column>
150
             </el-table-column>
151
 
151
 
152
-            <el-table-column label="冲管" align="center">
153
-              <template slot-scope="scope">
154
-                {{scope.row.total_washpipe_nurse?scope.row.total_washpipe_nurse:''}}
155
-
156
-              </template>
157
-            </el-table-column>
158
-
159
             <el-table-column label="上机" align="center" width="300">
152
             <el-table-column label="上机" align="center" width="300">
160
               <template slot-scope="scope">
153
               <template slot-scope="scope">
161
                 {{scope.row.start_nuser_count?scope.row.start_nuser_count:''}}
154
                 {{scope.row.start_nuser_count?scope.row.start_nuser_count:''}}

+ 23 - 8
src/xt_pages/stock/detail/stockInDetail.vue Visa fil

217
   name: "stockInDetail",
217
   name: "stockInDetail",
218
 
218
 
219
   created() {
219
   created() {
220
+    
220
     var nowDate = new Date();
221
     var nowDate = new Date();
221
     var nowYear = nowDate.getFullYear();
222
     var nowYear = nowDate.getFullYear();
222
     var nowMonth = nowDate.getMonth() + 1;
223
     var nowMonth = nowDate.getMonth() + 1;
237
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
238
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
238
       "-" +
239
       "-" +
239
       (nowDay < 10 ? "0" + nowDay : nowDay);
240
       (nowDay < 10 ? "0" + nowDay : nowDay);
241
+    var start_time =  window.sessionStorage.getItem('start_time')
242
+    var end_time =  window.sessionStorage.getItem('end_time')
243
+    console.log("start_time",start_time,end_time)
244
+    if(start_time !=null){
245
+      this.start_time = start_time
246
+    }
247
+    if(end_time!=null){
248
+      this.end_time = end_time
249
+    }
250
+    window.sessionStorage.removeItem('start_time')
251
+    window.sessionStorage.removeItem('end_time')  
240
     this.GetCancelStock();
252
     this.GetCancelStock();
241
     this.GetConfigInfo();
253
     this.GetConfigInfo();
242
     this.fetchAllAdminUsers();
254
     this.fetchAllAdminUsers();
243
     this.goodUnit = this.$store.getters.good_unit
255
     this.goodUnit = this.$store.getters.good_unit
244
-
245
-    // this.getPrintStockGood()
246
     this.org_id = this.$store.getters.xt_user.template_info.org_id
256
     this.org_id = this.$store.getters.xt_user.template_info.org_id
247
-    console.log("机构ID",this.org_id)
257
+   
248
     this.getGoodDetailPrintList()
258
     this.getGoodDetailPrintList()
249
   },
259
   },
250
   data() {
260
   data() {
484
         this.$message.error("结束时间不能小于开始时间");
494
         this.$message.error("结束时间不能小于开始时间");
485
         this.start_time = "";
495
         this.start_time = "";
486
       } else {
496
       } else {
497
+         window.sessionStorage.removeItem('start_time')
487
         this.GetCancelStock();
498
         this.GetCancelStock();
488
-        // this.getPrintStockGood()
499
+       
489
       }
500
       }
490
     },
501
     },
491
     endTimeChange(val) {
502
     endTimeChange(val) {
494
         this.$message.error("结束时间不能小于开始时间");
505
         this.$message.error("结束时间不能小于开始时间");
495
         this.end_time = "";
506
         this.end_time = "";
496
       } else {
507
       } else {
508
+        window.sessionStorage.removeItem('end_time')
497
         this.GetCancelStock();
509
         this.GetCancelStock();
498
-        // this.getPrintStockGood()
499
       }
510
       }
500
     },
511
     },
501
     getTimestamp(time) {
512
     getTimestamp(time) {
647
       return (r1 * r2) / Math.pow(10, m);
658
       return (r1 * r2) / Math.pow(10, m);
648
     },
659
     },
649
     PrintAction: function() {
660
     PrintAction: function() {
661
+      window.sessionStorage.setItem('start_time',this.start_time)
662
+      window.sessionStorage.setItem('end_time',this.end_time)
650
       this.$router.push({
663
       this.$router.push({
651
         path: "/stock/print",
664
         path: "/stock/print",
652
         query: {
665
         query: {
765
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
778
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
766
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
779
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
767
         console.log("hhhhhhhh",this.tableInfo)
780
         console.log("hhhhhhhh",this.tableInfo)
768
-       
781
+        
769
         const data = this.formatJson(filterVal, this.tableInfo)
782
         const data = this.formatJson(filterVal, this.tableInfo)
770
         console.log("data222222222",data)
783
         console.log("data222222222",data)
784
+      
771
           excel.export_json_to_excel({
785
           excel.export_json_to_excel({
772
             header: tHeader,
786
             header: tHeader,
773
             data,
787
             data,
794
         this.tableDataList.push(obj)
808
         this.tableDataList.push(obj)
795
         import('@/vendor/Export2Excel').then(excel => {
809
         import('@/vendor/Export2Excel').then(excel => {
796
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
810
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
797
-        const filterVal = ['index','warehousing_count', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
811
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
798
         console.log("hhhhhhhh",this.tableDataList)
812
         console.log("hhhhhhhh",this.tableDataList)
799
       
813
       
800
-      
814
+        
801
         const data = this.formatJson(filterVal, this.tableDataList)
815
         const data = this.formatJson(filterVal, this.tableDataList)
802
         console.log("data222222222",data)
816
         console.log("data222222222",data)
817
+        return
803
           excel.export_json_to_excel({
818
           excel.export_json_to_excel({
804
             header: tHeader,
819
             header: tHeader,
805
             data,
820
             data,