数据

src/store/modules/globalConfig.js

@@ -751,6 +751,21 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      12: {
+        id: 12,
+        name: '无抗凝剂',
+        type: 1,
+        shouji: 2,
+        weichi: 2,
+        zongliang: 2,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

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

@@ -411,6 +411,7 @@
              <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
              <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant == 12">无抗凝剂</span>
              <span v-if="scope.row.monitor_anticoagulant_value!=''">（{{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }}）</span>
 
             </template>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

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

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -149,13 +149,6 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="冲管" align="center">
-              <template slot-scope="scope">
-                {{scope.row.total_washpipe_nurse?scope.row.total_washpipe_nurse:''}}
-
-              </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:''}}

src/xt_pages/stock/detail/stockInDetail.vue

@@ -217,6 +217,7 @@ export default {
   name: "stockInDetail",
 
   created() {
+    
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -237,14 +238,23 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    var start_time =  window.sessionStorage.getItem('start_time')
+    var end_time =  window.sessionStorage.getItem('end_time')
+    console.log("start_time",start_time,end_time)
+    if(start_time !=null){
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('start_time')
+    window.sessionStorage.removeItem('end_time')  
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
-
-    // this.getPrintStockGood()
     this.org_id = this.$store.getters.xt_user.template_info.org_id
-    console.log("机构ID",this.org_id)
+   
     this.getGoodDetailPrintList()
   },
   data() {
@@ -484,8 +494,9 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+         window.sessionStorage.removeItem('start_time')
         this.GetCancelStock();
-        // this.getPrintStockGood()
+       
       }
     },
     endTimeChange(val) {
@@ -494,8 +505,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        window.sessionStorage.removeItem('end_time')
         this.GetCancelStock();
-        // this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -647,6 +658,8 @@ export default {
       return (r1 * r2) / Math.pow(10, m);
     },
     PrintAction: function() {
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({
         path: "/stock/print",
         query: {
@@ -765,9 +778,10 @@ export default {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
         console.log("hhhhhhhh",this.tableInfo)
-       
+        
         const data = this.formatJson(filterVal, this.tableInfo)
         console.log("data222222222",data)
+      
           excel.export_json_to_excel({
             header: tHeader,
             data,
@@ -794,12 +808,13 @@ export default {
         this.tableDataList.push(obj)
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_count', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
         console.log("hhhhhhhh",this.tableDataList)
       
-      
+        
         const data = this.formatJson(filterVal, this.tableDataList)
         console.log("data222222222",data)
+        return
           excel.export_json_to_excel({
             header: tHeader,
             data,