批量打印

src/App.vue

@@ -39,7 +39,14 @@ export default {
     },
 
   },
-
+  watch:{
+  $route(to,from){
+    console.log("pppppppppp",to.path);
+    if(to.path.indexOf('/patients/patient')== -1){
+      window.sessionStorage.removeItem('patientKey')
+    }
+  }
+},
 };
 </script>
 

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

@@ -372,6 +372,19 @@
             v-if="isShow('肝素用量余量')"
           >
           </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="KT/V"
+            width="140"
+            v-if="isShow('KT/V') && org_id == 9987"
+          >
+           <template slot-scope="scope">
+              {{ scope.row.ktv ? scope.row.ktv : ""  }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="symptom"
             align="center"
@@ -380,6 +393,7 @@
             v-if="isShow('病情变化')"
           >
           </el-table-column>
+          
           <el-table-column
             prop="dispose"
             align="center"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -30,6 +30,7 @@
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
+          <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
           <th v-if="isShow('结果')" width="92px">结果</th>
@@ -53,7 +54,8 @@
           <td v-if="isShow('电导度')"> {{ monitor.conductivity ? monitor.conductivity : "" }} </td>
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
-          <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th>
+          <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th> 
+          <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
           <td v-if="isShow('结果')">{{ monitor.result }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -514,12 +514,15 @@
 
                     <td width="70">医生签名:</td>
                     <td width="100">
-                      <div class="under-line">
+                     
+                      <div class="under-line" v-if="org_id == 9987">
+                         <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
+                         <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                      </div>
+                       <div class="under-line" v-else>
                         <span v-if="advices.length == 0"></span>
                         <span v-else-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{ getAdminUser(advices[0][0].advice_doctor) }}</span>
                         <img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)" alt="" srcset="" v-else />
-
-                        <!-- {{getXuserName(prescription.prescription_doctor)}} -->
                       </div>
                     </td>
                     <td width="70">上机护士:</td>
@@ -607,12 +610,13 @@
             <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
           <td>&nbsp;{{monitor.dialysate_temperature}}</td>
           <td>&nbsp;{{monitor.replacement_rate}}</td> -->
+            <td v-if="org_id == 9987">
+               &nbsp;{{monitor.ktv?monitor.ktv:""}}
+            </td>
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
-            <td v-if="org_id == 9987">
-               &nbsp;{{monitor.ktv}}
-            </td>
+          
           </tr>
         </tbody>
       </table>
@@ -1593,6 +1597,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
@@ -1608,7 +1613,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
-    this.org_id = this.org_template_info.org_id
+   
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -3,7 +3,7 @@
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
-      <el-input style="width: 150px;" class="filter-item" placeholder="规格名称" v-model="keywords"/>
+      <el-input style="width: 150px;" class="filter-item" placeholder="商品类型" v-model="keywords"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
 
@@ -112,10 +112,7 @@
         type: Object
       }
     },
-    created(){
-      this.tableData = this.propForm.goodType
-      console.log("222233333",this.tableData)
-    },
+   
     methods: {
       hide: function() {
         this.visibility = false
@@ -220,7 +217,7 @@
      
       search:function() {
         if (this.keywords.length <= 0) {
-           console.log("0000000",this.propForm.goodType)
+         
            this.propForm.goodType = this.propForm.goodType
         }
         const searchArr = []

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -115,13 +115,19 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="商品类型" align="center">
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{ typeName(scope.row.good_type_id) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="规格名称" align="center">
+         <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ typeNameOne(scope.row.good_id) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
           </template>
@@ -268,6 +274,15 @@ export default {
       }
       return name;
     },
+    typeNameOne: function(good_id) {
+     let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name;
+    },
     specificationName: function(good_info_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/stock/detail/print.vue

@@ -23,8 +23,9 @@
             <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="250">耗材类型</td>
+               <td style="line-height: 50px" width="250">耗材名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
@@ -38,9 +39,13 @@
               <td style="line-height: 50px">
                 <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
               </td>
+              <td style="line-height: 50px">
+                <span v-if="stock">{{stock.good_name}}</span>
+              </td>
               <td style="line-height: 50px">
                 <span v-if="stock">{{stock.specification_name}}</span>
               </td>
+
               <td style="line-height: 50px">{{calCount(stock)}}</td>
               <td style="line-height: 50px" v-if="type == 1 || type == 3">{{calTotal(stock)}}</td>
               <td style="line-height: 50px"></td>
@@ -137,7 +142,8 @@
           style: style,
           scanStyles: false
         })
-      }, getDialysisRecord() {
+      }, 
+      getDialysisRecord() {
         this.loading = true
         getPrintStockGood(this.queryParams).then(response => {
           if (response.data.state == 1) {
@@ -168,7 +174,7 @@
             for(let i = 0; i <this.stockDatas.length;i++){
               obj = this.stockDatas[i]
             }
-
+            console.log("9999999",this.stockDatas)
             // if (this.stockDatas.length < 50) {
             //   var nl = 50 - this.stockDatas.length
             //   for (let index = 0; index < nl; index++) {

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -115,13 +115,21 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="商品类型" align="center">
+        
+
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{ typeName(scope.row.good_type_id) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="规格名称" align="center">
+         <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ typeNameOne(scope.row.good_id) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
           </template>
@@ -257,6 +265,15 @@ export default {
       }
       return name;
     },
+    typeNameOne:function(good_id){
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name
+    },
     specificationName: function(good_info_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -116,13 +116,19 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="商品类型" align="center">
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{ typeName(scope.row.good_type_id) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="规格名称" align="center">
+        <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ typeNameOne(scope.row.good_id) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
           </template>
@@ -144,7 +150,7 @@
             {{ getXuserName(scope.row.Warehousing.creater) }}
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center">
+        <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price }}
           </template>
@@ -281,6 +287,15 @@ export default {
       }
       return name;
     },
+    typeNameOne:function(good_id){
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name;
+    },
     specificationName: function(good_info_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -115,13 +115,19 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="商品类型" align="center">
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{ typeName(scope.row.good_type_id) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="规格名称" align="center">
+         <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ typeNameOne(scope.row.good_id) }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
           </template>
@@ -143,7 +149,7 @@
             {{ getXuserName(scope.row.WarehouseOut.creater) }}
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center">
+        <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price }}
           </template>
@@ -280,6 +286,15 @@ export default {
       }
       return name;
     },
+    typeNameOne:function(good_id){
+       let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_id) {
+          name = this.goodInfo[i].good_name;
+        }
+      }
+      return name;
+    },
     search: function() {
       const Params = {
         page: this.page,

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -3,7 +3,7 @@
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
-      <el-input style="width: 150px;" class="filter-item" placeholder="药品规格名称" v-model="keywords"/>
+      <el-input style="width: 150px;" class="filter-item" placeholder="药品名称" v-model="keywords"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
 
@@ -22,7 +22,7 @@
           style="width: 100%">
           <el-table-column
             align="center"
-            label="药品规格">
+            label="药品名称">
             <template slot-scope="scope">
               <span>{{scope.row.drug_name}}</span>
             </template>
@@ -121,6 +121,9 @@
         type: Object
       }
     },
+    created(){
+      console.log("药品类型",this.propForm)
+    },
     methods: {
       hide: function() {
         this.visibility = false
@@ -193,22 +196,38 @@
             return this.propForm.goodUnit[i].name
           }
         }
-      }, search: function() {
-        if (this.keywords.length <= 0) {
+      },
+      //  search: function() {
+      //   if (this.keywords.length <= 0) {
+      //     this.$message.error('搜索关键字不能为空')
+      //     return
+      //   }
+      //   const searchArr = []
+      //   for (let i = 0; i < this.goodInfoTableData.length; i++) {
+      //     if (this.goodInfoTableData[i].drug_spec.indexOf(this.keywords) != -1) {
+      //       searchArr.push(this.goodInfoTableData[i])
+      //     }
+      //   }
+      //   this.goodInfoTableData = []
+      //   for (let i = 0; i < searchArr.length; i++) {
+      //     this.goodInfoTableData.push(searchArr[i])
+      //   }
+      // }, 
+      search:function() {
+       if (this.keywords.length <= 0) {
           this.$message.error('搜索关键字不能为空')
-          return
-        }
-        const searchArr = []
-        for (let i = 0; i < this.goodInfoTableData.length; i++) {
-          if (this.goodInfoTableData[i].drug_spec.indexOf(this.keywords) != -1) {
-            searchArr.push(this.goodInfoTableData[i])
-          }
-        }
-        this.goodInfoTableData = []
-        for (let i = 0; i < searchArr.length; i++) {
-          this.goodInfoTableData.push(searchArr[i])
-        }
-      }, changeGoodInfoTableData: function(val) {
+        } 
+        const searchArr = [] 
+        for(let i=0;i<this.propForm.goods.length;i++){
+           if(this.propForm.goods[i].drug_name.indexOf(this.keywords)!=-1){
+              searchArr.push(this.propForm.goods[i])
+           }
+        } 
+        this.propForm.goods = []
+        this.propForm.goods.push(...searchArr)
+         console.log("2333333",this.propForm.goods)
+      },
+      changeGoodInfoTableData: function(val) {
         console.log(val)
       },
        changeAllGoodInfoTableData: function(selection) {

src/xt_pages/stock/stockInOrder.vue

@@ -228,7 +228,7 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>商品类型</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
@@ -239,7 +239,18 @@
           </el-table-column>
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格名称</span>
+              <span>耗材名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_id != 0">{{
+                getTypeNameOne(scope.row.good_id)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格型号</span>
             </template>
             <template slot-scope="scope">
               <span v-if="scope.row.good_id != 0">{{
@@ -250,7 +261,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价</span>
+              <span>进货价</span>
             </template>
             <template slot-scope="scope">
               <span>{{ scope.row.price }}</span>
@@ -827,6 +838,17 @@ export default {
       }
       return name;
     },
+    getTypeNameOne:function(id){
+      console.log("999999",this.goodInfo)
+     
+      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;
+    },
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
@@ -1064,7 +1086,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-         
+          console.log("2223333-------",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             response.data.data.info[i].product_date = this.getTime(

src/xt_pages/stock/stockInOrderDetail.vue

@@ -55,7 +55,7 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>商品类型</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
@@ -64,9 +64,20 @@
               }}</span>
             </template>
           </el-table-column>
+          <el-table-column>
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_id != 0">{{
+                getTypeNameOne(scope.row.good_id)
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格名称</span>
+              <span>规格型号</span>
             </template>
             <template slot-scope="scope">
               <span v-if="scope.row.good_id != 0">{{
@@ -77,7 +88,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价</span>
+              <span>进货价</span>
             </template>
             <template slot-scope="scope">
               <span>{{ scope.row.price }}</span>
@@ -202,6 +213,15 @@ export default {
       }
       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;
+    },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {

src/xt_pages/stock/stockOutOrder.vue

@@ -219,7 +219,7 @@
           >
             <el-table-column min-width="35" align="center">
               <template slot="header" slot-scope="scope">
-                <span>商品类型</span>
+                <span>耗材类型</span>
               </template>
 
               <template slot-scope="scope">
@@ -228,7 +228,16 @@
             </el-table-column>
             <el-table-column min-width="35" align="center">
               <template slot="header" slot-scope="scope">
-                <span>规格名称</span>
+                <span>耗材名称</span>
+              </template>
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_id != 0">{{getTypeNameOne(scope.row.good_id)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格型号</span>
               </template>
               <template slot-scope="scope">
                 <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
@@ -238,7 +247,7 @@
 
             <el-table-column min-width="23" align="center">
               <template slot="header" slot-scope="scope">
-                <span>单价</span>
+                <span>出货价</span>
               </template>
               <template slot-scope="scope">
                 <span>{{scope.row.price}}</span>
@@ -737,6 +746,16 @@ export default {
         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
+      },
+
      getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -34,16 +34,25 @@
         >
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>商品类型</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
               <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
             </template>
+          </el-table-column>
+           <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_id != 0">{{getTypeNameOne(scope.row.good_id)}}</span>
+            </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格名称</span>
+              <span>规格型号</span>
             </template>
             <template slot-scope="scope">
               <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
@@ -53,7 +62,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价</span>
+              <span>出货价</span>
             </template>
             <template slot-scope="scope">
               <span>{{scope.row.price}}</span>
@@ -161,6 +170,15 @@
           }
         }
         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
       },
        GetConfigInfo: function() {
         GetAllConfig().then(response => {

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -83,6 +83,7 @@
               </el-form-item>
             </template>
           </el-table-column>
+          
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>

src/xt_pages/user/components/PatientSidebar.vue

@@ -130,12 +130,15 @@ export default {
             }
           ]
         }
-      ]
+      ],
+      name:""
     }
   },
   methods: {
     handleNodeClick(data) {
       var name = data.name
+      this.name = data.name
+      window.sessionStorage.setItem('patientKey',data.name)
       if (name == '1-1') {
         this.$router.push({ path: '/patients/patient/' + this.id })
       } else if (name == '1-2') {
@@ -172,6 +175,7 @@ export default {
     },
     changePatient(value) {
       console.log(value)
+
       this.$router.push('/patients/patient/' + value)
     },
     getList() {
@@ -253,9 +257,58 @@ export default {
     }
   },
   created() {
-    this.treeKey = this.defaultActive
+    var patientKey =  window.sessionStorage.getItem('patientKey')
+    console.log("patient",patientKey)
+    var query = this.$route.path
+    if(patientKey){
+     this.treeKey = patientKey
+     if(query.indexOf('edit') == -1){ 
+      if (patientKey == '1-1') {
+        this.$router.push({ path: '/patients/patient/' + this.id })
+      } else if (patientKey == '1-2') {
+        this.$router.push({ path: '/patients/course?id=' + this.id })
+      } else if (patientKey == '1-3') {
+        this.$router.push({ path: '/patients/inspection?id=' + this.id })
+      } else if (patientKey == '1-4') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/doctorAdvice'
+        })
+      } else if (patientKey == '1-6') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/dryWeight'
+        })
+      } else if (patientKey == '1-5') {
+        this.$router.push({ path: '/patients/rescue?id=' + this.id })
+      }else if (patientKey == '2-1') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/dialysisSolution'
+        })
+      } else if (patientKey == '2-2') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/dialysisRecord'
+        })
+      } else if (patientKey == '2-4') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/scheduling'
+        })
+      } else if (patientKey == '2-5') {
+        this.$router.push({
+          path: '/patients/patient/' + this.id + '/proeducation'
+        })
+      }
+     }else{
+       this.treeKey = "1-1"
+       
+     }
+    }else{
+       this.treeKey = this.defaultActive
+       
+    }
+   
+    
     this.getList()
-  }
+  },
+ 
 }
 </script>
 

src/xt_pages/user/inspection.vue

@@ -104,10 +104,11 @@
               min-width="80"
             >
               <template slot-scope="scope">
-                <span>{{ scope.row.value }}</span>
-                <span v-if="scope.row.range_type == 1">{{
-                  scope.row.value_direction
-                }}</span>
+                <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
+                <span v-else>{{ scope.row.value }}</span>
+                <span v-if="scope.row.range_type == 1">
+                  {{scope.row.value_direction}}
+                </span>
               </template>
             </el-table-column>
             <el-table-column

src/xt_pages/user/patients.vue

@@ -98,6 +98,9 @@
 
 
       <div style="display:flex;align-items:center">
+        <el-badge :value=value class="item">
+          <el-button size="small" type="primary" @click="toRemind">传染病检查提醒</el-button>
+        </el-badge>
         <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload" v-if="isShow"></upload-excel>
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
@@ -562,11 +565,45 @@
         </div>
       </div>
     </div>
+
+     <el-dialog title="传染病检查提醒通知" :visible.sync="dialogTableVisible">
+        <el-table :data="gridData">
+          <el-table-column property="date" align="center" label="姓名" width="150">
+            <template slot-scope="scope">{{scope.row.name}}</template>
+          </el-table-column>
+          <el-table-column property="name"  align="center" label="检查日期" width="200">
+             <template slot-scope="scope">
+                <span
+                  v-if="dateCompare(scope.row.infectious_next_record_time) == 1"
+                >{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
+                <span
+                  v-if="dateCompare(scope.row.infectious_next_record_time) == 2"
+                  style="color: red"
+                >{{ scope.row.infectious_next_record_time | parseTime('{y}-{m}-{d}')}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column property="address" align="center" label="操作">
+             <template slot-scope="scope">
+                <el-button size="mini" type="primary" @click="jump(scope.row.id)">查看</el-button>
+              </template>
+          </el-table-column>
+        </el-table>
+
+         <el-pagination
+            @size-change="handleSizeChangeOne"
+            @current-change="handleCurrentChangeOne"
+            :page-size="5"
+            background
+            style="margin-top:20px;float: right"
+            :total="value"
+          ></el-pagination>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind } from '@/api/patient'
   import { generateLog } from '@/api/config'
 
   import QRCode from 'qrcodejs2'
@@ -708,6 +745,12 @@
         startTime: '',
         export_date: [],
         lapeseto:"",
+        value:13,
+        dialogTableVisible:false,
+        gridData:[],
+        totalOne: 0,
+        page: 1,
+        limit: 5
       }
     },
     created() {
@@ -720,9 +763,12 @@
         this.listQuery.keywords = keyword
         this.searchKey = keyword
       }
+      //获取
+      this.GetRemindPatientList()
     },
 
     methods: {
+      beforeUpload(){},
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -1375,10 +1421,44 @@
             'healthcare_no:' +
             healthcareno
         })
-      }
-      //  components:{
-      //    pagiNation
-      //  }
+      },
+
+      toRemind(){
+        this.dialogTableVisible = true
+      },
+      GetRemindPatientList(){
+          const params = {
+             page: this.page,
+             limit: this.limit
+          }
+        GetRemind(params).then(response=>{
+           if(response.data.state == 1){
+             this.gridData = response.data.data.patients;
+             this.totalOne = response.data.data.total;
+             this.value = response.data.data.total
+           }
+        })
+      },
+
+      jump(id) {
+        this.$router.replace({ path: "/patients/inspection?id=" + id });
+      },
+      dateCompare(date) {
+        var date1 = Date.parse(new Date()) / 1000;
+        if (date > date1) {
+          return 1;
+        } else {
+          return 2;
+        }
+     },
+      handleSizeChangeOne(val) {
+        this.limit = val
+        this.GetRemindPatientList();
+      },
+      handleCurrentChangeOne(val) {
+        this.page = val;
+        this.GetRemindPatientList();
+      },
     }
   }
   Vue.prototype.$QRCode = function() {