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

src/api/advice.js

-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export function getAdviceConfig(type) {
   return request({
-    url: '/api/getadviceconfigs?type=' + type,
-    method: 'get'
-  })
+    url: "/api/getadviceconfigs?type=" + type,
+    method: "get"
+  });
 }
 
 export function getAllAdviceConfig() {
   return request({
-    url: '/api/getalladviceconfig',
-    method: 'get'
-  })
+    url: "/api/getalladviceconfig",
+    method: "get"
+  });
 }
 
-export function CreateDoctorAdvice(id, advice,mode) {
+export function CreateDoctorAdvice(id, advice, mode) {
   return request({
-    url: '/api/patients/advice/create?id=' + id+"&mode="+mode,
-    method: 'post',
+    url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
+    method: "post",
     data: advice,
-    headers:{"Permission":3},
-
-  })
-}
-
-export function EditDoctorAdvice(patient, id, advice,mode) {
-  return request({
-    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient+"&mode="+mode,
-    method: 'Put',
+    headers: {
+      Permission: 3
+    }
+  });
+}
+
+export function EditDoctorAdvice(patient, id, advice, mode) {
+  return request({
+    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',
+    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',
+    url: "/api/patients/advice/check",
+    method: "Post",
     params: params,
-    headers:{"Permission":2},
-
-  })
+    headers: {
+      Permission: 2
+    }
+  });
 }
 
-
 export function getDoctorAdviceList(params) {
+  console.log("params", params);
   return request({
-    url: '/api/patients/advices',
-    method: 'Get',
+    url: "/api/patients/advices",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 // export function StopDoctorAdvice(id, reason,mode) {
 //   })
 // }
 
-export function StopGroupAdvice(groupno, reason,mode) {
+export function StopGroupAdvice(groupno, reason, mode) {
   return request({
-    url: '/api/patients/advice/stopgroup?groupno=' + groupno+"&mode="+mode,
-    method: 'Post',
+    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,
-    method: 'Delete',
-    headers:{"Permission":2},
-
-  })
+    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
+    method: "Delete",
+    headers: {
+      Permission: 2
+    }
+  });
 }
 
 export function CreateDrugDic(data) {
   return request({
-    url: '/api/drugdic/create',
-    method: 'post',
+    url: "/api/drugdic/create",
+    method: "post",
     data: data
-  })
+  });
 }
 export function UpdateDrugDic(id, data) {
   return request({
-    url: '/api/drugdic/update?id=' + id,
-    method: 'put',
+    url: "/api/drugdic/update?id=" + id,
+    method: "put",
     data: data
-  })
+  });
 }
 export function DeleteDrugDic(id) {
   return request({
-    url: '/api/drugdic/delete?id=' + id,
-    method: 'delete'
-  })
+    url: "/api/drugdic/delete?id=" + id,
+    method: "delete"
+  });
 }
 
 export function CreateDrugWay(data) {
   return request({
-    url: '/api/drugway/create',
-    method: 'post',
+    url: "/api/drugway/create",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function UpdateDrugWay(id, data) {
   return request({
-    url: '/api/drugway/update?id=' + id,
-    method: 'put',
+    url: "/api/drugway/update?id=" + id,
+    method: "put",
     data: data
-  })
+  });
 }
 export function DeleteDrugWay(id) {
   return request({
-    url: '/api/drugway/delete?id=' + id,
-    method: 'delete'
-  })
+    url: "/api/drugway/delete?id=" + id,
+    method: "delete"
+  });
 }
 
 export function CreateExecutionFrequency(data) {
   return request({
-    url: '/api/executionfrequency/create',
-    method: 'post',
+    url: "/api/executionfrequency/create",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function UpdateExecutionFrequency(id, data) {
   return request({
-    url: '/api/executionfrequency/update?id=' + id,
-    method: 'put',
+    url: "/api/executionfrequency/update?id=" + id,
+    method: "put",
     data: data
-  })
+  });
 }
 export function DeleteExecutionFrequency(id) {
   return request({
-    url: '/api/executionfrequency/delete?id=' + id,
-    method: 'delete'
-  })
+    url: "/api/executionfrequency/delete?id=" + id,
+    method: "delete"
+  });
 }
 export function CreateAdviceTemplate(data) {
   return request({
-    url: '/api/advicetemplate/create',
-    method: 'post',
+    url: "/api/advicetemplate/create",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function UpdateAdviceTemplate(id, data) {
   return request({
-    url: '/api/advicetemplate/update?id=' + id,
-    method: 'put',
+    url: "/api/advicetemplate/update?id=" + id,
+    method: "put",
     data: data
-  })
+  });
 }
 export function DeleteAdviceTemplate(id, template_id, parent_id) {
   return request({
-    url: '/api/advicetemplate/delete?id=' + id + '&template_id=' + template_id + '&parent_id=' + parent_id,
-    method: 'delete'
-  })
+    url:
+      "/api/advicetemplate/delete?id=" +
+      id +
+      "&template_id=" +
+      template_id +
+      "&parent_id=" +
+      parent_id,
+    method: "delete"
+  });
 }
 
 export function postAdviceTemplate(params, name, advice_type) {
   return request({
-    url: '/api/advicetemplate/create?template_name=' + name + '&advice_type=' + advice_type,
-    method: 'post',
+    url:
+      "/api/advicetemplate/create?template_name=" +
+      name +
+      "&advice_type=" +
+      advice_type,
+    method: "post",
     data: params
-  })
+  });
 }
 
-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,
-      method: 'post',
+      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,
-      method: 'post',
+      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,
-    method: 'delete',
-    headers:{"Permission":3},
-
-  })
+    url:
+      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
+    method: "delete",
+    headers: {
+      Permission: 3
+    }
+  });
 }
 
 export function getAllAdviceTemplate() {
   return request({
-    url: '/api/advicetemplate/list',
-    method: 'get'
-  })
+    url: "/api/advicetemplate/list",
+    method: "get"
+  });
 }
 
 export function CreateSingleAdviceTemplate(advices) {
   return request({
-    url: '/api/advicetemplate/add',
-    method: 'post',
+    url: "/api/advicetemplate/add",
+    method: "post",
     params: advices
-
-  })
+  });
 }
 export function DeleteParentAdviceTemplate(id) {
   return request({
-    url: '/api/adviceparenttemplate/delete?template_id=' + id,
-    method: 'delete'
-
-  })
+    url: "/api/adviceparenttemplate/delete?template_id=" + id,
+    method: "delete"
+  });
 }
 
 export function CreateSubAdvice(params) {
   return request({
-    url: '/api/subadvice/create',
-    method: 'post',
+    url: "/api/subadvice/create",
+    method: "post",
     params: params
-  })
+  });
 }
 
 export function updateTemplateName(params) {
   return request({
-    url: '/api/template/modify',
-    method: 'post',
+    url: "/api/template/modify",
+    method: "post",
     params: params
-  })
+  });
 }
 
 export function getDoctorAdviceConfig() {
   return request({
-    url: '/api/adviceconfig/get',
-    method: 'get'
-  })
+    url: "/api/adviceconfig/get",
+    method: "get"
+  });
 }
 
 export function postDoctorAdviceConfig(params) {
   return request({
-    url: '/api/adviceconfig/isopen',
-    method: 'post',
+    url: "/api/adviceconfig/isopen",
+    method: "post",
     params: params
-  })
+  });
 }
 
 export function getDoctorInitConfig() {
   return request({
-    url: '/api/advicetemplate/init/get',
-    method: 'get'
-  })
+    url: "/api/advicetemplate/init/get",
+    method: "get"
+  });
 }
 
 export function PostInitAdviceTemplate(params) {
   return request({
-    url: '/api/advicetemplate/init/commit',
-    method: 'post',
+    url: "/api/advicetemplate/init/commit",
+    method: "post",
     params: params
-
-  })
+  });
 }
 
 export function getPrintInfo(data) {
   return request({
-    url: '/api/advicetemplate/getprintinfo',
-    method: 'post',
+    url: "/api/advicetemplate/getprintinfo",
+    method: "post",
     data: 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,
-    method: 'Put',
+    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,
-    method: 'post',
+    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,
-      method: 'post',
+      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,
-      method: 'post',
+      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,
-    method: 'Delete',
-    headers:{"Permission":2},
-
-  })
+    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
+    method: "Delete",
+    headers: {
+      Permission: 2
+    }
+  });
 }
 
-
-
-export function DeleteNewGroupAdvice(groupno,mode) {
+export function DeleteNewGroupAdvice(groupno, mode) {
   return request({
-    url: '/api/patients/advice/deletegroup?groupno=' + groupno+"&mode="+mode,
-    method: 'delete',
-    headers:{"Permission":3},
-
-  })
+    url:
+      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
+    method: "delete",
+    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,
-    method: 'Post',
+    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,
-    method: 'Post',
-    headers:{"Permission":2},
-
-  })
+    url:
+      "/api/patients/advice/execgroup?groupno=" +
+      groupno +
+      "&execution_time=" +
+      time +
+      "&mode=" +
+      mode,
+    method: "Post",
+    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',
+    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/store/modules/xt_user.js

         resolve()
       })
     }, updateAllFiledConfigList({ commit }, object) {
+      console.log(object)
       var oldFiledList = getFiledConfigList()
       var infoJSON = JSON.parse(oldFiledList)
 
       return new Promise((resolve, reject) => {
         infoJSON = object
+        console.log(infoJSON)
+
         setFiledConfigList(JSON.stringify(infoJSON))
+
         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })

src/xt_pages/device/zone_main.vue

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

src/xt_pages/dialysis/Dialog/StatOrderDialog/index.vue

 <template>
-    <div>
-        <el-dialog title="临时医嘱" :visible.sync="statOrder" width="500px">
-            <el-form :model="form">
-                <el-form-item label="医嘱类型 : " :label-width="formLabelWidth">
-                    <!-- <el-input v-model="form.name" auto-complete="off"></el-input> -->
-                    <span>临时</span>
-                </el-form-item>
-                <el-form-item label="医嘱时间 : " :label-width="formLabelWidth">
-                    <span>2018-09-08</span>
-                </el-form-item>
-                <el-form-item label="开始时间 : " :label-width="formLabelWidth">
-                  <el-col :span="11">
-                    <el-date-picker type="date" placeholder="选择日期" v-model="form.startDate" style="width: 100%;"></el-date-picker>
-                  </el-col>
-                </el-form-item>
-                <el-form-item label="提醒日期 : " :label-width="formLabelWidth">
-                  <el-col :span="11">
-                    <el-date-picker type="date" placeholder="选择日期" v-model="form.remindDate" style="width: 100%;"></el-date-picker>
-                  </el-col>
-                </el-form-item>
-                <el-form-item label="开嘱医生 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.doctor" >
-                    <el-option v-for="item in doctorList" :label="item.label" :value="item.value" :key="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="医嘱名称 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.name" >
-                      <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="医嘱内容 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                </el-form-item>
-                <el-form-item label="单次用量 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-                <el-form-item label="给药途径 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.way" style="width:100%;" >
-                      <el-option v-for="(item, index) in wayList" :label="item.label" :value="item.value" :key="index"></el-option>                      
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="执行频率 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.frequency" style="width:100%;">
-                      <el-option v-for="(item, index) in frequencyList" :label="item.label" :value="item.value" :key="index"></el-option>                                           
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="子药数量 : " :label-width="formLabelWidth">
-                  <el-input-number v-model="form.child" @change="handleChangeChild" label="0"></el-input-number>
-                </el-form-item>
+  <div>
+    <el-dialog title="临时医嘱" :visible.sync="statOrder" width="500px">
+      <el-form :model="form">
+        <el-form-item label="医嘱类型 : " :label-width="formLabelWidth">
+          <!-- <el-input v-model="form.name" auto-complete="off"></el-input> -->
+          <span>临时</span>
+        </el-form-item>
+        <el-form-item label="医嘱时间 : " :label-width="formLabelWidth">
+          <span>2018-09-08</span>
+        </el-form-item>
+        <el-form-item label="开始时间 : " :label-width="formLabelWidth">
+          <el-col :span="11">
+            <el-date-picker
+              type="date"
+              placeholder="选择日期"
+              v-model="form.startDate"
+              style="width: 100%;"
+            ></el-date-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="提醒日期 : " :label-width="formLabelWidth">
+          <el-col :span="11">
+            <el-date-picker
+              type="date"
+              placeholder="选择日期"
+              v-model="form.remindDate"
+              style="width: 100%;"
+            ></el-date-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="开嘱医生 : " :label-width="formLabelWidth">
+          <el-select v-model="form.doctor">
+            <el-option
+              v-for="item in doctorList"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医嘱名称 : " :label-width="formLabelWidth">
+          <el-select v-model="form.name">
+            <el-option
+              v-for="(item, index) in nameList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医嘱内容 : " :label-width="formLabelWidth">
+          <span>1g*8# 片剂</span>
+        </el-form-item>
+        <el-form-item label="单次用量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.single"
+            controls-position="right"
+            @change="handleChange"
+          ></el-input-number>
+          <span>g</span>
+        </el-form-item>
+        <el-form-item label="开药数量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.number"
+            controls-position="right"
+            @change="handleChange"
+          ></el-input-number>
+          <span>瓶</span>
+        </el-form-item>
+        <el-form-item label="给药途径 : " :label-width="formLabelWidth">
+          <el-select v-model="form.way" style="width:100%;">
+            <el-option
+              v-for="(item, index) in wayList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行频率 : " :label-width="formLabelWidth">
+          <el-select v-model="form.frequency" style="width:100%;">
+            <el-option
+              v-for="(item, index) in frequencyList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="子药数量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.child"
+            @change="handleChangeChild"
+            label="0"
+          ></el-input-number>
+        </el-form-item>
 
-                <el-form style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;">
-                  <el-form-item label="子药名称1 : " :label-width="formLabelWidth">
-                     <el-select v-model="form.name" >
-                        <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                     </el-select>  
-                  </el-form-item>
-                  <el-form-item label="子药描述1 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                  </el-form-item>
-                  <el-form-item label="单次用量1 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量1 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-              </el-form>
+        <el-form
+          style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;"
+        >
+          <el-form-item label="子药名称1 : " :label-width="formLabelWidth">
+            <el-select v-model="form.name">
+              <el-option
+                v-for="(item, index) in nameList"
+                :label="item.label"
+                :value="item.value"
+                :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="子药描述1 : " :label-width="formLabelWidth">
+            <span>1g*8# 片剂</span>
+          </el-form-item>
+          <el-form-item label="单次用量1 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.single"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>g</span>
+          </el-form-item>
+          <el-form-item label="开药数量1 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.number"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>瓶</span>
+          </el-form-item>
+        </el-form>
 
-              <el-form style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;">
-                  <el-form-item label="子药名称2 : " :label-width="formLabelWidth">
-                     <el-select v-model="form.name" >
-                        <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                     </el-select>  
-                  </el-form-item>
-                  <el-form-item label="子药描述2 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                  </el-form-item>
-                  <el-form-item label="单次用量2 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量2 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-              </el-form>
-                
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="statOrder = false">取 消</el-button>                                
-                <el-button type="primary" @click="statOrder = false">保 存</el-button>
-            </div>
-        </el-dialog>
-    </div>
+        <el-form
+          style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;"
+        >
+          <el-form-item label="子药名称2 : " :label-width="formLabelWidth">
+            <el-select v-model="form.name">
+              <el-option
+                v-for="(item, index) in nameList"
+                :label="item.label"
+                :value="item.value"
+                :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="子药描述2 : " :label-width="formLabelWidth">
+            <span>1g*8# 片剂</span>
+          </el-form-item>
+          <el-form-item label="单次用量2 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.single"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>g</span>
+          </el-form-item>
+          <el-form-item label="开药数量2 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.number"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>瓶</span>
+          </el-form-item>
+        </el-form>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="statOrder = false">取 消</el-button>
+        <el-button type="primary" @click="statOrder = false">保 存</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
 export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.child{
+.child {
   border-top: 1px solid #dcdfe6;
   border-bottom: 1px solid #dcdfe6;
 }
 </style>
-

src/xt_pages/dialysis/details/BasicInfor.vue

 <template>
   <div>
-    <h2 class="DetailsTit"><span>{{ title }}</span></h2>
-      <div class="ui-step clearfix">
-        <ul class="ui-step-ul">
-          <li v-for="(step, index) in steps" :key="index" class="ui-step-done" :class="step.finish ? 'ui-step-done' : 'unfinished'">
-            <div class="ui-step-number"><i /></div>
-            <div class="ui-step-title">{{ step.title }}</div>
-          </li>
-        </ul>
-      </div>
-      <ul class="info clearfix">
-        <li>
-          <label>姓名 : </label>
-          <span>{{ patient.id == 0 ? "" : patient.name }}</span>
-        </li>
-        <li>
-          <label>性别 : </label>
-          <span>{{ patient.id == 0 ? "" : (patient.gender == 1 ? "男" : "女") }}</span>
-        </li>
-        <li>
-          <label>年龄:</label>
-          <span>{{ getAge(patient) }}</span>
-        </li>
-        <li>
-          <label>透析号 : </label>
-          <span>{{ patient.dialysis_no }}</span>
-        </li>
-        <li>
-          <label>床位号 : </label>
-          <span>{{ device_number }}</span>
-        </li>
-        <li>
-          <label>来源 : </label>
-          <span>{{ source }}</span>
-        </li>
-        <li>
-          <label>住院号 : </label>
-          <span>{{ patient.admission_number }}</span>
-        </li>
-        <li>
-          <label>透析日期:</label>
-          <span>{{dialysis_time}}</span>
+    <h2 class="DetailsTit">
+      <span>{{ title }}</span>
+    </h2>
+    <div class="ui-step clearfix">
+      <ul class="ui-step-ul">
+        <li
+          v-for="(step, index) in steps"
+          :key="index"
+          class="ui-step-done"
+          :class="step.finish ? 'ui-step-done' : 'unfinished'"
+        >
+          <div class="ui-step-number"><i /></div>
+          <div class="ui-step-title">{{ step.title }}</div>
         </li>
+      </ul>
+    </div>
+    <ul class="info clearfix">
+      <li>
+        <label>姓名 : </label>
+        <span>{{ patient.id == 0 ? "" : patient.name }}</span>
+      </li>
+      <li>
+        <label>性别 : </label>
+        <span>{{
+          patient.id == 0 ? "" : patient.gender == 1 ? "男" : "女"
+        }}</span>
+      </li>
+      <li>
+        <label>年龄:</label>
+        <span>{{ getAge(patient) }}</span>
+      </li>
+      <li>
+        <label>透析号 : </label>
+        <span>{{ patient.dialysis_no }}</span>
+      </li>
+      <li>
+        <label>床位号 : </label>
+        <span>{{ device_number }}</span>
+      </li>
+      <li>
+        <label>来源 : </label>
+        <span>{{ source }}</span>
+      </li>
+      <li>
+        <label>住院号 : </label>
+        <span>{{ patient.admission_number }}</span>
+      </li>
+      <li>
+        <label>透析日期:</label>
+        <span>{{ dialysis_time }}</span>
+      </li>
     </ul>
     <div class="middleLine"></div>
   </div>
 </template>
 
 <script>
-const moment = require('moment')
-import { parseTime } from '@/utils'
-import { jsGetAge, uParseTime } from '@/utils/tools'
+const moment = require("moment");
+import { parseTime } from "@/utils";
+import { jsGetAge, uParseTime } from "@/utils/tools";
 
 export default {
-  name: 'BasicInfor',
+  name: "BasicInfor",
   data() {
     return {
-      title: '基本信息',
-      dialysis_time:0,
+      title: "基本信息",
+      dialysis_time: 0
       // steps: [
       //   { title: "透析处方" },
       //   { title: "接诊评估" },
       //   { title: "透后评估" },
       //   { title: "治疗小结" }
       // ]
-    }
+    };
   },
   props: {
     patient: {
       type: Object,
       default: function() {
-        return { id: 0 }
+        return { id: 0 };
       }
     },
     device_number: {
     steps: {
       type: Array,
       default: function() {
-        return []
+        return [];
       }
     }
   },
   computed: {
     created_time: function() {
       if (this.patient.id == 0) {
-        return ''
+        return "";
       } else {
-        return parseTime(this.patient.created_time, '{y}-{m}-{d}')
+        return parseTime(this.patient.created_time, "{y}-{m}-{d}");
       }
     },
     source: function() {
-      return this.patient.source == 1 ? '门诊' : '住院'
+      return this.patient.source == 1 ? "门诊" : "住院";
     }
   },
   methods: {
     getAge: function(val) {
-        if (val.birthday == 0) {
-          return ''
-        }
-        return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+      var thisLen = val.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.id_card_no.substr(6, 6);
+      } else {
+        birth = val.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;
     },
+
     stepState: function() {
-      return parseInt((Math.random() * 1000) + '') % 2 == 1
+      return parseInt(Math.random() * 1000 + "") % 2 == 1;
     }
   },
   created() {
-    this.dialysis_time = parseTime(this.$route.query.date, '{y}-{m}-{d}')
-
+    this.dialysis_time = parseTime(this.$route.query.date, "{y}-{m}-{d}");
   }
-}
+};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
   }
 }
 .info {
-    padding:20px 40px;
-    li {
-      float: left;
-      width: 28%;
-      // margin: 0 1rem 0 0;
-      font-size: 15px;
-      height: 35px;
-      line-height: 35px;
-      color: #34495e;
-      margin-left: 60px;
-    }
-    // border: solid red 1px;
+  padding: 20px 40px;
+  li {
+    float: left;
+    width: 28%;
+    // margin: 0 1rem 0 0;
+    font-size: 15px;
+    height: 35px;
+    line-height: 35px;
+    color: #34495e;
+    margin-left: 60px;
   }
+  // border: solid red 1px;
+}
 </style>
-

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

             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/dialysisPrintOrder.vue

       <template
         v-if="
           org_template_info.template_id == 6 ||
-            org_template_info.template_id == 10 ||  org_template_info.template_id == 11
+            org_template_info.template_id == 10 ||
+            org_template_info.template_id == 11
         "
       >
         <el-button
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 12">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
         v-if="org_template_info.template_id == 10"
       ></DialysisPrintOrderTen>
 
-    <DialysisPrintOrderNine
+      <DialysisPrintOrderNine
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 9"
       ></DialysisPrintOrderNine>
 
-    <DialysisPrintOrderEleven
-      v-bind:childResponse="childResponse"
-      v-if="org_template_info.template_id == 11"
-    ></DialysisPrintOrderEleven>
+      <DialysisPrintOrderEleven
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 11"
+      ></DialysisPrintOrderEleven>
+      <DialysisPrintOrderTwelve
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 12"
+      ></DialysisPrintOrderTwelve>
     </div>
   </div>
 </template>
 import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 import print from "print-js";
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
-import DialysisPrintOrderEleven from './template/DialysisPrintOrderEleven'
+import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
+import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwelve,
     DialysisPrintOrderEleven,
     DialysisPrintOrderTen,
     DialysisPrintOrderOne,
       const style =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
 
       // const style3 =
       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
         });
       } else if (
         this.org_template_info.template_id == 6 ||
-        this.org_template_info.template_id == 10 ||  this.org_template_info.template_id == 11
+        this.org_template_info.template_id == 10 ||
+        this.org_template_info.template_id == 11
       ) {
         printJS({
           printable: "dialysis-print-box-1",
           style: style5,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 12) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
 .print-template-two tr {
   line-height: 30px;
 }
+
+.table-box1 {
+  border: 1px solid #000;
+  width: 100%;
+  line-height: 30px;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+.table-box1 tr {
+  border-bottom: 1px solid #000;
+}
 </style>

src/xt_pages/management/components/QualityForm.vue

         { id: 1, name: "透析液入口" },
         { id: 2, name: "透析液取样口" },
         { id: 3, name: "置换液出口" },
-        { id: 4, name: "透析机反渗水入口" }
+        { id: 4, name: "透析机反渗水入口" },
+        { id: 5, name: "反渗水末端取样口" }
       ],
       rules: {
         detection_unit: [{ required: true, message: "请填写检测单位" }],
             if (cultures[index].sampling_locationa === 4) {
               cultures[index].sampling_locationa = "透析机反渗水入口";
             }
+            if (cultures[index].sampling_locationa === 5) {
+              cultures[index].sampling_locationa = "反渗水末端取样口";
+            }
           }
           this.tableData = cultures;
           var dialyste = response.data.data.dialysate;
             if (dialyste[index].sampling_locationb === 4) {
               dialyste[index].sampling_locationb = "透析机反渗水入口";
             }
+            if (dialyste[index].sampling_locationb === 5) {
+              dialyste[index].sampling_locationb = "反渗水末端取样口";
+            }
           }
           this.table = dialyste;
           var ions = response.data.data.ions;
             if (cultures[index].sampling_locationa === 4) {
               cultures[index].sampling_locationa = "透析机反渗水入口";
             }
+            if (cultures[index].sampling_locationa === 5) {
+              cultures[index].sampling_locationa = "反渗水末端取样口";
+            }
           }
           this.tableData = cultures;
           var dialysate = response.data.data.dialysate;
             if (dialyste[index].sampling_locationb === 4) {
               dialyste[index].sampling_locationb = "透析机反渗水入口";
             }
+            if (dialyste[index].sampling_locationb === 5) {
+              dialyste[index].sampling_locationb = "反渗水末端取样口";
+            }
           }
           this.table = dialysate;
           var ions = response.data.data.ions;

src/xt_pages/management/components/UserForm.vue

 <template>
   <div id="user-form">
     <el-row class="c">
-      <el-col :span="11">
+      <el-col :span="12">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
           v-model="form.start_time"
           placeholder="请选择"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          style="width:145px"
+          style="width:130px"
         ></el-date-picker
         >-
         <el-date-picker
           placeholder="请选择"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          style="width:145px"
+          style="width:130px"
         ></el-date-picker>
       </el-col>
       <el-col :span="5">
           ></el-option>
         </el-select>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <span class="machineClass">机位号:</span>
-        <el-select style="width:145px" v-model="form.bed">
+        <el-select style="width:110px" v-model="form.bed">
           <el-option
             v-for="item in this.bedNumberTwo"
             :key="item.id"
   .el-dialog__footer {
     text-align: right;
   }
+  .el-input--prefix .el-input__inner {
+    padding-left: 15px;
+  }
+  .el-input--prefix .el-input__inner {
+    padding-right: 15px;
+  }
 }
 </style>

src/xt_pages/management/home.vue

           { id: 1, name: '透析液入口' },
           { id: 2, name: '透析液取样口' },
           { id: 3, name: '置换液出口' },
-          { id: 4, name: '透析机反渗水入口' }
+          { id: 4, name: '透析机反渗水入口' },
+          { id: 5, name:'反渗水末端取样口'}
         ],
         breakDown: [
           { id: 1, name: '是' },

src/xt_pages/role/components/EditRole.vue

 <template>
   <el-dialog
     title="新增员工"
-    width="750px"
+    width="660px"
     :visible.sync="visible"
     :before-close="_close"
   >
 
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
         </el-form-item>
-        <el-form-item label="角色" prop="role" label-width="70px">
-
-           <el-checkbox-group v-model="ruleForm.role">
-            <el-checkbox label="子管理员" name="type"></el-checkbox>
-            <el-checkbox label="医生" name="type"></el-checkbox>
-            <el-checkbox label="护士" name="type"></el-checkbox>
-            <el-checkbox label="技师" name="type"></el-checkbox>
-            <el-checkbox label="运营" name="type"></el-checkbox>
-            <el-checkbox label="库存" name="type"></el-checkbox>
-            <el-checkbox label="院长" name="type"></el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
 
         <el-form-item label="职称 : " label-width="50px">
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
         rules: {
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
-          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }],
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
         },
         admin_user: [],
         is_check_admin_user: [],
           name: [
             { required: true, message: '请输入用户名字', trigger: 'blur' },
             { max: 10, message: '10个字以内', trigger: 'blur' }
-          ],
-          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
+          ]
         }
       }
     },