1

src/xt_pages/dialysis/PatientBox.vue

@@ -48,18 +48,18 @@
           <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
         </div>
       </div>
-      <div class="function" :class="functionColor(schedule)">
+      <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>
           <li>
-            <span class="iconfont">&#xe6f5;</span>班次 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f5;</span>班次 :
             {{ timeTypeText(schedule) }}
           </li>
           <li>
-            <span class="iconfont">&#xe6de;</span>床位号 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6de;</span>床位号 :
             {{ schedule.device_number.number }}
           </li>
           <li>
-            <span class="iconfont">&#xe6f6;</span>透析模式 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f6;</span>透析模式 :
             {{
               schedule.mode_id &&
               $store.getters.treatment_mode[schedule.mode_id]
@@ -618,6 +618,15 @@ export default {
       
       let strDate = h  + ':' + m;
       return strDate;
+    },
+    modeColor (id) {
+      if (id == 1) {
+
+      } else if (id == 2) {
+        return 'modeRed'
+      } else if (id == 3) {
+        return 'modePurple'
+      }
     }
   },
 };
@@ -771,4 +780,10 @@ export default {
 .red {
   border: 1px #ff7979 solid;
 }
+#modeRed{
+  color:#ed5555;
+}
+#modePurple{
+  color: #53b86e;
+}
 </style>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -291,6 +291,7 @@
 
       </ul>
     </div>
+    <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>
   </div>
 </template>
 
@@ -321,6 +322,9 @@ export default {
     }
   },
   computed: {
+    note: function () {
+      return this.getValueStr('remark', 'remark')
+    },
     target_ultrafiltration: function() {
       var v = this.getValueStr(
         'target_ultrafiltration',

src/xt_pages/upload/fast/FastCountry.vue

@@ -1,27 +1,32 @@
 <template>
   <div class="patient-container">
-    <!-- <fast-patients-sidebar
-      :id="patientID"
-      v-on:patient="patientInfoClick()"
-      v-on:inspection="inspectionClick()"
-    ></fast-patients-sidebar> -->
-    <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
+    
     <el-container>
       <div style="width:170px">
-        <el-form :inline="true" :model="listQuery">
+        <el-form :inline="true" @submit.native.prevent>
           <el-form-item label style="margin-bottom:0;">
-            <el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>
+            <el-input v-model.trim="searchVal" @keyup.enter.native='onSearch' placeholder="姓名/透析号" style="width:70%"></el-input>
             <el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>
           </el-form-item>
         </el-form>
         <div style="width:170px">
           <div class="tableTitle">患者列表</div>
-          <el-table :data="tableData" border style="width: 100%;" height="500">
-            <el-table-column prop="date" label="日期" width="80"></el-table-column>
-            <el-table-column prop="name" label="姓名" width="90"></el-table-column>
+          <el-table :data="patientData" border style="width: 100%;" height="500" @row-click='handleSelect'>
+            <el-table-column prop="date" label="透析号" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.dialysis_no }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名" width="90" align="center"></el-table-column>
           </el-table>
         </div>
       </div>
+      <!-- <fast-patients-sidebar
+      :id="patientID"
+      v-on:patient="patientInfoClick()"
+      v-on:inspection="inspectionClick()"
+    ></fast-patients-sidebar> -->
+    <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
       
       <div style="margin-left:20px;flex:1;" >
         <div class="cell clearfix">
@@ -36,8 +41,8 @@
             </ul>
           </div>
         </div>
-        <one ref="one" v-if="wayType == 0" :patientID="patientID" :is-edit='true' style="margin-top:28px;" @></one>
-        <two ref="two" v-if="wayType == 1" :id="patientID" :is-edit="true" style="margin-top:28px;"></two>
+        <one ref="one" v-show="wayType == 0" :patientID="patientID" :is-edit='true' style="margin-top:28px;" @></one>
+        <two ref="two" v-show="wayType == 1 && patientID != 0" :id="patientID" :is-edit="true" style="margin-top:28px;"></two>
       </div>
     </el-container>
   </div>
@@ -68,62 +73,14 @@
           id: 0
         },
         isShow: 1,
-        tableData: [
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          }
-        ],
         searchVal:'',
         way: [
             { value: 0, label: "基本信息", state: 0 },
             { value: 1, label: "检验检查", state: 1 },
         ],
         wayType: 0,
+        patientsList:[],
+        patientData:[]
       }
     },
     created() {
@@ -144,6 +101,7 @@
         fetchAllList().then(response => {
           if (response.data.state == 1) {
             this.patientsList = response.data.data.patients
+            this.patientData = response.data.data.patients
             if (type == 1) {
               this.patientID = this.patientsList[0].id
 
@@ -233,6 +191,26 @@
         var monthEndDate = new Date(nowYear, myMonth + 1, 1)
         var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
         return days
+      },
+      handleSelect(val) {
+        this.$router.push("/upload/fast?id=" + val.id);
+      },
+      onSearch(){
+        if(this.searchVal != ''){
+          let arr = []
+          this.patientsList.map(item => {
+          
+            if(item.name.includes(this.searchVal)){
+              console.log('hhhh')
+              arr.push(item)
+            }
+          })
+          console.log(arr)
+          this.patientData = arr
+        }else if(this.searchVal == ''){
+          this.patientData = this.patientsList
+        }
+        
       }
 
     }

src/xt_pages/upload/fast/FastPatientsSidebar.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <div> -->
   <div class="patient-menu">
-    <!-- <el-autocomplete
+    <el-autocomplete
       style="margin:16px 5px"
       popper-class="my-autocomplete"
       v-model.trim="value"
@@ -29,7 +29,7 @@
       >
       </el-option>
     </el-select>
-    <el-tree
+    <!-- <el-tree
       :data="treeData"
       accordion
       node-key="name"

src/xt_pages/upload/fast/Two.vue

@@ -894,6 +894,9 @@ import { GetUploadInspections, GetInitInspections } from "@/api/inspection";
 export default {
   name: "Two",
   components: {},
+  props:{
+    id:Number
+  },
 
   data() {
     return {
@@ -976,6 +979,7 @@ export default {
     };
   },
   created() {
+    
     var start_time = new Date(
       this.getQuarterStartDate().replace(/-/g, "/")
     ).getTime();
@@ -1302,7 +1306,7 @@ export default {
     },
     xcgChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         1,
@@ -1311,7 +1315,7 @@ export default {
     },
     gkwzChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         2,
@@ -1320,7 +1324,7 @@ export default {
     },
     tdxChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         3,
@@ -1329,7 +1333,7 @@ export default {
     },
     shjcChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         4,
@@ -1338,7 +1342,7 @@ export default {
     },
     yyyyzChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         5,
@@ -1347,7 +1351,7 @@ export default {
     },
     crbxzbChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         6,
@@ -1356,7 +1360,7 @@ export default {
     },
     jhChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         7,
@@ -1424,6 +1428,12 @@ export default {
       var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24);
       return days;
     }
+  },
+  watch:{
+    id(newVal, oldVal){//对引用类型的值无效
+      console.info('value changed 1', newVal)
+      this.patient_id = newVal
+    },
   }
 };
 </script>

src/xt_pages/upload/fast_upload.vue

@@ -6,10 +6,10 @@
     <div class="app-container">
       <div class="service-box">
         <el-tabs v-model="activeName">
-          <!-- <el-tab-pane label="国家质控平台" name="first">
+          <el-tab-pane label="国家质控平台" name="first">
            <fast-country></fast-country>
-          </el-tab-pane> -->
-          <el-tab-pane label="省级质控平台" name="first">
+          </el-tab-pane>
+          <el-tab-pane label="省级质控平台">
             <fast-province></fast-province>
           </el-tab-pane>
           <el-tab-pane label="市级质控平台">