Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -6,8 +6,9 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/sit.env.js

@@ -2,10 +2,9 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
-
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
-  CDM_HOST: '"http://cdm.test.sgjyun.com"',
-}
+  CDM_HOST: '"http://cdm.test.sgjyun.com"'
+};

src/api/advice.js

@@ -14,58 +14,65 @@ export function getAllAdviceConfig() {
   })
 }
 
-export function CreateDoctorAdvice(id, advice,mode) {
+export function CreateDoctorAdvice(id, advice, mode) {
   return request({
-    url: '/api/patients/advice/create?id=' + id+"&mode="+mode,
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
     method: 'post',
     data: advice,
-    headers:{"Permission":3},
+    headers: {
+      'Permission': 3
+    }
 
   })
 }
 
-export function EditDoctorAdvice(patient, id, advice,mode) {
+export function EditDoctorAdvice(patient, id, advice, mode) {
   return request({
-    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient+"&mode="+mode,
+    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient + '&mode=' + mode,
     method: 'Put',
     data: advice,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-export function ExecDoctorAdvice(patient, id, time,mode) {
+export function ExecDoctorAdvice(patient, id, time, mode) {
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
-    mode:mode
+    mode: mode
   }
   return request({
     url: '/api/patients/advice/exec',
     method: 'Post',
     params: params,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
-export function CheckDoctorAdvice(patient, id,mode) {
+export function CheckDoctorAdvice(patient, id, mode) {
   var params = {
     id: id,
     patient: patient,
-    mode:mode
+    mode: mode
     // execution_time: time,
   }
   return request({
     url: '/api/patients/advice/check',
     method: 'Post',
     params: params,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
 export function getDoctorAdviceList(params) {
   return request({
     url: '/api/patients/advices',
@@ -84,23 +91,25 @@ export function getDoctorAdviceList(params) {
 //   })
 // }
 
-export function StopGroupAdvice(groupno, reason,mode) {
+export function StopGroupAdvice(groupno, reason, mode) {
   return request({
-    url: '/api/patients/advice/stopgroup?groupno=' + groupno+"&mode="+mode,
+    url: '/api/patients/advice/stopgroup?groupno=' + groupno + '&mode=' + mode,
     method: 'Post',
     data: reason,
-    headers:{"Permission":3},
+    headers: {
+      'Permission': 3
+    }
 
   })
 }
 
-
-
-export function DeleteDoctorAdvice(id,mode) {
+export function DeleteDoctorAdvice(id, mode) {
   return request({
-    url: '/api/patients/advice/delete?id=' + id+"&mode="+mode,
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
     method: 'Delete',
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
@@ -199,30 +208,36 @@ export function postAdviceTemplate(params, name, advice_type) {
   })
 }
 
-export function CreateGroupAdvice(id, groupno, advices,mode) {
+export function CreateGroupAdvice(id, groupno, advices, mode) {
   if (advices.remind > 0) {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno + '&mode=' + mode,
       method: 'post',
       data: advices,
-      headers:{"Permission":2},
+      headers: {
+        'Permission': 2
+      }
 
     })
   } else {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno + '&mode=' + mode,
       method: 'post',
       data: advices,
-      headers:{"Permission":2},
+      headers: {
+        'Permission': 2
+      }
 
     })
   }
 }
-export function DeleteGroupAdvice(groupno,mode) {
+export function DeleteGroupAdvice(groupno, mode) {
   return request({
-    url: '/api/patients/advice/deletegroup?groupno=' + groupno+"&mode="+mode,
+    url: '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
     method: 'delete',
-    headers:{"Permission":3},
+    headers: {
+      'Permission': 3
+    }
 
   })
 }
@@ -305,114 +320,120 @@ export function getPrintInfo(data) {
   })
 }
 
-
-
-
-
-export function EditNewDoctorAdvice(patient, id, advice,mode) {
+export function EditNewDoctorAdvice(patient, id, advice, mode) {
   return request({
-    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient+"&mode="+mode,
+    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient + '&mode=' + mode,
     method: 'Put',
     data: advice,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
-
-
-
-export function CreateNewDoctorAdvice(id, advice,mode) {
+export function CreateNewDoctorAdvice(id, advice, mode) {
   return request({
-    url: '/api/patients/advice/create?id=' + id+"&mode="+mode,
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
     method: 'post',
     data: advice,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
-
-export function CreateNewGroupAdvice(id, groupno, advices,mode) {
+export function CreateNewGroupAdvice(id, groupno, advices, mode) {
   if (advices.remind > 0) {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno + '&mode=' + mode,
       method: 'post',
       data: advices,
-      headers:{"Permission":3},
+      headers: {
+        'Permission': 3
+      }
 
     })
   } else {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno + '&mode=' + mode,
       method: 'post',
       data: advices,
-      headers:{"Permission":3},
+      headers: {
+        'Permission': 3
+      }
 
     })
   }
 }
 
-
-
-export function DeleteNewDoctorAdvice(id,mode) {
+export function DeleteNewDoctorAdvice(id, mode) {
   return request({
-    url: '/api/patients/advice/delete?id=' + id+"&mode="+mode,
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
     method: 'Delete',
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
-
-export function DeleteNewGroupAdvice(groupno,mode) {
+export function DeleteNewGroupAdvice(groupno, mode) {
   return request({
-    url: '/api/patients/advice/deletegroup?groupno=' + groupno+"&mode="+mode,
+    url: '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
     method: 'delete',
-    headers:{"Permission":3},
+    headers: {
+      'Permission': 3
+    }
 
   })
 }
 
-
-
-export function StopDoctorAdvice(id, reason,mode) {
+export function StopDoctorAdvice(id, reason, mode) {
   return request({
-    url: '/api/patients/advice/stop?id=' + id+"&mode="+mode,
+    url: '/api/patients/advice/stop?id=' + id + '&mode=' + mode,
     method: 'Post',
     data: reason,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
-
-
-export function ExecGroupAdvice(groupno, time,mode) {
+export function ExecGroupAdvice(groupno, time, mode) {
   return request({
-    url: '/api/patients/advice/execgroup?groupno=' + groupno + '&execution_time=' + time+"&mode="+mode,
+    url: '/api/patients/advice/execgroup?groupno=' + groupno + '&execution_time=' + time + '&mode=' + mode,
     method: 'Post',
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
-
-export function CheckGroupAdvice(groupno,mode) {
+export function CheckGroupAdvice(groupno, mode) {
   var params = {
     groupno: groupno,
-    mode: mode,
+    mode: mode
   }
   return request({
     url: '/api/patients/advice/checkgroup',
     method: 'Post',
     params: params,
-    headers:{"Permission":2},
+    headers: {
+      'Permission': 2
+    }
 
   })
 }
 
+export function getPatientSchedules(id, params) {
+  console.log('id----', id)
+  return request({
+    url: '/api/patients/advices/getpatientschedules?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/api/manage.js

@@ -506,7 +506,6 @@ export function UpdateMacheineTwo(data) {
 }
 
 export function getBedForm(id, params) {
-  console.log('设备-id', id)
   return request({
     url: '/api/manage/getbedform?id=' + id,
     method: 'get',

src/xt_pages/data/prescription.vue

@@ -913,6 +913,7 @@ export default {
     },
     changeThisAnticoagulant() {
       var thismode = parseInt(this.addPlan.anticoagulant);
+      console.log("------", thismode);
       if (isNaN(thismode) || thismode <= 0) {
         return false;
       }
@@ -976,6 +977,7 @@ export default {
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set;
     this.replacementWays = this.$store.getters.replacement_ways;
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
+
     this.blood_filters = this.$store.getters.blood_filters;
     this.dialysate_formulation = this.$store.getters.dialysate_formulation;
     this.body_fluid_option = this.$store.getters.body_fluid;

src/xt_pages/data/printTemplate.vue

@@ -222,8 +222,9 @@ export default {
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
               // 同步
+              console.log(response.data.data.fileds)
               this.loading = false;
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/device/zone_main.vue

@@ -219,7 +219,7 @@ export default {
                 this.zones.push(newZone);
                 this.cancelModifyZone();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("分区名称已存在!");
               }
             });
           } else {
@@ -240,7 +240,7 @@ export default {
                 }
                 this.cancelModifyZone();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("分区名称已存在!");
               }
             });
           }

src/xt_pages/dialysis/PatientBox.vue

@@ -1,34 +1,67 @@
 <template>
-<div>
-  <!-- <router-link to="/dialysis/details"> -->
-    <div class="patient" v-for="schedule in schedules" v-if="schedule.patient" :class="borderColor(schedule)"  @click="detailAction(schedule)" :key="schedule.id">
-        <div class="kehu" >
-          <div class="tx">
-            <img :src="schedule.patient.avatar.length > 0 ? schedule.patient.avatar : '../../assets/home/analyze.png'" alt="">
-            <div class="right">
-               <h3 class="name">{{schedule.patient.name}}<span class="yc" v-show="isAbnormal(schedule)">异常</span></h3>
-               <span class="num">{{ genderText(schedule) }} | {{ age(schedule) }} 岁</span>
-            </div>
-          </div>
-          <div class="online" v-show="computeState(schedule) != 4" >
-            <p :class="stateColor(schedule)">{{stateText(schedule)}}</p>
+  <div>
+    <!-- <router-link to="/dialysis/details"> -->
+    <div
+      class="patient"
+      v-for="schedule in schedules"
+      v-if="schedule.patient"
+      :class="borderColor(schedule)"
+      @click="detailAction(schedule)"
+      :key="schedule.id"
+    >
+      <div class="kehu">
+        <div class="tx">
+          <img
+            :src="
+              schedule.patient.avatar.length > 0
+                ? schedule.patient.avatar
+                : '../../assets/home/analyze.png'
+            "
+            alt=""
+          />
+          <div class="right">
+            <h3 class="name">
+              {{ schedule.patient.name
+              }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
+            </h3>
+            <span class="num"
+              >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
+            >
           </div>
         </div>
-      <div class="function" :class="functionColor(schedule)" >
+        <div class="online" v-show="computeState(schedule) != 4">
+          <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
+        </div>
+      </div>
+      <div class="function" :class="functionColor(schedule)">
         <ul>
-          <li><span class="iconfont">&#xe6f5;</span>班次 : {{timeTypeText(schedule)}}</li>
-          <li><span class="iconfont">&#xe6de;</span>床位号 : {{schedule.device_number.number}}</li>
-          <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{schedule.mode_id&&$store.getters.treatment_mode[schedule.mode_id]?$store.getters.treatment_mode[schedule.mode_id].name:''}}</li>
+          <li>
+            <span class="iconfont">&#xe6f5;</span>班次 :
+            {{ timeTypeText(schedule) }}
+          </li>
+          <li>
+            <span class="iconfont">&#xe6de;</span>床位号 :
+            {{ schedule.device_number.number }}
+          </li>
+          <li>
+            <span class="iconfont">&#xe6f6;</span>透析模式 :
+            {{
+              schedule.mode_id &&
+              $store.getters.treatment_mode[schedule.mode_id]
+                ? $store.getters.treatment_mode[schedule.mode_id].name
+                : ""
+            }}
+          </li>
         </ul>
       </div>
     </div>
     <!-- </router-link> -->
-</div>
+  </div>
 </template>
 
 <script>
-import { parseTime } from "@/utils"
-import { jsGetAge } from '@/utils/tools'
+import { parseTime } from "@/utils";
+import { jsGetAge } from "@/utils/tools";
 
 export default {
   name: "PatientBox",
@@ -68,7 +101,7 @@ export default {
   },
   props: {
     schedules: {
-      type: Array,
+      type: Array
     }
   },
   methods: {
@@ -116,54 +149,71 @@ export default {
       }
     },
     computeState: function(schedual) {
-      if (schedual.dialysis_order == null) { // 未上机
-        return 4
-      } else if (schedual.dialysis_order.stage == 2) { // 已下机
-        return 2
-      } else if (schedual.dialysis_order.stage == 1 && schedual.monitoring_records != null && schedual.monitoring_records.length > 1) { // 监测中
-        return 3
+      if (schedual.dialysis_order == null) {
+        // 未上机
+        return 4;
+      } else if (schedual.dialysis_order.stage == 2) {
+        // 已下机
+        return 2;
+      } else if (
+        schedual.dialysis_order.stage == 1 &&
+        schedual.monitoring_records != null &&
+        schedual.monitoring_records.length > 1
+      ) {
+        // 监测中
+        return 3;
       } else {
-        return 1
+        return 1;
       }
     },
 
     orderState: function(schedual) {
-      if (schedual.dialysis_order == null) { // 未上机
-        return 4
-      } else if (schedual.dialysis_order.stage == 2) { // 已下机
-        return 2
-      } else if (schedual.dialysis_order.stage == 1 && schedual.monitoring_records != null && schedual.monitoring_records.length > 1) { // 监测中
-        return 3
+      if (schedual.dialysis_order == null) {
+        // 未上机
+        return 4;
+      } else if (schedual.dialysis_order.stage == 2) {
+        // 已下机
+        return 2;
+      } else if (
+        schedual.dialysis_order.stage == 1 &&
+        schedual.monitoring_records != null &&
+        schedual.monitoring_records.length > 1
+      ) {
+        // 监测中
+        return 3;
       } else {
-        return 1
+        return 1;
       }
     },
     isAbnormal: function(schedual) {
-      return false // schedual.yc;
+      return false; // schedual.yc;
     },
     timeTypeText: function(schedual) {
       if (schedual.schedule_type == 1) {
-        return "上午"
+        return "上午";
       } else if (schedual.schedule_type == 2) {
-        return "下午"
+        return "下午";
       } else {
-        return "晚上"
+        return "晚上";
       }
     },
     genderText: function(schedual) {
       if (schedual.patient.gender == 0) {
-        return "未知"
+        return "未知";
       } else if (schedual.patient.gender == 1) {
-        return "男"
+        return "男";
       } else {
-        return "女"
+        return "女";
       }
     },
     age: function(schedual) {
-      if (schedual.patient.birthday == 0){
-        return ''
-      }else{
-        return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
+      if (schedual.patient.birthday == 0) {
+        return "";
+      } else {
+        return jsGetAge(
+          parseTime(schedual.patient.birthday, "{y}-{m}-{d}"),
+          "-"
+        );
       }
 
       // var now = new Date()
@@ -173,10 +223,35 @@ export default {
       // // console.log(birthdayYear)
       // return nowYear - birthdayYear
     },
+    getAge: function(val) {
+      var thisLen = val.patient.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.patient.id_card_no.substr(6, 6);
+      } else {
+        birth = val.patient.id_card_no.substr(6, 8);
+      }
+      var birthtwo =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+
+      var age = jsGetAge(birthtwo, "-");
+      return age;
+    },
     detailAction: function(schedual) {
-      var patient_id = schedual.patient_id
-      var date = schedual.schedule_date
-      this.$router.push({ path: "/dialysis/details", query: {patient_id: patient_id, date: date, patient_name: schedual.patient.name}})
+      var patient_id = schedual.patient_id;
+      var date = schedual.schedule_date;
+      this.$router.push({
+        path: "/dialysis/details",
+        query: {
+          patient_id: patient_id,
+          date: date,
+          patient_name: schedual.patient.name
+        }
+      });
     }
   }
 };
@@ -187,8 +262,8 @@ export default {
   border: 1px #e5e5ee solid;
   padding: 9px 0;
   margin: 0 15px 15px 0;
-    float: left;
-    width: 360px;
+  float: left;
+  width: 360px;
   cursor: pointer;
   .function {
     padding: 15px 5px 0 5px;
@@ -255,7 +330,7 @@ export default {
           }
         }
         .num {
-          font-size:13px;
+          font-size: 13px;
           color: #7b8a97;
         }
       }
@@ -268,7 +343,7 @@ export default {
       p {
         background: #c6cdd2;
         color: #fff;
-        width:65px;
+        width: 65px;
         height: 24px;
         line-height: 24px;
         border-radius: 4px;
@@ -301,5 +376,3 @@ export default {
   border: 1px #ff7979 solid;
 }
 </style>
-
-

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -674,64 +674,66 @@ export default {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
           submitForm.adviceNames = adviceNames;
-          let mode = "1"
+          let mode = "1";
 
-          CreateGroupAdvice(this.patientID, 0, submitForm,mode).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
-                duration: 2000
-              });
+          CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
+            response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$notify({
+                  title: "成功",
+                  message: "新增成功",
+                  type: "success",
+                  duration: 2000
+                });
 
-              var childMap = {};
-              for (const index in response.data.data.advices) {
-                if (response.data.data.advices[index].parent_id == 0) {
-                  continue;
-                }
-                if (
-                  response.data.data.advices[index].parent_id in childMap ===
-                  false
-                ) {
-                  childMap[response.data.data.advices[index].parent_id] = [];
+                var childMap = {};
+                for (const index in response.data.data.advices) {
+                  if (response.data.data.advices[index].parent_id == 0) {
+                    continue;
+                  }
+                  if (
+                    response.data.data.advices[index].parent_id in childMap ===
+                    false
+                  ) {
+                    childMap[response.data.data.advices[index].parent_id] = [];
+                  }
+                  childMap[response.data.data.advices[index].parent_id].unshift(
+                    response.data.data.advices[index]
+                  );
                 }
-                childMap[response.data.data.advices[index].parent_id].unshift(
-                  response.data.data.advices[index]
-                );
-              }
-              var parentArr = [];
-              for (const index in response.data.data.advices) {
-                if (response.data.data.advices[index].parent_id > 0) {
-                  continue;
+                var parentArr = [];
+                for (const index in response.data.data.advices) {
+                  if (response.data.data.advices[index].parent_id > 0) {
+                    continue;
+                  }
+                  parentArr.push(response.data.data.advices[index]);
                 }
-                parentArr.push(response.data.data.advices[index]);
-              }
 
-              for (const index in parentArr) {
-                if (parentArr[index].id in childMap) {
-                  for (const j in childMap[parentArr[index].id]) {
-                    this.adviceTableData.unshift(
-                      childMap[parentArr[index].id][j]
-                    );
+                for (const index in parentArr) {
+                  if (parentArr[index].id in childMap) {
+                    for (const j in childMap[parentArr[index].id]) {
+                      this.adviceTableData.unshift(
+                        childMap[parentArr[index].id][j]
+                      );
+                    }
                   }
+                  this.adviceTableData.unshift(parentArr[index]);
                 }
-                this.adviceTableData.unshift(parentArr[index]);
-              }
 
-              // var alen = response.data.data.advices.length
-              // for (let index = alen-1; index >=0; index--) {
-              //   this.adviceTableData.unshift(response.data.data.advices[index]);
-              // }
+                // var alen = response.data.data.advices.length
+                // for (let index = alen-1; index >=0; index--) {
+                //   this.adviceTableData.unshift(response.data.data.advices[index]);
+                // }
 
-              this.resetForm(formName);
-              this.groupAddFormVisible = false;
-              return false;
+                this.resetForm(formName);
+                this.groupAddFormVisible = false;
+                return false;
+              }
             }
-          });
+          );
         }
       });
     },

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

@@ -236,15 +236,15 @@
           <el-table-column
             prop="displacement_quantity"
             align="center"
-            label="SpO₂(%)"
+            label="置换量(L)"
             width="100"
-            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
+            v-if="isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
-                scope.row.blood_oxygen_saturation
-                  ? scope.row.blood_oxygen_saturation
-                  : ""
+              scope.row.displacement_quantity
+              ? scope.row.displacement_quantity
+              : ""
               }}
             </template>
           </el-table-column>
@@ -252,18 +252,20 @@
           <el-table-column
             prop="displacement_quantity"
             align="center"
-            label="置换量(L)"
+            label="SpO₂(%)"
             width="100"
-            v-if="isShow('置换量') && template_id != 6 && template_id != 10 || template_id != 11"
+            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
-                scope.row.displacement_quantity
-                  ? scope.row.displacement_quantity
+                scope.row.blood_oxygen_saturation
+                  ? scope.row.blood_oxygen_saturation
                   : ""
               }}
             </template>
           </el-table-column>
+
+
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
@@ -290,6 +292,14 @@
               }}
             </template>
           </el-table-column>
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="肝素用量余量(ml)"
+            width="140"
+            v-if="isShow('肝素用量余量')"
+          >
+          </el-table-column>
           <el-table-column
             prop="symptom"
             align="center"
@@ -471,7 +481,7 @@
 
 
           <el-col :span="8" v-if="isShow('肝素用量余量')">
-            <el-form-item label="肝素用量余量(ml)：">
+            <el-form-item label="肝素用量余量(ml):">
               <el-input v-model="form.heparin"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2227,6 +2227,7 @@ export default {
         );
         this.afterdialysis = response.data.data.AssessmentAfterDislysis;
         this.operators = response.data.data.operators;
+        console.log("operators", this.operators);
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null

src/xt_pages/management/components/RepairForm.vue

@@ -511,7 +511,7 @@ export default {
       getAllRepair(this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
-          // console.log('repair是', repair)
+          console.log("repair是", repair);
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
           this.total = total;
@@ -737,6 +737,41 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
+          for (let index = 0; index < repair.length; index++) {
+            if (repair[index].failure_stage === 0) {
+              repair[index].failure_stage = "";
+            }
+
+            if (repair[index].failure_stage === 1) {
+              repair[index].failure_stage = "开机启动";
+            }
+            if (repair[index].failure_stage === 2) {
+              repair[index].failure_stage = "自检";
+            }
+            if (repair[index].failure_stage === 3) {
+              repair[index].failure_stage = "准备";
+            }
+            if (repair[index].failure_stage === 4) {
+              repair[index].failure_stage = "治疗";
+            }
+            if (repair[index].failure_stage === 5) {
+              repair[index].failure_stage = "消毒";
+            }
+
+            if (repair[index].exclude === 0) {
+              repair[index].exclude = "";
+            }
+
+            if (repair[index].exclude === 1) {
+              repair[index].exclude = "是";
+            }
+            if (repair[index].exclude === 2) {
+              repair[index].exclude = "待观察";
+            }
+            if (repair[index].exclude === 3) {
+              repair[index].exclude = "未解决";
+            }
+          }
           this.tableData = repair;
         }
       });

src/xt_pages/management/components/UserForm.vue

@@ -1173,7 +1173,7 @@ export default {
             zone.push({ id: item.id, name: item.name });
           }
           this.zones = zone;
-          //  console.log('zones', zones)
+          //console.log("zones", zones);
           var numbers = response.data.data.numbers;
           var number = [{ id: 0, number: "全部" }];
           for (let index = 0; index < numbers.length; index++) {
@@ -1466,7 +1466,7 @@ export default {
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           var device = response.data.data.device;
-          console.log("device", device);
+          //console.log("device", device);
           var patients = response.data.data.patients;
           // console.log('patients', patients)
           // eslint-disable-next-line no-sequences
@@ -1477,21 +1477,14 @@ export default {
             ));
           this.userform.patient_id = device.patient_id;
           this.userform.classtype = device.class;
-          this.userform.zone = device.zone_id;
+          this.userform.zone = device.zone;
           this.userform.bed_number = device.bed_number;
           this.userform.contagion = device.contagion;
           this.userform.patient_name = patients.name;
           this.userform.dialysis_mode = device.dialysis_mode;
-          // this.userform.start_time = uParseTime(
-          // device.start_time,
-          //  '{y}-{m}-{d} {h}:{i}'
-          // )
+
           this.userform.start_time = this.updateTimes(device.start_time);
           this.userform.end_time = this.updateTimes(device.end_time);
-          // this.userform.end_time = uParseTime(
-          // device.end_time,
-          // '{y}-{m}-{d} {h}:{i}'
-          // )
 
           this.userform.dialysis_hour = device.dialysis_hour;
           this.userform.hyperfiltratio = device.hyperfiltratio;
@@ -1641,11 +1634,7 @@ export default {
       if (this.userform.clean === false) {
         this.userform.clean = 2;
       }
-      // this.userform.start_time = this.getTimes(this.userform.start_time)
-      // this.userform.end_time = this.getTimes(this.userform.end_time)
-      // this.userform.starttime = this.getTimes(this.userform.starttime)
-      // this.userform.endtime = this.getTimes(this.userform.endtime)
-      // eslint-disable-next-line eqeqeq
+
       if (this.userform.start_time == "") {
         this.userform.start_time = "0";
       }
@@ -1669,6 +1658,14 @@ export default {
       var statu = parseInt(status);
       this.userform.disinfection = statu;
 
+      var hyperfiltratio = this.userform.hyperfiltratio;
+      var hyperfiltratios = parseFloat(hyperfiltratio);
+      this.userform.hyperfiltratio = hyperfiltratios;
+
+      var weightloss = this.userform.weight_loss;
+      var weidht = parseFloat(weightloss);
+      this.userform.weight_loss = weidht;
+
       this.$refs[formName].validate(valid => {
         if (valid) {
           UpdateForm(this.userform).then(response => {
@@ -1694,7 +1691,7 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.infor;
-          console.log("information", information);
+          // console.log("information", information);
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 0) {
               information[index].class = "";
@@ -1982,7 +1979,7 @@ export default {
       getUserForm(id, this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information;
-          console.log("数据是-------", information);
+          //console.log("数据是-------", information);
           // eslint-disable-next-line no-unused-vars
           var addmacher = response.data.data.addmacher;
           // console.log('addmacher', addmacher)

src/xt_pages/management/home.vue

@@ -3797,14 +3797,14 @@ export default {
           this.userform.hyperfiltratio = 0
         }
         var hyperfiltratio = this.userform.hyperfiltratio
-        var hyperfiltratios = parseInt(hyperfiltratio)
+       var hyperfiltratios = parseFloat(hyperfiltratio)
         this.userform.hyperfiltratio = hyperfiltratios
 
         if (this.userform.weight_loss === '') {
           this.userform.weight_loss = 0
         }
         var weightloss = this.userform.weight_loss
-        var weidht = parseInt(weightloss)
+        var weidht = parseFloat(weightloss)
         this.userform.weight_loss = weidht
 
         if (this.userform.user_total === '0') {

src/xt_pages/role/components/PermissionSettings.vue

@@ -172,13 +172,22 @@
           })
         }
         var idsStr = ''
-        if (ids.length > 0) {
-          idsStr = ids.join(',')
-        }
 
         var funcIdsStr = ''
         if (func_ids.length > 0) {
           funcIdsStr = func_ids.join(',')
+          ids.push(49)
+        }
+
+        //去重复
+        const obj5 = {}
+        ids = ids.reduce((cur, next) => {
+          obj5[next] ? '' : obj5[next] = true && cur.push(next)
+          return cur
+        }, [])
+
+        if (ids.length > 0) {
+          idsStr = ids.join(',')
         }
         this.submitLoading = true
         editPurview(this.role_id, idsStr, funcIdsStr).then(rs => {

src/xt_pages/user/components/PatientDetail.vue

@@ -391,6 +391,11 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
+        <el-col :span="6" >
+          <el-form-item label="系统前透析次数 : " prop="first_dialysis_hospital">
+            <el-input v-model="form.user_sys_before_count" disabled></el-input>
+          </el-form-item>
+        </el-col>
       <el-col :span="6">
         <el-form-item label="首次诊治日期 : "  >
             <el-date-picker v-model="form.first_treatment_date" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
@@ -812,6 +817,8 @@ export default {
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result
             this.form.remind_cycle = patietInfo.remind_cycle
+            this.form.user_sys_before_count = patietInfo.user_sys_before_count
+
             this.infections = response.data.data.infections
             this.form.formItem = this.infections
             if (this.infections != null) {

src/xt_pages/user/components/PatientForm.vue

@@ -587,6 +587,14 @@
               </el-form-item>
             </el-col>
 
+
+            <el-col :span="6" :style="isEdit?'width:360px':''">
+                <el-form-item label="系统前透析次数 : " prop="user_sys_before_count">
+                  <el-input v-model="form.user_sys_before_count"></el-input>
+              </el-form-item>
+            </el-col>
+
+
             <el-col :span="6" :style="isEdit?'width:360px':''">
               <el-form-item label="首次诊治时间 : ">
                 <el-date-picker
@@ -747,6 +755,7 @@ const defaultForm = {
   dialysis_age: "",
   expense_kind: "",
   contact_name: "",
+  user_sys_before_count:"",
 
   formItem: [
     {
@@ -1220,7 +1229,6 @@ export default {
                   this.$refs[formName].resetFields();
                   this.$store.dispatch("SetSubscibePatients");
                   var sub = this.$store.getters.xt_user.subscibe;
-                  console.log(sub);
                   if (action !== "renew") {
                     this.$router.back(-1);
                   }
@@ -1387,6 +1395,8 @@ export default {
             this.form.homeAddress = patietInfo.home_address;
             this.form.work = patietInfo.work_unit;
             this.form.unit_address = patietInfo.unit_address;
+            this.form.user_sys_before_count = patietInfo.user_sys_before_count;
+
 
             if (patietInfo.profession > 0) {
               this.form.profession = patietInfo.profession;

src/xt_pages/user/patient.vue

@@ -15,7 +15,7 @@
 	    <label class="title"><span class="name">日期查询</span> : </label>
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
        <span class="cellLine"> - </span>
-       <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
+       <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
     <div class="cell clearfix">
 	    <label class="title"><span class="name">排班班次</span> : </label>
@@ -95,9 +95,9 @@
         </el-table-column> -->
         <el-table-column align="center" label="全选" width="60px" type="selection" ></el-table-column>
         <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
-        <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>         
+        <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
-        <el-table-column property="name" label="姓名" min-width="80" align="center"> 
+        <el-table-column property="name" label="姓名" min-width="80" align="center">
           <template slot-scope="scope" >
             <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff" >{{scope.row.name}}</router-link>
           </template>
@@ -116,7 +116,11 @@
             <span v-else>未知</span>
           </template>
         </el-table-column>
-        <el-table-column property="total_dialysis" label="透析次数" min-width="94" align="center"> </el-table-column>
+        <el-table-column property="total_dialysis" label="透析次数" min-width="94" align="center">
+          <template slot-scope="scope" >
+            <span>{{getCount(scope.row)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="150" label="二维码" align="center">
           <template slot-scope="scope"  type="text">
             <a style="color:#409eff"  v-if="scope.row.binding_state==1" @click="openWechatBindDialog">已绑定</a>
@@ -129,9 +133,9 @@
         </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- <pagi-nation title="分页"></pagi-nation> -->
-      
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -143,7 +147,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-      
+
 
       <el-dialog
       title="微信绑定"
@@ -157,8 +161,8 @@
       </span>
     </el-dialog>
 
-    </div> 
-    
+    </div>
+
 </template>
 
 
@@ -282,6 +286,10 @@ export default {
     this.reimbursement_ways = this.$store.getters.reimbursement_ways;
   },
   methods: {
+    getCount(row){
+      console.log(row)
+      return row.total_dialysis + row.user_sys_before_count
+    },
     openWechatBindDialog(){
       this.bindWechatDialog = true;
     },
@@ -320,7 +328,7 @@ export default {
       this.sourceID = sourceID;
       this.lapsetoType = lapseto;
       this.listQuery.source = sourceID;
-      this.listQuery.lapseto = lapseto; 
+      this.listQuery.lapseto = lapseto;
       this.getList();
     },
     changeTime(){
@@ -345,7 +353,7 @@ export default {
         }
       });
     },
-    
+
   //  components:{
   //    pagiNation
   //  }

src/xt_pages/user/patients.vue

@@ -265,11 +265,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          property="total_dialysis"
           label="透析次数"
           min-width="94"
           align="center"
         >
+          <template slot-scope="scope" >
+            <span>{{getCount(scope.row)}}</span>
+          </template>
         </el-table-column>
         <!-- <el-table-column min-width="150" label="二维码" align="center">
         <template slot-scope="scope"  type="text">
@@ -574,6 +576,10 @@ export default {
   },
 
   methods: {
+    getCount(row){
+      console.log(row)
+      return row.total_dialysis + row.user_sys_before_count
+    },
     EditLapseto() {
       if (this.lapsetoForm.lapseto_time == "") {
         this.$message.error("请选择时间");

src/xt_pages/workforce/components/tableWeeks.vue

@@ -38,7 +38,7 @@
     >
       <el-table-column label="姓名" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.patient}}
+          {{ scope.row.patient }}
         </template>
       </el-table-column>
       <el-table-column label="分区" min-width="70" align="center">
@@ -58,7 +58,11 @@
       </el-table-column>
       <el-table-column label="透析模式" min-width="100" align="center">
         <template slot-scope="scope">
-          {{scope.row.mode_id && modeOptions[scope.row.mode_id] ? modeOptions[scope.row.mode_id].name:'' }}
+          {{
+            scope.row.mode_id && modeOptions[scope.row.mode_id]
+              ? modeOptions[scope.row.mode_id].name
+              : ""
+          }}
         </template>
       </el-table-column>
       <el-table-column label="透析器" min-width="100" align="center">
@@ -68,26 +72,72 @@
       </el-table-column>
       <el-table-column label="抗凝剂" min-width="100" align="center">
         <template slot-scope="scope">
-          {{
-            scope.row.prescription.anticoagulant
-              ? anticoagulants_confit[scope.row.prescription.anticoagulant].name
-              : ""
-          }}
+          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 2"
+            >普通肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 3"
+            >低分子肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 4"
+            >阿加曲班</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 5"
+            >枸橼酸钠</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 6"
+            >低分子肝素钙</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 7"
+            >低分子肝素钠</span
+          >
         </template>
       </el-table-column>
       <el-table-column label="总量" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant == 1">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 2">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'iu':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 3">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'iu':''}}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 4">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
-
+          <span v-if="scope.row.prescription.anticoagulant == 1">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 4">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 5">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 6">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 7">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="长期医嘱" min-width="440" align="center">
         <template slot-scope="scope">
-           <span style="white-space: pre">{{getAdvice(scope.row.doctor_advice)}}</span>
+          <span style="white-space: pre">{{
+            getAdvice(scope.row.doctor_advice)
+          }}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -95,241 +145,268 @@
 </template>
 
 <script>
-  import { getSchedules, getScheduleWeekDay } from '@/api/schedule'
-  import WeekItem from './WeekItem'
+import { getSchedules, getScheduleWeekDay } from "@/api/schedule";
+import WeekItem from "./WeekItem";
 
-  export default {
-    name: 'tableWeeks',
-    props: {
-      weekTime: {
-        type: String,
-        default: 'thisWeek'
-      }
-    },
+export default {
+  name: "tableWeeks",
+  props: {
+    weekTime: {
+      type: String,
+      default: "thisWeek"
+    }
+  },
 
-    data() {
-      return {
-        weekArr: [
-          { id: 1, name: '周一' },
-          { id: 2, name: '周二' },
-          { id: 3, name: '周三' },
-          { id: 4, name: '周四' },
-          { id: 5, name: '周五' },
-          { id: 6, name: '周六' },
-          { id: 7, name: '周日' }
-        ],
-        anticoagulants_confit: null,
+  data() {
+    return {
+      weekArr: [
+        { id: 1, name: "周一" },
+        { id: 2, name: "周二" },
+        { id: 3, name: "周三" },
+        { id: 4, name: "周四" },
+        { id: 5, name: "周五" },
+        { id: 6, name: "周六" },
+        { id: 7, name: "周日" }
+      ],
+      anticoagulants_confit: null,
 
-        week_type: '1',
-        weekTitle: ['', '', '', '', '', '', ''],
-        weekData: {
-          Monday: [],
-          Tuesday: [],
-          Wednesday: [],
-          Thursday: [],
-          Friday: [],
-          Saturday: [],
-          Sunday: []
-        },
-        scheduleData: [],
-        modeOptions: null
+      week_type: "1",
+      weekTitle: ["", "", "", "", "", "", ""],
+      weekData: {
+        Monday: [],
+        Tuesday: [],
+        Wednesday: [],
+        Thursday: [],
+        Friday: [],
+        Saturday: [],
+        Sunday: []
+      },
+      scheduleData: [],
+      modeOptions: null
+    };
+  },
+  watch: {
+    weekTime: function() {
+      var theType = this.weekType(this.weekTime);
+      this.getSchedules(theType);
+    }
+  },
+
+  methods: {
+    printAction() {
+      this.$router.push({
+        path: "/schedule/remind/print?week_type=" + this.week_type
+      });
+    },
+    getScheduleWeekDay(weekType) {
+      getScheduleWeekDay(weekType).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          this.scheduleData = response.data.data.schdules;
+          //console.log("排班-----", this.scheduleData);
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
+    },
+
+    // getSchedules(weekType) {
+    //   getSchedules(weekType).then(response => {
+    //     this.scheduleData = []
+    //     if (response.data.state == 1) {
+    //       this.weekTitle = response.data.data.weekTitle
+    //       var theSchedules = response.data.data.schdules
+    //       var that = this
+    //       theSchedules.forEach(function(schedule) {
+    //         schedule['mode_name'] = typeof (that.modeOptions[schedule.mode_id]) == 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
+    //         var weekPath = that.weekPath(schedule.schedule_week)
+    //         if (weekPath.length > 0) {
+    //           that.weekData[weekPath].push(schedule)
+    //         }
+    //       })
+    //       var rowNum = 0
+    //       console.log(that.weekData)
+    //       for (var index in that.weekData) {
+    //         var thisLen = that.weekData[index].length
+    //         rowNum = rowNum >= thisLen ? rowNum : thisLen
+    //       }
+    //       console.log(rowNum)
+    //       for (let index = 0; index < rowNum; index++) {
+    //         var dataItem = {}
+    //         for (var weekIndex in that.weekData) {
+    //           var weekItem = that.weekData[weekIndex].shift()
+    //           console.log('weekItem', weekItem)
+    //           if (typeof (weekItem) != 'undefined') {
+    //             dataItem[weekIndex] = weekItem
+    //           }
+    //         }
+    //         that.scheduleData.push(dataItem)
+    //       }
+    //
+    //       console.log(that.scheduleData)
+    //
+    //     } else {
+    //       this.$message.error('网络错误')
+    //       return false
+    //     }
+    //   })
+    // },
+    weekType(weekTime) {
+      var theType = 2;
+      switch (weekTime) {
+        case "lastWeek":
+          theType = 1;
+          break;
+        case "thisWeek":
+          theType = 2;
+          break;
+        case "nextWeek":
+          theType = 3;
+          break;
+        case "nextTwoWeek":
+          theType = 4;
+          break;
+        default:
+          theType = 2;
+          break;
       }
+      return theType;
     },
-    watch: {
-      weekTime: function() {
-        var theType = this.weekType(this.weekTime)
-        this.getSchedules(theType)
+    weekPath(week) {
+      var weekArr = {
+        1: "Monday",
+        2: "Tuesday",
+        3: "Wednesday",
+        4: "Thursday",
+        5: "Friday",
+        6: "Saturday",
+        7: "Sunday"
+      };
+      if (typeof weekArr[week] == "undefined") {
+        return "";
       }
+      return weekArr[week];
     },
+    selectWeekType(type) {
+      this.week_type = type;
+      let params = {
+        week_type: this.week_type
+      };
+      this.getScheduleWeekDay(params);
+    },
+    getSchedulesType: function(type) {
+      let type_name = "";
+      switch (type) {
+        case 1:
+          type_name = "上午";
+          break;
+        case 2:
+          type_name = "下午";
+          break;
+        case 3:
+          type_name = "晚上";
+          break;
+      }
+      return type_name;
+    },
+    getAdvice: function(doctor_advice) {
+      if (doctor_advice != null) {
+        let name = "";
+        for (let i = 0; i < doctor_advice.length; i++) {
+          let prescribing_number = "";
+          let single_dose = "";
+          let drug_spec = "";
 
-    methods: {
-      printAction(){
-        console.log("111111",this.week_type)
-        this.$router.push({ path: '/schedule/remind/print?week_type=' + this.week_type })
-
-      },
-      getScheduleWeekDay(weekType) {
-        getScheduleWeekDay(weekType).then(response => {
-          this.scheduleData = []
-          if (response.data.state == 1) {
-            this.scheduleData = response.data.data.schdules
-            console.log(this.scheduleData)
-          } else {
-            this.$message.error('网络错误')
-            return false
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number =
+              doctor_advice[i].prescribing_number +
+              doctor_advice[i].prescribing_number_unit;
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose =
+              " 单次用量 " +
+              doctor_advice[i].single_dose +
+              doctor_advice[i].single_dose_unit;
           }
-        })
-      },
-
-      // getSchedules(weekType) {
-      //   getSchedules(weekType).then(response => {
-      //     this.scheduleData = []
-      //     if (response.data.state == 1) {
-      //       this.weekTitle = response.data.data.weekTitle
-      //       var theSchedules = response.data.data.schdules
-      //       var that = this
-      //       theSchedules.forEach(function(schedule) {
-      //         schedule['mode_name'] = typeof (that.modeOptions[schedule.mode_id]) == 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
-      //         var weekPath = that.weekPath(schedule.schedule_week)
-      //         if (weekPath.length > 0) {
-      //           that.weekData[weekPath].push(schedule)
-      //         }
-      //       })
-      //       var rowNum = 0
-      //       console.log(that.weekData)
-      //       for (var index in that.weekData) {
-      //         var thisLen = that.weekData[index].length
-      //         rowNum = rowNum >= thisLen ? rowNum : thisLen
-      //       }
-      //       console.log(rowNum)
-      //       for (let index = 0; index < rowNum; index++) {
-      //         var dataItem = {}
-      //         for (var weekIndex in that.weekData) {
-      //           var weekItem = that.weekData[weekIndex].shift()
-      //           console.log('weekItem', weekItem)
-      //           if (typeof (weekItem) != 'undefined') {
-      //             dataItem[weekIndex] = weekItem
-      //           }
-      //         }
-      //         that.scheduleData.push(dataItem)
-      //       }
-      //
-      //       console.log(that.scheduleData)
-      //
-      //     } else {
-      //       this.$message.error('网络错误')
-      //       return false
-      //     }
-      //   })
-      // },
-      weekType(weekTime) {
-        var theType = 2
-        switch (weekTime) {
-          case 'lastWeek':
-            theType = 1
-            break
-          case 'thisWeek':
-            theType = 2
-            break
-          case 'nextWeek':
-            theType = 3
-            break
-          case 'nextTwoWeek':
-            theType = 4
-            break
-          default:
-            theType = 2
-            break
-        }
-        return theType
-      },
-      weekPath(week) {
-        var weekArr = {
-          1: 'Monday',
-          2: 'Tuesday',
-          3: 'Wednesday',
-          4: 'Thursday',
-          5: 'Friday',
-          6: 'Saturday',
-          7: 'Sunday'
-        }
-        if (typeof (weekArr[week]) == 'undefined') {
-          return ''
-        }
-        return weekArr[week]
-      }, selectWeekType(type) {
-        this.week_type = type
-        let params = {
-          week_type: this.week_type
-        }
-        this.getScheduleWeekDay(params)
-      }, getSchedulesType: function(type) {
-        let type_name = ''
-        switch (type) {
-          case 1:
-            type_name = '上午'
-            break
-          case 2:
-            type_name = '下午'
-            break
-          case 3:
-            type_name = '晚上'
-            break
-        }
-        return type_name
-      },
-      getAdvice:function(doctor_advice) {
-        if (doctor_advice != null) {
-          let name = ""
-          for (let i = 0; i < doctor_advice.length; i++) {
-
-            let prescribing_number = ''
-            let single_dose = ''
-            let drug_spec = ''
-
-            if (doctor_advice[i].prescribing_number > 0) {
-              prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
-            }
-            if (doctor_advice[i].single_dose > 0) {
-              single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
-            }
-
-            if (doctor_advice[i].drug_spec > 0) {
-              drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
-            }
-
-            name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
-
-            if (doctor_advice[i].child.length > 0) {
 
-              for (let a = 0; a < doctor_advice[i].child.length; a++) {
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =
+              doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+          }
 
-                if (doctor_advice[i].child[a].prescribing_number > 0) {
-                  doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
-                } else {
-                  doctor_advice[i].child[a]['presc'] = ''
-                }
+          name =
+            name +
+            doctor_advice[i].advice_name +
+            " " +
+            drug_spec +
+            " " +
+            prescribing_number +
+            " " +
+            single_dose +
+            " " +
+            doctor_advice[i].delivery_way +
+            " " +
+            doctor_advice[i].execution_frequency +
+            " " +
+            doctor_advice[i].remark +
+            "\n";
 
-                if (doctor_advice[i].child[a].single_dose > 0) {
-                  doctor_advice[i].child[a]['single'] = " " + ' 单次用量 ' + " " + doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
-                } else {
-                  doctor_advice[i].child[a]['single'] = ''
-                }
+          if (doctor_advice[i].child.length > 0) {
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]["presc"] =
+                  doctor_advice[i].child[a].prescribing_number +
+                  doctor_advice[i].child[a].prescribing_number_unit;
+              } else {
+                doctor_advice[i].child[a]["presc"] = "";
+              }
 
-                name = name + "▲" + doctor_advice[i].child[a].advice_name + ""
-                  + doctor_advice[i].child[a].advice_desc
-                  + doctor_advice[i].child[a].drug_spec_unit
-                  + doctor_advice[i].child[a].presc
-                  + doctor_advice[i].child[a].single + "\n"
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]["single"] =
+                  " " +
+                  " 单次用量 " +
+                  " " +
+                  doctor_advice[i].child[a].single_dose +
+                  doctor_advice[i].child[a].single_dose_unit;
+              } else {
+                doctor_advice[i].child[a]["single"] = "";
               }
 
+              name =
+                name +
+                "▲" +
+                doctor_advice[i].child[a].advice_name +
+                "" +
+                doctor_advice[i].child[a].advice_desc +
+                doctor_advice[i].child[a].drug_spec_unit +
+                doctor_advice[i].child[a].presc +
+                doctor_advice[i].child[a].single +
+                "\n";
             }
-
           }
-          return name
-
         }
+        return name;
       }
-    },
-    components: {
-      WeekItem
-    },
-    created() {
-      this.modeOptions = this.$store.getters.treatment_mode
-      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
-
-
-      this.week_type = new Date().getDay()
-      if(this.week_type == 0){
-        this.week_type = 7
-
-      }
-      let params = {
-        week_type: this.week_type
-      }
-      this.getScheduleWeekDay(params)
     }
+  },
+  components: {
+    WeekItem
+  },
+  created() {
+    this.modeOptions = this.$store.getters.treatment_mode;
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
+    console.log("抗凝机", this.anticoagulants_confit);
+    this.week_type = new Date().getDay();
+    if (this.week_type == 0) {
+      this.week_type = 7;
+    }
+    let params = {
+      week_type: this.week_type
+    };
+    this.getScheduleWeekDay(params);
   }
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss">