Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/manage.js

@@ -1,20 +1,20 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export function getAllSubregion(params) {
-  console.log('params', params)
+  console.log("params", params);
   return request({
-    url: '/api/management/getallsubregion',
-    method: 'Get',
+    url: "/api/management/getallsubregion",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function SaveManageInfo(data) {
   return request({
-    url: '/api/management/savemanageinfo',
-    method: 'Post',
+    url: "/api/management/savemanageinfo",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function getAllMachineInfo(
@@ -32,310 +32,322 @@ export function getAllMachineInfo(
     zoneid: zoneid,
     equipmentid: equipmentid,
     statusid: statusid
-  }
+  };
   return request({
-    url: '/api/management/getallmachineinfo',
-    method: 'Get',
+    url: "/api/management/getallmachineinfo",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAllMachine(zoneid, deviceid) {
   const params = {
     zoneid: zoneid,
     deviceid: deviceid
-  }
+  };
   return request({
-    url: '/api/management/getallmachine',
-    method: 'Get',
+    url: "/api/management/getallmachine",
+    method: "Get",
     params: params
-  })
+  });
+}
+
+export function getAllMachineTwo(zoneid, deviceid) {
+  const params = {
+    zoneid: zoneid,
+    deviceid: deviceid
+  };
+  return request({
+    url: "/api/management/getallmachinetwo",
+    method: "Get",
+    params: params
+  });
 }
 
 export function getMachineDetailById(id, params) {
   return request({
-    url: '/api/management/getmachinedetail?id=' + id,
-    method: 'Get',
+    url: "/api/management/getmachinedetail?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateMachineInfo(data) {
-  console.log('data', data)
   return request({
-    url: '/api/management/updatemachineinfo',
-    method: 'Post',
+    url: "/api/management/updatemachineinfo",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function UpdateMachineInfoTwo(data) {
-  console.log('data', data)
   return request({
-    url: '/api/management/updatemachineinfotwo',
-    method: 'post',
+    url: "/api/management/updatemachineinfotwo",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getAllEquimentName(params) {
   return request({
-    url: '/api/management/getallequimentname',
-    method: 'Get',
+    url: "/api/management/getallequimentname",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function savePlan(data, id) {
+  console.log("data", data);
   return request({
-    url: '/api/management/saveplan?id=' + id,
-    method: 'Post',
+    url: "/api/management/saveplan?id=" + id,
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function getAllPlan(params) {
   return request({
-    url: '/api/management/getallplan',
-    method: 'Get',
+    url: "/api/management/getallplan",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAllPlanDetail(unitype) {
   // eslint-disable-next-line no-redeclare
   const params = {
     unitype: unitype
-  }
+  };
   return request({
-    url: '/api/management/getallplandetail',
-    method: 'Get',
+    url: "/api/management/getallplandetail",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getEditMachine(id, params) {
   return request({
-    url: '/api/management/geteditmachine?id=' + id,
-    method: 'Get',
+    url: "/api/management/geteditmachine?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function DeletePlans(data) {
   return request({
-    url: '/api/staff/deleteplans',
-    method: 'delete',
+    url: "/api/staff/deleteplans",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function EditPlanDetail(id, params) {
   return request({
-    url: '/api/manage/editplandetail?id=' + id,
-    method: 'get',
+    url: "/api/manage/editplandetail?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function UpdatePlanInfo(data) {
   return request({
-    url: '/api/manage/updateplaninfo',
-    method: 'Post',
+    url: "/api/manage/updateplaninfo",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function getComprehensive(params) {
   return request({
-    url: '/api/manage/getcomprehensive',
-    method: 'Get',
+    url: "/api/manage/getcomprehensive",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function SaveInformation(eid, data) {
+  console.log("data--", data);
   return request({
-    url: '/api/manage/saveinformation?eid=' + eid,
-    method: 'Post',
+    url: "/api/manage/saveinformation?eid=" + eid,
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function getPatientInfo(id, params) {
   return request({
-    url: '/api/manage/getpatientinfo?id=' + id,
-    method: 'Get',
+    url: "/api/manage/getpatientinfo?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function ChangeClass(equitid, id) {
   const params = {
     equitid: equitid,
     id: id
-  }
+  };
   return request({
-    url: '/api/manage/changeclass',
-    method: 'Get',
+    url: "/api/manage/changeclass",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function changePatient(equitid, id) {
   const params = {
     equitid: equitid,
     id: id
-  }
+  };
   return request({
-    url: '/api/manage/changepatient',
-    method: 'Get',
+    url: "/api/manage/changepatient",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAllOrganization(params) {
   return request({
-    url: '/api/manage/getallorganization',
-    method: 'Get',
+    url: "/api/manage/getallorganization",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getUserRegister(id, params) {
   return request({
-    url: '/api/manage/getregisterinfo?id=' + id,
-    method: 'Get',
+    url: "/api/manage/getregisterinfo?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getInformationData(limit, page) {
   const params = {
     limit: limit,
     page: page
-  }
+  };
   return request({
-    url: '/api/manage/getinformationdata',
-    method: 'Get',
+    url: "/api/manage/getinformationdata",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function SaveBacteria(id, data) {
   return request({
-    url: '/api/manage/savebacteria?id=' + id,
-    method: 'Post',
+    url: "/api/manage/savebacteria?id=" + id,
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function SaveLincomycin(id, data) {
   return request({
-    url: '/api/manage/savelincomycin?id=' + id,
-    method: 'Post',
+    url: "/api/manage/savelincomycin?id=" + id,
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function SaveQualityControl(id, data) {
   return request({
-    url: '/api/manage/savequalitycontrol?id=' + id,
-    method: 'Post',
+    url: "/api/manage/savequalitycontrol?id=" + id,
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function getOrgName(params) {
   return request({
-    url: '/api/manage/getorgname',
-    method: 'Get',
+    url: "/api/manage/getorgname",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAllQulityInfo(params) {
   return request({
-    url: '/api/manage/getallqulityinfo',
-    method: 'Get',
+    url: "/api/manage/getallqulityinfo",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function EditCulture(id, userid) {
   const params = {
     id: id,
     userid: userid
-  }
+  };
   return request({
-    url: '/api/manage/editculture',
-    method: 'Get',
+    url: "/api/manage/editculture",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateCulture(data) {
   return request({
-    url: '/api/manage/updateculture',
-    method: 'Post',
+    url: "/api/manage/updateculture",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function DeleteCultrue(data) {
   return request({
-    url: '/api/manage/deletecultrue',
-    method: 'delete',
+    url: "/api/manage/deletecultrue",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function EditDialyState(id, params) {
   return request({
-    url: '/api/manage/editdialystate?id=' + id,
-    method: 'Get',
+    url: "/api/manage/editdialystate?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateDialyState(data) {
   return request({
-    url: '/api/manage/updatedialystate',
-    method: 'post',
+    url: "/api/manage/updatedialystate",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function DeleteDialystate(data) {
   return request({
-    url: '/api/manage/deletedialystate',
-    method: 'delete',
+    url: "/api/manage/deletedialystate",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function EditIon(id, params) {
   return request({
-    url: '/api/manage/edition?id=' + id,
-    method: 'Get',
+    url: "/api/manage/edition?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateIon(data) {
   return request({
-    url: '/api/manage/updateion',
-    method: 'Post',
+    url: "/api/manage/updateion",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function DeleteIon(data) {
   return request({
-    url: '/api/manage/deleteion',
-    method: 'delete',
+    url: "/api/manage/deleteion",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function queryTable(bedid, startime, endtime) {
@@ -343,56 +355,57 @@ export function queryTable(bedid, startime, endtime) {
     bedid: bedid,
     startime: startime,
     endtime: endtime
-  }
+  };
   return request({
-    url: '/api/manage/query',
-    method: 'Get',
+    url: "/api/manage/query",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function SaveRepair(id, data) {
   return request({
-    url: '/api/manage/saverepair?id=' + id,
-    method: 'post',
+    url: "/api/manage/saverepair?id=" + id,
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getAllRepair(limit, page) {
   const params = {
     limit: limit,
     page: page
-  }
+  };
   return request({
-    url: '/api/manage/getallrepair',
-    method: 'Get',
+    url: "/api/manage/getallrepair",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function EditRepair(id, params) {
   return request({
-    url: '/api/manage/editrepair?id=' + id,
-    method: 'Get',
+    url: "/api/manage/editrepair?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateRepair(data) {
+  console.log("data-----", data);
   return request({
-    url: '/api/manage/updaterepair',
-    method: 'Post',
+    url: "/api/manage/updaterepair",
+    method: "Post",
     data: data
-  })
+  });
 }
 
 export function DeleteRepair(data) {
   return request({
-    url: '/api/manage/deleterepair',
-    method: 'delete',
+    url: "/api/manage/deleterepair",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function queryRepair(bedid, startime, endtime) {
@@ -400,47 +413,47 @@ export function queryRepair(bedid, startime, endtime) {
     bedid: bedid,
     startime: startime,
     endtime: endtime
-  }
+  };
 
   return request({
-    url: '/api/manage/queryrepair',
-    method: 'Get',
+    url: "/api/manage/queryrepair",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function EditUser(id, patientid) {
   const params = {
     id: id,
     patientid: patientid
-  }
+  };
   return request({
-    url: '/api/manage/edituser',
-    method: 'Get',
+    url: "/api/manage/edituser",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function DeleteUserform(data) {
   return request({
-    url: '/api/manage/deleteform',
-    method: 'delete',
+    url: "/api/manage/deleteform",
+    method: "delete",
     data: data
-  })
+  });
 }
 
 export function UpdateForm(data) {
   return request({
-    url: '/api/manage/updateform',
-    method: 'post',
+    url: "/api/manage/updateform",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function queryInfo(zone, bed, startime, endtime, limit, page) {
-  console.log('开始时间', startime)
-  console.log('结束时间', endtime)
-  console.log('床位好', bed)
+  console.log("开始时间", startime);
+  console.log("结束时间", endtime);
+  console.log("床位好", bed);
   const params = {
     zone: zone,
     bed: bed,
@@ -448,28 +461,28 @@ export function queryInfo(zone, bed, startime, endtime, limit, page) {
     endtime: endtime,
     limit: limit,
     page: page
-  }
+  };
   return request({
-    url: '/api/manage/queryinfo',
-    method: 'Get',
+    url: "/api/manage/queryinfo",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAutoData(id, params) {
   return request({
-    url: '/api/manage/insertautodata?id=' + id,
-    method: 'Get',
+    url: "/api/manage/insertautodata?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getAllEquitType(params) {
   return request({
-    url: '/api/manage/getallequittype',
-    method: 'Get',
+    url: "/api/manage/getallequittype",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getUserForm(id, limit, page) {
@@ -477,203 +490,223 @@ export function getUserForm(id, limit, page) {
     id: id,
     limit: limit,
     page: page
-  }
+  };
   return request({
-    url: '/api/manage/getuserform',
-    method: 'Get',
+    url: "/api/manage/getuserform",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function UpdateMacheineTwo(data) {
   return request({
-    url: '/api/manage/updatemacheinettwo',
-    method: 'post',
+    url: "/api/manage/updatemacheinettwo",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getBedForm(id, params) {
   return request({
-    url: '/api/manage/getbedform?id=' + id,
-    method: 'get',
+    url: "/api/manage/getbedform?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function getTotalCount(params) {
   return request({
-    url: '/api/manage/gettotalcount',
-    method: 'Get',
+    url: "/api/manage/gettotalcount",
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getTotalNumber(id, params) {
   return request({
-    url: '/api/manage/getotalnumber?id=' + id,
-    method: 'Get',
+    url: "/api/manage/getotalnumber?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function getTimeWarning(id, params) {
   return request({
-    url: '/api/manage/gettimewarning?id=' + id,
-    method: 'Get',
+    url: "/api/manage/gettimewarning?id=" + id,
+    method: "Get",
     params: params
-  })
+  });
 }
 
 export function SaveManageInfoTwo(data, beds) {
-  console.log('data', beds)
+  console.log("data", beds);
   return request({
-    url: '/api/manage/savemanageinfotwo?beds=' + beds,
-    method: 'post',
+    url: "/api/manage/savemanageinfotwo?beds=" + beds,
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getAllpatient(params) {
   return request({
-    url: '/api/manage/getallpatient',
-    method: 'get',
+    url: "/api/manage/getallpatient",
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function changeBed(id, params) {
   return request({
-    url: '/api/manage/changebed?id=' + id,
-    method: 'get',
+    url: "/api/manage/changebed?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function getPatientDetail(id, params) {
   return request({
-    url: '/api/manage/getpatientdetail?id=' + id,
-    method: 'get',
+    url: "/api/manage/getpatientdetail?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function changeRun(id, data) {
   return request({
-    url: '/api/manage/changrun?id=' + id,
-    method: 'post',
+    url: "/api/manage/changrun?id=" + id,
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getRemanderData(params) {
   return request({
-    url: '/api/manage/getremanderdata',
-    method: 'get',
+    url: "/api/manage/getremanderdata",
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function openDelete(id, params) {
   return request({
-    url: '/api/manage/opendelete?id=' + id,
-    method: 'delete',
+    url: "/api/manage/opendelete?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function DeleteUserLogin(id, params) {
   return request({
-    url: '/api/manage/deleteuserlogin?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deleteuserlogin?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function DeleteCultrues(id, params) {
   return request({
-    url: '/api/manage/deletecultrues?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deletecultrues?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function DeleteDialystates(id, params) {
   return request({
-    url: '/api/manage/deletedialystates?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deletedialystates?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function DeleteIons(id, params) {
   return request({
-    url: '/api/manage/deleteions?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deleteions?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function DeleteRepairs(id, params) {
   return request({
-    url: '/api/manage/deleterepairs?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deleterepairs?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function SaveMode(data) {
   return request({
-    url: '/api/manage/savemode',
-    method: 'post',
+    url: "/api/manage/savemode",
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function getAllMode(params) {
   return request({
-    url: '/api/manage/getallmode',
-    method: 'get',
+    url: "/api/manage/getallmode",
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function EditMode(id, params) {
   return request({
-    url: '/api/manage/editmode?id=' + id,
-    method: 'get',
+    url: "/api/manage/editmode?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function UpdateMode(id, data) {
   return request({
-    url: '/api/manage/updatemode?id=' + id,
-    method: 'post',
+    url: "/api/manage/updatemode?id=" + id,
+    method: "post",
     data: data
-  })
+  });
 }
 
 export function DeleteMode(id, params) {
   return request({
-    url: '/api/manage/deletemode?id=' + id,
-    method: 'delete',
+    url: "/api/manage/deletemode?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }
 
 export function selectChange(id, params) {
   return request({
-    url: '/api/manage/selectchange?id=' + id,
-    method: 'get',
+    url: "/api/manage/selectchange?id=" + id,
+    method: "get",
     params: params
-  })
+  });
 }
 
 export function selectBed(id, params) {
   return request({
-    url: '/api/manage/selectbed?id=' + id,
-    method: 'get',
+    url: "/api/manage/selectbed?id=" + id,
+    method: "get",
+    params: params
+  });
+}
+
+export function getTimeBeteen(equitid, todaytime) {
+  const params = {
+    equitid: equitid,
+    todaytime: todaytime
+  };
+  return request({
+    url: "/api/manage/getime",
+    method: "get",
+    params: params
+  });
+}
+
+export function DeleteImages(id,params) {
+  return request({
+    url: "/api/manage/deleteimages?id=" + id,
+    method: "delete",
     params: params
-  })
+  });
 }

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -21,7 +21,7 @@
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                {{record.receive_assessment.admission_number}}
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
               <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
@@ -383,7 +383,7 @@
               <div class="inline_block" style="margin-left: 5px;">
                 住院号：
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                  {{record.receive_assessment.admission_number}}
+                  {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
                 </div>
                 <div class="under_line" style="width: 70px;" v-else>
                   {{'/'}}
@@ -694,7 +694,7 @@
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                {{record.receive_assessment.admission_number}}
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
               <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
@@ -1042,7 +1042,7 @@
                 <div class="inline_block" style="margin-left: 5px;">
                   住院号：
                   <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                    {{record.receive_assessment.admission_number}}
+                    {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -21,7 +21,7 @@
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                {{record.receive_assessment.admission_number}}
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
               <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
@@ -379,7 +379,7 @@
               <div class="inline_block" style="margin-left: 5px;">
                 住院号：
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                  {{record.receive_assessment.admission_number}}
+                  {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
                 </div>
                 <div class="under_line" style="width: 70px;" v-else>
                   {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -21,7 +21,7 @@
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
               <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                {{record.receive_assessment.admission_number}}
+                {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
               </div>
               <div class="under_line" style="width: 70px;" v-else>
                 {{'/'}}
@@ -358,7 +358,7 @@
                 <div class="inline_block" style="margin-left: 5px;">
                   住院号：
                   <div class="under_line" style="width: 70px;text-align: left" v-if="record.receive_assessment.admission_number">
-                    {{record.receive_assessment.admission_number}}
+                    {{record.receive_assessment.condition == 1?record.receive_assessment.admission_number:'/'}}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -43,7 +43,7 @@
                   <td width="50">年 龄:</td>
                   <td width="180">
                     <div class="under-line">
-                      &nbsp;{{ getAge(record.patient) }}
+                      &nbsp;{{ checkIdCardNo(record.patient.id_card_no) }}
                     </div>
                   </td>
                   <td width="80">岁</td>
@@ -290,44 +290,112 @@
                           >
                         </td>
                         <td style="text-align:left;margin-left:15px">
-                          透析机型号:
+                          透析器型号:
                           <span class="under-line"
+                               v-if="
+                         record.prescription.mode_id != 3 &&
+                         record.prescription.mode_id != 4 &&
+                         record.prescription.mode_id != 12 &&
+                         record.prescription.mode_id != 9
+                      "
                           >&nbsp;{{
-                              record.assessment_before_dislysis.machine_type
-                                ? record.assessment_before_dislysis.machine_type
+                              record.prescription.dialyzer_perfusion_apparatus
+                                ? record.prescription.dialyzer_perfusion_apparatus
                                 : '/'
                             }}</span
                           >
+                          <span v-else  class="under-line" >
+                            /
+                          </span>
                         </td>
                         <td style="text-align:left;margin-left:15px">
-                          预脱:
-                          <span class="under-line"
+                         灌流器型号: <span class="under-line"
+                           v-if="
+                         record.prescription.mode_id == 3 ||
+                         record.prescription.mode_id == 4 ||
+                         record.prescription.mode_id == 12 ||
+                         record.prescription.mode_id == 9
+                      "
                           >&nbsp;{{
-                              record.prescription.target_ultrafiltration
-                                ? record.prescription.target_ultrafiltration
-                                : '/'
-                            }}</span
-                          >L
+                            record.prescription.dialyzer_perfusion_apparatus
+                          ? record.prescription.dialyzer_perfusion_apparatus
+                          : "/"
+                      }}</span
+                    >
+                      <span v-else class="under-line" >
+                        /
+                      </span>
                         </td>
                         <td style="text-align:left;margin-left:15px">
-                          治疗时间:
-                          <span class="under-line"
-                          >&nbsp;{{
-                              record.assessment_after_dislysis
-                                .actual_treatment_hour
-                                ? record.assessment_after_dislysis
-                                    .actual_treatment_hour
-                                : '/'
-                            }}小时{{
-                              record.assessment_after_dislysis
-                                .actual_treatment_minute
-                                ? record.assessment_after_dislysis
-                                    .actual_treatment_minute
-                                : '/'
-                            }}分钟</span
-                          >
+                          血管通路:
+                           <span class="under-line"
+                          >&nbsp
+                           {{
+                            QueryPartById(
+                              record.assessment_before_dislysis &&
+                                record.assessment_before_dislysis
+                                  .blood_access_part_opera_id
+                                ? record.assessment_before_dislysis
+                                    .blood_access_part_opera_id
+                                : 0
+                            )
+                          }}
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis
+                              .blood_access_part_opera_name
+                              ? record.assessment_before_dislysis
+                                  .blood_access_part_opera_name
+                              : ""
+                          }}
+                          </span
+                    >
                         </td>
                       </tr>
+                      <tr>
+                        <td style="text-align:left;margin-left:15px">
+                    干体重:
+                    <span class="under-line"
+                      >&nbsp;{{
+                        record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight.dry_weight : "/"
+                      }}</span
+                    >kg
+                  </td>
+                   <td style="text-align:left;margin-left:15px">
+                    透前体重:
+                    <span class="under-line"
+                      >&nbsp;{{
+                        record.assessment_before_dislysis.weight_before
+                          ? record.assessment_before_dislysis.weight_before
+                          : "/"
+                      }}</span
+                    >kg
+                  </td>
+                      <td style="text-align:left;margin-left:15px">
+                    预脱:
+                    <span class="under-line"
+                      >&nbsp;{{
+                        record.prescription.target_ultrafiltration
+                          ? record.prescription.target_ultrafiltration
+                          : "/"
+                      }}</span
+                    >L
+                  </td>
+                  <td style="text-align:left;margin-left:15px">
+                    治疗时间:
+                    <span class="under-line"
+                      >&nbsp;{{
+                        record.prescription.dialysis_duration_hour
+                          ? record.prescription.dialysis_duration_hour
+                          : "0"
+                      }}小时{{
+                        record.prescription.dialysis_duration_minute
+                          ? record.prescription.dialysis_duration_minute
+                          : "0"
+                      }}分钟</span
+                    >
+                  </td>
+                      </tr>
                       <tr>
                         <td style="text-align:left;margin-left:15px">
                           血流量:
@@ -612,6 +680,10 @@
                     <p style="height:20px;line-height:20px">呼吸</p>
                     <p style="height:20px;line-height:20px">次/分</p>
                   </th>
+                  <th style="min-width:60px">
+                    <p style="height:20px;line-height:20px">血流量</p>
+                    <p style="height:20px;line-height:20px">ml/min</p>
+                  </th>
                   <th style="min-width:60px">
                     <p style="height:20px;line-height:20px">超滤量</p>
                     <p style="height:20px;line-height:20px">L</p>
@@ -628,7 +700,7 @@
                     <p style="height:20px;line-height:20px">跨膜压</p>
                     <p style="height:20px;line-height:20px">(mmHg)</p>
                   </th>
-                  <th style="min-width:60px">
+                  <th style="min-width:260px">
                     <p style="height:20px;line-height:20px">病情变化</p>
                   </th>
                 </tr>
@@ -650,9 +722,10 @@
                   </td>
                   <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : '/' }}</td>
                   <td>{{ monitor.breathing_rate ? monitor.breathing_rate : '/' }}</td>
+                  <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:"/"}}</td>
                   <td>
                     {{
-                    monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'
+                    monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '/'
                     }}
                   </td>
                   <td>
@@ -860,7 +933,10 @@
                       </td>
                       <td style="text-align:left;margin-left:15px;width:25%">
                         核对护士:
-                        <span class="under-line">&nbsp; </span>
+                        <span class="under-line">&nbsp;
+                        <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')}}</span>
+                        <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset=""> 
+                        </span>
                       </td>
                       <tr>
                         <td style="text-align:left;margin-left:15px">
@@ -895,7 +971,7 @@
                           <span class="under-line"
                           >&nbsp;{{ record.dialysis_order.systolic_blood_pressure }}/{{
                     record.dialysis_order.diastolic_blood_pressure
-                  }}</span
+                  }}&nbsp;mmHg</span
                           >
                         </td>
                         <td style="text-align:left;margin-left:15px">
@@ -915,7 +991,7 @@
                         </td>
                         <td style="text-align:left;margin-left:15px">
                           实际超滤量:
-                          <span class="under-line">&nbsp;{{record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}</span>
+                          <span class="under-line">&nbsp;{{record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}&nbsp;L</span>
                         </td>
                       </tr>
                       <tr>
@@ -956,15 +1032,7 @@
                         </td>
                         <td style="text-align:left;margin-left:15px">
                           透析器凝血:
-                          <span class="under-line" v-if="record.assessment_after_dislysis.dialyzer === 0">&nbsp;/</span>
-                          <span class="under-line"
-                                v-if="record.assessment_after_dislysis.dialyzer === 1">&nbsp;0级</span>
-                          <span class="under-line"
-                                v-if="record.assessment_after_dislysis.dialyzer === 2">&nbsp;1级</span>
-                          <span class="under-line"
-                                v-if="record.assessment_after_dislysis.dialyzer === 3">&nbsp;2级</span>
-                          <span class="under-line"
-                                v-if="record.assessment_after_dislysis.dialyzer === 4">&nbsp;3级</span>
+                          <span class="under-line">{{record.assessment_after_dislysis.cruor?record.assessment_after_dislysis.cruor:"/"}}</span>
                         </td>
                       </tr>
                       <td style="text-align:left;margin-left:15px;width:200px">
@@ -1482,6 +1550,24 @@
           return val.age
         }
       },
+     checkIdCardNo(val) {
+      var thisLen = val.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.substr(6, 6);
+      } else {
+        birth = val.substr(6, 8);
+      }
+      var birthTwo =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+
+      var age = jsGetAge(birthTwo, "-");
+      return age;
+    },
       newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -294,10 +294,7 @@
                   </div>
                 </div>
 
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
                   <div class="inline_block" style="flex:1.4">
                     血管通路：
                     <div
@@ -1389,10 +1386,7 @@
                     min
                   </div>
                 </div>
-                <div
-                  class="row"
-                  style="padding: 2px 0;line-height:23px;display:flex;"
-                >
+                <div  class="row"  style="padding: 2px 0;line-height:23px;display:flex;"  >
                   <div class="inline_block" style="flex:2;">
                     凝血程度：
                     <div

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -13,7 +13,7 @@
         <div class="inline_block" style="margin-left: 5px;">
           住院号：
           <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
-            {{receiverTreatmentAccess.admission_number}}
+            {{patientInfo_source_2?receiverTreatmentAccess.admission_number: '/'}}
           </div>
           <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{'/'}}
@@ -305,7 +305,7 @@
           <div class="inline_block" style="margin-left: 5px;">
             住院号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
-              {{receiverTreatmentAccess.admission_number}}
+              {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
             </div>
             <div class="under_line" style="width: 70px;text-align: left" v-else>
               {{'/'}}
@@ -601,7 +601,7 @@
         <div class="inline_block" style="margin-left: 5px;">
           住院号：
           <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
-            {{receiverTreatmentAccess.admission_number}}
+            {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
           </div>
           <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{'/'}}
@@ -940,7 +940,7 @@
             <div class="inline_block" style="margin-left: 5px;">
               住院号：
               <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
-                {{receiverTreatmentAccess.admission_number}}
+                {{patientInfo_source_2?receiverTreatmentAccess.admission_number:'/'}}
               </div>
               <div class="under_line" style="width: 70px;text-align: left" v-else>
                 {{'/'}}
@@ -1647,7 +1647,7 @@
         if (this.receiverTreatmentAccess.condition == 1) {
           this.patientInfo_source_1 = false
           this.patientInfo_source_2 = true
-        } else if (this.receiverTreatmentAccess.source == 2) {
+        } else if (this.receiverTreatmentAccess.condition == 2) {
           this.patientInfo_source_2 = false
           this.patientInfo_source_1 = true
         } else {

src/xt_pages/management/components/MultipleForm.vue

@@ -184,7 +184,7 @@
             width="100"
             align="center"
           >
-            <template slot-scope="scope">{{ scope.row.unit_type }}</template>
+            <template slot-scope="scope">{{ scope.row.device_mode }}</template>
           </el-table-column>
           <el-table-column
             prop="address"
@@ -287,10 +287,10 @@ import {
   getAllEquimentName,
   getComprehensive,
   getTotalCount
-} from "@/api/manage";
-import { uParseTime } from "@/utils/tools";
+} from '@/api/manage'
+import { uParseTime } from '@/utils/tools'
 export default {
-  name: "MultipleForm",
+  name: 'MultipleForm',
   props: {
     equimentid: Number
   },
@@ -300,77 +300,77 @@ export default {
       failure: 0,
       dialogVisible: false,
       form: {
-        zone: "",
-        device_number: "",
-        device_type: "",
-        device_model: "",
-        user_year: "",
-        start_time: "",
-        end_time: ""
+        zone: '',
+        device_number: '',
+        device_type: '',
+        device_model: '',
+        user_year: '',
+        start_time: '',
+        end_time: ''
       },
       userYear: [
-        { id: 0, name: "全部" },
-        { id: 1, name: "0~1" },
-        { id: 2, name: "1~3" },
-        { id: 3, name: "3~10" },
-        { id: 4, name: "10年以上" }
+        { id: 0, name: '全部' },
+        { id: 1, name: '0~1' },
+        { id: 2, name: '1~3' },
+        { id: 3, name: '3~10' },
+        { id: 4, name: '10年以上' }
       ],
-      value1: "",
-      value2: "",
+      value1: '',
+      value2: '',
       tableData: [],
       EquitmentType: [
-        { id: 0, name: "全部" },
-        { id: 1, name: "透析机" },
-        { id: 2, name: "水处理机" },
-        { id: 3, name: "报废机" },
-        { id: 4, name: "其他" }
+        { id: 0, name: '全部' },
+        { id: 1, name: '透析机' },
+        { id: 2, name: '水处理机' },
+        { id: 3, name: '报废机' },
+        { id: 4, name: '其他' }
       ],
-      DeviceType: [{ id: 0, name: "不限" }],
-      Numbers: [{ id: 0, number: "不限" }],
-      EquitmentName: [{ id: 0, equitment_name: "全部" }],
+      DeviceType: [{ id: 0, name: '不限' }],
+      Numbers: [{ id: 0, number: '不限' }],
+      EquitmentName: [{ id: 0, equitment_name: '全部' }],
       runOptions: [
-        { value: "1", label: "正常" },
-        { value: "2", label: "故障" }
+        { value: '1', label: '正常' },
+        { value: '2', label: '故障' }
       ]
-    };
+    }
   },
   methods: {
     open: function() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     getAllSubregion() {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
-          var zone = response.data.data.zones;
-          var zones = [{ id: 0, name: "不限" }];
+          var zone = response.data.data.zones
+          var zones = [{ id: 0, name: '不限' }]
           for (let i = 0; i < zone.length; i++) {
-            const item = zone[i];
-            zones.push({ id: item.id, name: item.name });
+            const item = zone[i]
+            zones.push({ id: item.id, name: item.name })
           }
-          this.DeviceType = zones;
-          var number = response.data.data.numbers;
-          var numbers = [{ id: 0, number: "不限" }];
+          this.DeviceType = zones
+          var number = response.data.data.numbers
+          var numbers = [{ id: 0, number: '不限' }]
           for (let index = 0; index < number.length; index++) {
-            const item = number[index];
-            numbers.push({ id: item.id, number: item.number });
+            const item = number[index]
+            numbers.push({ id: item.id, number: item.number })
           }
-          this.Numbers = numbers;
+          this.Numbers = numbers
           // console.log('numbers', number)
         }
-      });
+      })
     },
     getAllEquimentName() {
       getAllEquimentName().then(response => {
         if (response.data.state == 1) {
-          var equit = response.data.data.equit;
-          var equits = [{ id: 0, equitment_name: "全部" }];
+          var equit = response.data.data.equit
+          var equits = [{ id: 0, equitment_name: '全部' }]
           for (let index = 0; index < equit.length; index++) {
-            const item = equit[index];
-            equits.push({ id: item.id, equitment_name: item.equitment_name });
+            const item = equit[index]
+            equits.push({ id: item.id, equitment_name: item.equitment_name })
           }
-          this.EquitmentName = equits;
+          this.EquitmentName = equits
         }
-      });
+      })
     },
     getComprehensive() {
       const params = {
@@ -380,66 +380,66 @@ export default {
         year: this.form.user_year,
         starttime: this.form.start_time,
         endtime: this.form.end_time
-      };
+      }
       getComprehensive(params).then(response => {
         if (response.data.state === 1) {
-          var macher = response.data.data.macher;
-          console.log("设备型号5555", macher);
+          var macher = response.data.data.macher
+        
           for (let index = 0; index < macher.length; index++) {
             if (macher[index].device_type === 1) {
-              macher[index].device_type = "透析机";
+              macher[index].device_type = '透析机'
             }
             if (macher[index].device_type === 2) {
-              macher[index].device_type = "水处理机";
+              macher[index].device_type = '水处理机'
             }
             if (macher[index].device_type === 3) {
-              macher[index].device_type = "其他";
+              macher[index].device_type = '其他'
             }
 
             if (macher[index].machine_status === 1) {
-              macher[index].machine_status = "使用机";
+              macher[index].machine_status = '使用机'
             }
             if (macher[index].machine_status === 2) {
-              macher[index].machine_status = "备用机";
+              macher[index].machine_status = '备用机'
             }
             if (macher[index].machine_status === 3) {
-              macher[index].machine_status = "急诊机";
+              macher[index].machine_status = '急诊机'
             }
             if (macher[index].machine_status === 4) {
-              macher[index].machine_status = "报废机";
+              macher[index].machine_status = '报废机'
             }
             if (macher[index].rubbish_reason === 0) {
-              macher[index].rubbish_reason = "";
+              macher[index].rubbish_reason = ''
             }
           }
           // console.log('macher', macher)
-          this.tableData = macher;
+          this.tableData = macher
         }
-      });
+      })
     },
     getTime(time) {
       if (time === 0) {
-        return "";
+        return ''
       } else {
-        return uParseTime(time, "{y}-{m}-{d}");
+        return uParseTime(time, '{y}-{m}-{d}')
       }
     },
     getTotalCount() {
       getTotalCount().then(response => {
         if (response.data.state === 1) {
-          var total = response.data.data.total;
-          // console.log('total ========', total)
-          this.failure_times = total;
+          var total = response.data.data.total
+     
+          this.failure_times = total
         }
-      });
+      })
     }
   },
   created() {
-    this.getAllSubregion();
-    this.getAllEquimentName();
-    this.getTotalCount();
+    this.getAllSubregion()
+    this.getAllEquimentName()
+    this.getTotalCount()
   }
-};
+}
 </script>
 
 <style scoped></style>

src/xt_pages/management/components/PlanForm.vue

@@ -6,10 +6,10 @@
       width="55%"
       center
     >
-      <el-form ref="form" :model="form">
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="设备型号:">
+            <el-form-item label="设备型号:" required prop="device_type">
               <el-select style="width:135px" v-model="form.device_type">
                 <el-option
                   v-for="item in this.DeviceType"
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="消毒时长:">
+            <el-form-item label="消毒时长:" required prop="disinfec_time">
               <el-input
                 style="width:135px"
                 v-model="form.disinfec_time"
@@ -32,7 +32,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="时间:">
+            <el-form-item label="时间:" required prop="time">
               <el-select
                 v-model="form.time"
                 multiple
@@ -52,7 +52,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="班次:">
+            <el-form-item label="班次:" required prop="class_time">
               <el-select
                 v-model="form.class_time"
                 multiple
@@ -211,7 +211,13 @@ export default {
       ],
       DeviceType: [],
       planid: 0,
-      plandata: 0
+      plandata: 0,
+      rules: {
+        device_type: [{ required: true, message: "请输入设备型号" }],
+        disinfec_time: [{ required: true, message: "请输入消毒时长" }],
+        time: [{ required: true, message: "请输入时间" }],
+        class_time: [{ required: true, message: "请输入班次" }]
+      }
     };
   },
   methods: {
@@ -230,9 +236,15 @@ export default {
     savePlan(formName) {
       var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
-      var devicetype = this.form.device_type;
-      var devicetypes = parseInt(devicetype);
-      this.form.device_type = devicetypes;
+      console.log("数据---", this.form.device_type);
+      if (this.form.device_type === "") {
+        this.form.device_type === "";
+      }
+      if (this.form.device_type !== "") {
+        var devicetype = this.form.device_type;
+        var devicetypes = parseInt(devicetype);
+        this.form.device_type = devicetypes;
+      }
 
       var ways = this.form.way;
       var way = parseInt(ways);
@@ -249,27 +261,46 @@ export default {
       var disinfectants = this.form.disinfectant;
       var disinfectant = parseInt(disinfectants);
       this.form.disinfectant = disinfectant;
-      savePlan(this.form, this.equimentid).then(response => {
-        if (response.data.state === 1) {
-          var msg = response.data.data.msg;
-          // console.log('msg', msg);
-          this.$message.success("保存成功");
-          this.dialogVisible = false;
-          this.$emit("getAllPlan");
-          this.$emit("getAllPlanDetail");
-          // 如果保存成功通过状态值改变父组键表格的值
-          this.plandata = 1;
-          this.$emit("func", this.plandata);
-        } else {
-          this.$message.error("该消毒计划已存在");
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          savePlan(this.form, this.equimentid).then(response => {
+            if (response.data.state === 1) {
+              var msg = response.data.data.msg;
+              // console.log('msg', msg);
+              this.$message.success("保存成功");
+              this.form.device_type = "";
+              this.form.disinfec_time = [];
+              this.form.time = [];
+              this.form.class_time = "";
+              this.form.way = 0;
+              this.form.machine_disinfectant = 0;
+              this.form.disinfectant_way = 0;
+              this.form.disinfectant = 0;
+              this.dialogVisible = false;
+              this.$emit("getAllPlan");
+              this.$emit("getAllPlanDetail");
+              // 如果保存成功通过状态值改变父组键表格的值
+              this.plandata = 1;
+              this.$emit("func", this.plandata);
+            } else {
+              this.$message.error("该消毒计划已存在");
+              // this.form.disinfec_time = "";
+              // this.form.time = [];
+              // this.form.class_time = [];
+              // this.form.way = 0;
+              // this.form.machine_disinfectant = 0;
+              // this.form.disinfectant_way = 0;
+              // this.form.disinfectant = 0;
+            }
+          });
         }
       });
     },
     getAllEquitType() {
       getAllEquitType().then(response => {
         if (response.data.state === 1) {
-          var equitname = response.data.data.mode;
-          this.DeviceType = equitname;
+          this.DeviceType = response.data.data.mode;
+          console.log("类型", this.DeviceType);
         }
       });
     }

src/xt_pages/management/components/QualityForm.vue

@@ -1691,7 +1691,7 @@ export default {
           }
           this.tableData = cultures;
           var dialysate = response.data.data.dialysate
-          console.log("dialysate", dialysate);
+          //console.log("dialysate", dialysate);
           for (let index = 0; index < dialysate.length; index++) {
             if (dialysate[index].specimenb === 0) {
               dialysate[index].specimenb = "";

src/xt_pages/management/components/RepairForm.vue

@@ -226,7 +226,7 @@
     <el-dialog
       title="编辑维修记录"
       :visible.sync="dialogVisible"
-      width="65%"
+      width="75%"
       center
     >
       <el-form :model="guaForm" ref="guaForm" :rules="repirRules">
@@ -370,8 +370,11 @@
               </el-upload>
             </el-form-item>
             <a class="el-upload-list__item-name">
-              <i>
-                <a @click="toLink()">{{ filename }}</a>
+              <i style="color:#0000EE">
+                <a :href="guaForm.images" target="_blank">{{ filename }}</a
+                ><span v-show="classShow" @click="hiddenShow"
+                  ><li class="el-icon-circle-close"></li
+                ></span>
               </i>
             </a>
           </el-col>
@@ -423,10 +426,12 @@ import {
   UpdateRepair,
   DeleteRepair,
   queryRepair,
-  DeleteRepairs
+  DeleteRepairs,
+  DeleteImages
 } from "@/api/manage";
 import { uParseTime } from "@/utils/tools";
 import { getFileExtension } from "@/utils/tools";
+import { getToken } from "@/api/qiniu";
 export default {
   name: "RepairForm",
   data() {
@@ -482,7 +487,8 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      filename: ""
+      filename: "",
+      classShow: false
     };
   },
   methods: {
@@ -511,7 +517,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)
+
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
           this.total = total;
@@ -549,6 +555,16 @@ export default {
             if (repair[index].exclude === 3) {
               repair[index].exclude = "未解决";
             }
+
+            if (repair[index].start_time <= 0) {
+              repair[index].start_time = 0;
+            }
+            if (repair[index].arrive_time <= 0) {
+              repair[index].arrive_time = 0;
+            }
+            if (repair[index].finish_time <= 0) {
+              repair[index].finish_time = 0;
+            }
           }
           this.tableData = repair;
         }
@@ -572,22 +588,10 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair", repair);
-          this.guaForm.guarantee_date = uParseTime(
-            repair.guarantee_date,
-            "{y}-{m}-{d}"
-          );
-          this.guaForm.start_time = uParseTime(
-            repair.start_time,
-            "{y}-{m}-{d} {h}:{i}"
-          );
-          this.guaForm.arrive_time = uParseTime(
-            repair.arrive_time,
-            "{y}-{m}-{d} {h}:{i}"
-          );
-          this.guaForm.finish_time = uParseTime(
-            repair.finish_time,
-            "{y}-{m}-{d} {h}:{i}"
-          );
+          this.guaForm.guarantee_date = this.getTime(repair.guarantee_date);
+          this.guaForm.start_time = this.getTimeTwo(repair.start_time);
+          this.guaForm.arrive_time = this.getTimeTwo(repair.arrive_time);
+          this.guaForm.finish_time = this.getTimeTwo(repair.finish_time);
           this.guaForm.total_distance = repair.total_distance;
           this.guaForm.failure_stage = repair.failure_stage;
           this.guaForm.fault_description = repair.fault_description;
@@ -599,28 +603,38 @@ export default {
           this.guaForm.code_information = repair.code_information;
           this.guaForm.id = repair.id;
           this.filename = repair.image_name;
+          if (repair.image_name === "") {
+            this.classShow = false;
+          }
+          if (repair.image_name !== "") {
+            this.classShow = true;
+          }
         }
       });
     },
-    handleSuccess(res, file, fileList) {
-      this.guaForm.images = this.qiniuDomain + res.url;
-      console.log("图片上传", this.guaForm.images);
-      this.$refs.upload.clearFiles();
-      this.filename = file.name;
-      this.guaForm.image_name = file.name;
-    },
     beforeUploadFile(file) {
+      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+      const extension =
+        testmsg === "jpg" ||
+        testmsg === "JPG" ||
+        testmsg === "png" ||
+        testmsg === "PNG" ||
+        testmsg === "gif" ||
+        testmsg === "GIF";
+      if (!extension) {
+        // eslint-disable-next-line no-mixed-spaces-and-tabs
+        this.$message({
+          // eslint-disable-next-line no-mixed-spaces-and-tabs
+          message: "上传文件只能是jpg或者png或者gif格式!",
+          type: "error"
+        });
+        return false; // 必须加上return false; 才能阻止
+      }
       this.filename = file.name;
+      this.classShow = true;
       this.guaForm.image_name = file.name;
       const isLt2M = file.size / 1024 / 1024 <= 2048;
       console.log("filename", file);
-      // console.log('视频大小', file.size / 1024 / 1024)
-      // console.log('isLt2M是什么', isLt2M)
-
-      if (!isLt2M) {
-        this.$message.error("上传视频大小不能超过 2G!");
-        return false;
-      }
       var date = new Date();
       var ext = getFileExtension(file.name);
       var key =
@@ -651,23 +665,26 @@ export default {
           });
       });
     },
-    toLink() {
-      window.location.href = this.guaForm.images;
+    handleSuccess(res, file, fileList) {
+      this.guaForm.images = this.qiniuDomain + res.url;
+      console.log("图片路径", this.guaForm.images);
+      this.$refs.upload.clearFiles();
+      this.filename = file.name;
+      this.guaForm.imageName = file.name;
     },
     UpdateRepair(formName) {
       this.$refs[formName].validate(valid => {
-        this.guaForm.start_time = uParseTime(
-          this.guaForm.start_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
-        this.guaForm.arrive_time = uParseTime(
-          this.guaForm.arrive_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
-        this.guaForm.finish_time = uParseTime(
-          this.guaForm.finish_time,
-          "{y}-{m}-{d} {h}:{i}"
-        );
+        if (this.guaForm.start_time === "") {
+          this.guaForm.start_time = "0";
+        }
+
+        if (this.guaForm.arrive_time === "") {
+          this.guaForm.arrive_time = "0";
+        }
+
+        if (this.guaForm.finish_time === "") {
+          this.guaForm.finish_time = "0";
+        }
 
         if (this.guaForm.failure_stage === "") {
           this.guaForm.failure_stage = 0;
@@ -767,6 +784,33 @@ export default {
           }
         });
       });
+    },
+    hiddenShow() {
+      this.$confirm(
+        "确认要删除所选图片吗? <br>删除后,信息将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        DeleteImages(this.guaForm.id).then(response => {
+          if (response.data.state === 1) {
+            this.filename = "";
+            this.classShow = false;
+            var msg = response.data.data.msg;
+            this.$message.success("删除成功");
+          }
+        });
+      });
+    },
+    getTimeTwo(time) {
+      if (time < 0) {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d} {h}:{i}");
     }
   },
   created() {

src/xt_pages/management/components/UserForm.vue

@@ -1870,10 +1870,10 @@ export default {
               information[index].clean = ''
             }
           }
-          console.log('消毒时间', information)
+         // console.log('消毒时间', information)
           this.tableData = information
           var total = response.data.data.total
-          console.log('total是什么', total)
+         // console.log('total是什么', total)
           this.total = total
         }
       })
@@ -1916,7 +1916,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)
@@ -2238,7 +2238,7 @@ export default {
       changeBed(id).then(response => {
         if (response.data.state === 1) {
           var bed = response.data.data.bed
-          console.log('aa', bed.length)
+         
           if (bed.length !== 0) {
             this.form.bed = ''
             this.bedNumberTwo = bed

src/xt_pages/management/home.vue

@@ -454,55 +454,55 @@
                                   </el-form-item>
                                </el-col>
                                <el-col :span="7">
-                                  <el-form-item label="备注:">
-                                      <el-input style="width:150px" v-model="form.remarks" :disabled="disableFour"></el-input>
-                                  </el-form-item>
+                                   <el-form-item label="消毒方式:">
+                                        <el-select style="width:135px" v-model="form.Disinfection_mode" :disabled="disableFour">
+                                          <el-option
+                                           v-for="item in this.DisinfectionMode"
+                                           :key="item.id"
+                                           :label="item.name"
+                                           :value="item.id"
+                                           ></el-option>
+                                         </el-select>
+                                     </el-form-item>
                                </el-col>
                                <el-col :span="7">
-                                  <el-form-item label="报废日期:">
-                                    <el-date-picker
-                                    v-model="form.rubbish_date"
-                                   prefix-icon="none"
-                                    type="date"
-                                    placeholder="请选择"
-                                    format="yyyy-MM-dd"
-                                     value-format="yyyy-MM-dd"
-                                     style="width:135px"
-                                     :disabled="disableFour">
-                                   </el-date-picker>
-                                 </el-form-item>
+                                    <el-form-item label="备注:">
+                                      <el-input style="width:150px" v-model="form.remarks" :disabled="disableFour"></el-input>
+                                    </el-form-item>
                                 </el-col>
                              </el-row>
                              <el-row>
                                <el-col :span="7">
-                                   <el-form-item label="报废原因:">
-                                     <el-select style="width:150px" v-model="form.rubbish_reason" :disabled="disableFour">
-                                       <el-option v-for="item in this.DisCardResion" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-                                     </el-select>
+                                   <el-form-item label="报废日期:">
+                                     <el-date-picker
+                                       v-model="form.rubbish_date"
+                                       prefix-icon="none"
+                                       type="date"
+                                       placeholder="请选择"
+                                       format="yyyy-MM-dd"
+                                       value-format="yyyy-MM-dd"
+                                       style="width:135px"
+                                       :disabled="disableFour">
+                                    </el-date-picker>
                                    </el-form-item>
                                 </el-col>
                                 <el-col :span="7">
-                                 <el-form-item label="使用年限(年):">
-                                      <el-input style="width:150px" v-model="form.user_year" :disabled="disableFour"></el-input>
-                                 </el-form-item>
+                                    <el-form-item label="报废原因:">
+                                       <el-select style="width:150px" v-model="form.rubbish_reason" :disabled="disableFour">
+                                         <el-option v-for="item in this.DisCardResion" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                                        </el-select>
+                                     </el-form-item>
                                 </el-col>
-                                 <el-col :span="7">
-                                   <el-form-item label="工作时长(h):">
-                                       <el-input style="width:150px" v-model="form.work_time" :disabled="disableFour"></el-input>
-                                   </el-form-item>
+                                 <el-col :span="7">      
+                                    <el-form-item label="使用年限(年):">
+                                      <el-input style="width:150px" v-model="form.user_year" :disabled="disableFour"></el-input>
+                                    </el-form-item>
                                 </el-col>
                              </el-row>
                              <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="消毒方式:">
-                                        <el-select style="width:135px" v-model="form.Disinfection_mode" :disabled="disableFour">
-                                          <el-option
-                                           v-for="item in this.DisinfectionMode"
-                                           :key="item.id"
-                                           :label="item.name"
-                                           :value="item.id"
-                                           ></el-option>
-                                         </el-select>
+                                 <el-col :span="8">
+                                      <el-form-item label="工作时长(h):">
+                                         <el-input style="width:150px" v-model="form.work_time" :disabled="disableFour"></el-input>
                                      </el-form-item>
                                   </el-col>
                                  <el-col :span="8">
@@ -1306,8 +1306,8 @@
                                        <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
                                        <span class="warn" v-show="warnShowTwo">您已一个月未更换,请注意检测</span>
                                      </el-form-item>
-                                      
-                                     </el-col> 
+
+                                     </el-col>
                                    <el-col :span="8">
                                      <el-form-item class="newname" label="名称:">
                                        <el-select v-model="userform.germ_name" placeholder="请选择" style="width:150px">
@@ -1752,7 +1752,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.start_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1767,7 +1767,7 @@
                                           placeholder="请选择"
                                           format="yyyy-MM-dd"
                                           value-format="yyyy-MM-dd"
-                                          style="width:150px">
+                                          style="width:185px">
                                         </el-date-picker> -->
                                          <el-date-picker
                                           type="datetime"
@@ -1775,7 +1775,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.arrive_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1787,7 +1787,7 @@
                                           value-format="yyyy-MM-dd HH:mm"
                                           placeholder="选择时间"
                                           v-model="guaForm.finish_time"
-                                          style="width:150px;">
+                                          style="width:185px;">
                                        </el-date-picker>
                                   </el-form-item>
                                </el-col>
@@ -1864,11 +1864,12 @@
                                       :before-upload="beforeUploadFile"
                                       :limit="1"
                                       ref='upload'
+                                      accept=".jpg,.png,.gif"
                                       >
                                         <el-button size="small" type="primary">上传图片</el-button>
                                       </el-upload>
-                                     <a class="el-upload-list__item-name">
-                                        <i><a @click="toLink()">{{filename}}</a></i>
+                                     <a class="el-upload-list__item-name" v-show="classShow">
+                                        <i style="color:#0000EE"><a :href="guaForm.images" target="_blank">{{filename}}</a><span @click="hiddenShow"><li class="el-icon-circle-close"></li></span></i>
                                      </a>
                                   </el-form-item>
                                </el-col>
@@ -1947,10 +1948,10 @@
          <remander-form ref="remanderform"> </remander-form>
     <!-- 编辑消毒计划 -->
      <el-dialog title="编辑消毒计划" :visible.sync="dialogVisible" width="50%" center>
-       <el-form :model="machineform" ref="machineform">
+       <el-form :model="machineform" ref="machineform" :rules="planRules">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="设备型号:">
+            <el-form-item label="设备型号:" required prop = "device_type">
               <el-select style="width:135px" v-model="machineform.device_type">
                 <el-option
                   v-for="item in this.DeviceType"
@@ -1962,7 +1963,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="消毒时长:">
+            <el-form-item label="消毒时长:" required prop="disinfec_time">
               <el-input style="width:135px" v-model="machineform.disinfec_time"></el-input>
               <span>分钟</span>
             </el-form-item>
@@ -1970,7 +1971,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="时间:">
+            <el-form-item label="时间:" required prop="time">
               <el-select
                 v-model="machineform.time"
                 placeholder="请选择时间"
@@ -1986,7 +1987,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="班次:">
+            <el-form-item label="班次:" required prop="class_time">
               <el-select
                 v-model="machineform.class_time"
                 placeholder="请选择时间"
@@ -2074,7 +2075,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getTimeBeteen, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -2247,7 +2248,14 @@ export default {
           fluid_path: [{ required: true, message: '请填写消毒方式' }],
           disinfectant: [{ required: true, message: '请填写消毒液' }],
           disinfection_status: [{ required: true, message: '消毒状态' }],
-          sign_name: [{ required: true, message: '请填写签名' }]
+          sign_name: [{ required: true, message: '请填写签名', trigger: ['change'] }],
+          classtype: [{ required: true, message: '请填写班次' }]
+        },
+        planRules: {
+          device_type: [{ required: true, message: '请输入设备型号' }],
+          disinfec_time: [{ required: true, message: '请输入消毒时长' }],
+          time: [{ required: true, message: '请输入时间' }],
+          class_time: [{ required: true, message: '请输入班次' }]
         },
         runOption: [
           { id: 1, name: '正常' },
@@ -2540,9 +2548,9 @@ export default {
         disableFour: true,
         disableFive: true,
         runDisable: true,
-        warnShow: true,
-        warnShowTwo: true,
-        warnShowThree: true,
+        warnShow: false,
+        warnShowTwo: false,
+        warnShowThree: false,
         bedZoneThree: [],
         bedNumberTwo: [],
         reverseMode: [
@@ -2554,7 +2562,8 @@ export default {
         deviceMode: [],
         zoneDisabled: false,
         bedid: '',
-        unitType: ''
+        unitType: '',
+        classShow: false
       }
     },
     methods: {
@@ -2656,10 +2665,17 @@ export default {
         getAllMachine(this.forms.zone_id, this.forms.device_type).then(response => {
           if (response.data.state === 1) {
             var addmahcer = response.data.data.addmahcer
-            console.log('addmacher是', addmahcer)
+            console.log('查找的数据', addmahcer)
             this.tableDatatwo = addmahcer
             this.tabIndex = this.$route.query.index
-            this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
+            var id = this.$route.query.id
+            for (let i = 0; i < this.tableDatatwo.length; i++) {
+              if (this.tableDatatwo[i].id == id) {
+                this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                break
+              }
+            }
+            // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
           }
         })
       },
@@ -2681,7 +2697,8 @@ export default {
         // 病人下机后插入数据
         this.getAutoData(val.id)
         this.getTotalNumber(val.id)
-        this.getTimeWarning(val.id)
+        // this.getTimeWarning(val.id)
+        this.getTimeBeteen(val.id)
         this.getData(val.bed_id)
       },
       getAutoData(id) {
@@ -2700,28 +2717,28 @@ export default {
             // console.log('warning', warning)
             var time = this.getTimestamp(this.userform.date) - warning.stime
             // console.log('时间', time)
-            if (time < 2678400 && warning.dialysis_checked === 1) {
-              this.warnShow = false
-            } else {
-              this.warnShow = true
-            }
+            // if (time < 2678400 && warning.dialysis_checked === 1) {
+            //   this.warnShow = false
+            // } else {
+            //   this.warnShow = true
+            // }
             var germ = response.data.data.germ
             // console.log('germ', germ)
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
             // console.log('时间', timetwo)
-            if (timetwo < 2678400 && germ.germ_checked === 1) {
-              this.warnShowTwo = false
-            } else {
-              this.warnShowTwo = true
-            }
+            // if (timetwo < 2678400 && germ.germ_checked === 1) {
+            //   this.warnShowTwo = false
+            // } else {
+            //   this.warnShowTwo = true
+            // }
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
             // console.log('时间', timethree)
-            if (timethree < 2678400 && clean.clean === 1) {
-              this.warnShowThree = false
-            } else {
-              this.warnShowThree = true
-            }
+            // if (timethree < 2678400 && clean.clean === 1) {
+            //   this.warnShowThree = false
+            // } else {
+            //   this.warnShowThree = true
+            // }
             var number = response.data.data.number
             // console.log('number', number)
             this.Number = number
@@ -2833,7 +2850,7 @@ export default {
             this.form.service_manufacturer = addmacher.service_manufacturer
 
             // this.form.unit_type = addmacher.unit_type
-  
+
             this.form.unit_type = parseInt(addmacher.device_mode)
             this.form.use_section = addmacher.use_section
             this.form.section_number = addmacher.section_number
@@ -2853,7 +2870,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-
+            // this.form.device_mode = addmacher.device_mode
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -2964,11 +2981,25 @@ export default {
             // console.log('form', this.form)
             if (response.data.state === 1) {
               var addmacher = response.data.data.addmacher
+              // console.log('addmacher----', addmacher)
               this.$message.success('修改成功')
               // this.$router.push({ path: '/device/home?index=' + this.tabIndex })
-              this.getAllMachine()
-              this.getAllSubregion()
-              // this.$refs.singleTable.setCurrentRow(addmacher)
+              for (let i = 0; i < this.tableDatatwo.length; i++) {
+                if (this.tableDatatwo[i].id == addmacher.id) {
+                  for (let j = 0; j < this.deviceMode.length; j++) {
+                    if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                      addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                    }
+                  }
+  
+                  this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                }
+              }
+              // this.getAllMachine()
+              // this.getAllSubregion()
+              this.$refs.singleTable.setCurrentRow(addmacher)
               this.$forceUpdate()
             }
           })
@@ -3008,8 +3039,23 @@ export default {
                 // eslint-disable-next-line no-unused-vars
                 var addmacher = response.data.data.addmacher
                 this.$message.success('修改成功')
-                this.getAllMachine()
+                for (let i = 0; i < this.tableDatatwo.length; i++) {
+                  if (this.tableDatatwo[i].id == addmacher.id) {
+                    for (let j = 0; j < this.deviceMode.length; j++) {
+                      if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                        addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                      }
+                    }
+  
+                    this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                  }
+                }
+                // this.getAllMachine()
                 this.getAllSubregion()
+                this.$refs.singleTable.setCurrentRow(addmacher)
+                this.$forceUpdate()
               }
             })
           }
@@ -3035,10 +3081,25 @@ export default {
         this.$refs[formName].validate(valid => {
           UpdateMacheineTwo(this.form).then(response => {
             if (response.data.state === 1) {
-              var add = response.data.data.addmacher
+              var addmacher = response.data.data.addmacher
               this.$message.success('修改成功')
-              this.getAllMachine()
+              for (let i = 0; i < this.tableDatatwo.length; i++) {
+                if (this.tableDatatwo[i].id == addmacher.id) {
+                  for (let j = 0; j < this.deviceMode.length; j++) {
+                    if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
+                      addmacher.device_mode = this.deviceMode[j].device_mode
+                      //   this.$forceUpdate()
+                    }
+                  }
+  
+                  this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                }
+              }
+              // this.getAllMachine()
               this.getAllSubregion()
+              this.$refs.singleTable.setCurrentRow(addmacher)
+              this.$forceUpdate()
             }
           })
         })
@@ -3232,7 +3293,7 @@ export default {
         getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            console.log('plandetail', plandetail)
+            // console.log('plandetail', plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3384,11 +3445,16 @@ export default {
         var devicetype = this.machineform.device_type
         var devicetypes = parseInt(devicetype)
         this.machineform.device_type = devicetypes
-
-        var disinfectimes = this.machineform.disinfec_time
-        var disinfectime = parseInt(disinfectimes)
-        this.machineform.disinfec_time = disinfectime
-
+  
+        if (this.machineform.disinfec_time === '') {
+          this.machineform.disinfec_time = ''
+        }
+        if (this.machineform.disinfec_time !== '') {
+          var disinfectimes = this.machineform.disinfec_time
+          var disinfectime = parseInt(disinfectimes)
+          this.machineform.disinfec_time = disinfectime
+        }
+  
         var times = this.machineform.time
         var time = parseInt(times)
         this.machineform.time = time
@@ -3448,7 +3514,6 @@ export default {
             }
 
             DeletePlans({ ids: ids }).then(response => {
-              console.log('ids', ids)
               // eslint-disable-next-line eqeqeq
               if (response.data.state == 1) {
                 // eslint-disable-next-line no-unused-vars
@@ -3744,6 +3809,15 @@ export default {
                 this.userform.end_time = ''
                 this.userform.starttime = ''
                 this.userform.endtime = ''
+                this.userform.date = ''
+                this.userform.classtype = ''
+                this.userform.zone = ''
+                this.userform.patient_name = ''
+                this.userform.sign_name = ''
+                this.userform.bed_number = ''
+                this.userform.hyperfiltratio = ''
+                this.userform.weight_loss = ''
+                this.userform.dialysis_time = ''
                 this.$message.success('添加成功')
                 // this.$refs.child.getInformationData()
               }
@@ -3788,7 +3862,7 @@ export default {
         getUserRegister(id).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 role = response.data.data.role
             // console.log('role', role)
@@ -3816,9 +3890,25 @@ export default {
             // this.userform.dialysis_time = information.dialysis_hour
             // this.userform.hyperfiltratio = information.hyperfiltratio
             // this.userform.weight_loss = information.weight_loss
-            this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
-            this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
-            this.userform.weight_loss = dislysis.weight_loss
+            if (information.hyperfiltratio === '') {
+              this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
+            } else {
+              this.userform.hyperfiltratio = information.hyperfiltratio
+            }
+            if (information.dialysis_hour === '') {
+              this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
+            } else {
+              this.userform.dialysis_time = information.dialysis_hour
+            }
+            // this.userform.dialysis_time = dislysis.actual_treatment_hour + 'h' + dislysis.actual_treatment_minute + 'min'
+            // this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
+            if (information.weight_loss === '') {
+              this.userform.weight_loss = dislysis.weight_loss
+            } else {
+              this.userform.weight_loss = information.weight_loss
+            }
+
+            // this.userform.weight_loss = dislysis.weight_loss
             this.userform.warning_value = information.warning_value
             this.userform.user_total = information.user_total
             if (information.move === 0) {
@@ -3862,7 +3952,7 @@ export default {
               this.userform.germ_checked = false
             }
 
-            if (information.germs_checked === 2) {
+            if (information.germ_checked === 2) {
               this.userform.germ_checked = false
             }
 
@@ -4060,7 +4150,19 @@ export default {
         }
       },
       beforeUploadFile(file) {
+        var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+        const extension = testmsg === 'jpg' || testmsg === 'JPG' || testmsg === 'png' || testmsg === 'PNG' || testmsg === 'gif' || testmsg === 'GIF'
+    	if (!extension) {
+      					// eslint-disable-next-line no-mixed-spaces-and-tabs
+      					this.$message({
+      						// eslint-disable-next-line no-mixed-spaces-and-tabs
+      						message: '上传文件只能是jpg或者png或者gif格式!',
+      						type: 'error'
+          })
+          return false// 必须加上return false; 才能阻止
+        }
         this.filename = file.name
+        this.classShow = true
         this.guaForm.imageName = file.name
         const isLt2M = file.size / 1024 / 1024 <= 2048
         var date = new Date()
@@ -4142,6 +4244,8 @@ export default {
                 this.guaForm.exclude = 0
                 this.guaForm.images = ''
                 this.guaForm.treatment_process = ''
+                this.classShow = false
+                this.guaForm.imageName = ''
               }
             })
           }
@@ -4227,12 +4331,9 @@ export default {
       getTimeWarning(id) {
         getTimeWarning(id).then(response => {
           if (response.data.state === 1) {
-            var information = response.data.data.informations
-            // console.log('码字', information)
-            // console.log('当前时间', this.getTimestamp(this.userform.date))
-            // console.log('存入时间', information.stime)
+            var information = response.data.data.information
             var time = this.getTimestamp(this.userform.date) - information.stime
-            console.log('时间', time)
+            // console.log('时间', time)
             // if (time < 2678400) {
             //   this.warnShow = false
             // }
@@ -4251,6 +4352,38 @@ export default {
           }
         })
       },
+      getTimeBeteen(id) {
+        var todayTime = moment(new Date()).format('YYYY-MM-DD')
+        // console.log('todayTime', todayTime)
+        getTimeBeteen(id, todayTime).then(response => {
+          if (response.data.state === 1) {
+            var timedata = response.data.data.timeData
+            if (timedata.length === 0) {
+              this.warnShow = true
+            }
+            if (timedata.length !== 0) {
+              this.warnShow = false
+            }
+            var todayTimeTwo = response.data.data.timeDataTwo
+            // console.log('todayTimeTwo', todayTimeTwo)
+            if (todayTimeTwo.length === 0) {
+              this.warnShowTwo = true
+            }
+            if (todayTimeTwo.length !== 0) {
+              this.warnShowTwo = false
+            }
+
+            var timeDataThree = response.data.data.timeDataThree
+            console.log('timeDataThree', timeDataThree)
+            if (timeDataThree.length === 0) {
+              this.warnShowThree = true
+            }
+            if (timeDataThree.length !== 0) {
+              this.warnShowThree = false
+            }
+          }
+        })
+      },
       getTimestamp(time) { // 把时间日期转成时间戳
         return (new Date(time)).getTime() / 1000
       },
@@ -4265,6 +4398,7 @@ export default {
       getAllMode() {
         getAllMode().then(response => {
           var mode = response.data.data.mode
+  
           this.deviceMode = mode
         })
       },
@@ -4292,8 +4426,25 @@ export default {
             this.$forceUpdate()
             this.userform.bed_number = zone.id
             this.userform.zone = zone.zone_id
-            console.log('zone', zone)
+            // console.log('zone', zone)
+          }
+        })
+      },
+      hiddenShow() {
+        this.$confirm(
+          '确认要删除所选图片吗? <br>删除后,信息将无法恢复',
+          '删除提示',
+          {
+            dangerouslyUseHTMLString: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           }
+        ).then(() => {
+          this.filename = ''
+          this.guaForm.imageName = ''
+          this.guaForm.images = ''
+          this.classShow = false
         })
       }
     },
@@ -4381,7 +4532,7 @@ export default {
    .a{
      margin-bottom: 10px;
       margin-top: 6px;
-     
+
    }
 
    .b{

src/xt_pages/user/components/PatientForm.vue

@@ -15,12 +15,17 @@
             <el-col :span="7" :key="index">
               <el-form-item
                 :label="item.item_name"
-                v-if="item.range_type==1"
+                v-if="item.range_type == 1"
                 :key="item.item_id"
                 :prop="'formItem.' + index + '.value'"
               >
-                <el-input placeholder="请填入" v-model="item.value" style="width:95%" type="number">
-                  <template slot="append">{{item.unit}}</template>
+                <el-input
+                  placeholder="请填入"
+                  v-model="item.value"
+                  style="width:95%"
+                  type="number"
+                >
+                  <template slot="append">{{ item.unit }}</template>
                 </el-input>
               </el-form-item>
               <el-form-item
@@ -29,7 +34,11 @@
                 :key="item.item_id"
                 :prop="'formItem.' + index + '.value'"
               >
-                <el-select v-model="item.value" placeholder="请选择" style="width:95%">
+                <el-select
+                  v-model="item.value"
+                  placeholder="请选择"
+                  style="width:95%"
+                >
                   <el-option
                     v-for="(optionItem, oidex) in item.select_options"
                     :key="oidex"
@@ -39,7 +48,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="1" :key="'form-col'+index">&nbsp;</el-col>
+            <el-col :span="1" :key="'form-col' + index">&nbsp;</el-col>
           </template>
         </el-row>
       </el-form>
@@ -53,17 +62,26 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div class style="float:right;color: white">
         <el-button
-          :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+          :disabled="
+            $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+              ? true
+              : false
+          "
           type="primary"
-          v-if="this.isEdit==false"
+          v-if="this.isEdit == false"
           @click="resetForm('form')"
           icon="el-icon-circle-plus-outline"
           size="small"
-        >新增</el-button>
+          >新增</el-button
+        >
       </div>
     </div>
 
-    <div v-if="isEdit" class style="float:right;margin-right: 35px;margin-top: 10px">
+    <div
+      v-if="isEdit"
+      class
+      style="float:right;margin-right: 35px;margin-top: 10px"
+    >
       <!-- <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
@@ -83,12 +101,16 @@
         <el-row>
           <el-col :span="20" class="form-table">
             <el-row :span="20">
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="姓名 : " class="is-required" prop="name">
                   <el-input v-model="form.name"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+              <el-col
+                :span="8"
+                :style="isEdit ? 'width:360px' : ''"
+                style="height:59px;"
+              >
                 <el-form-item label="性别 : " class="is-required" prop="gender">
                   <el-radio-group v-model="form.gender" @change="changeGender">
                     <el-radio
@@ -96,20 +118,35 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value"
-                    >{{item.label}}</el-radio>
+                      >{{ item.label }}</el-radio
+                    >
                   </el-radio-group>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="身份证号 : " class="is-required" prop="idCardNo">
-                  <el-input v-model="form.idCardNo" @blur="checkIdCardNo"></el-input>
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="身份证号 : "
+                  class="is-required"
+                  prop="idCardNo"
+                >
+                  <el-input
+                    v-model="form.idCardNo"
+                    @blur="checkIdCardNo"
+                  ></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+              <el-col
+                :span="8"
+                :style="isEdit ? 'width:360px' : ''"
+                style="height:59px;"
+              >
                 <el-form-item label="年龄 : " class="is-required" prop="age">
-                  <el-input v-model="form.age" placeholder="请填写年龄"></el-input>
+                  <el-input
+                    v-model="form.age"
+                    placeholder="请填写年龄"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <template v-if="isEdit">
@@ -121,7 +158,7 @@
                   </el-form-item>
                 </el-col>-->
 
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="透析号 : " class="is-required">
                     <el-input
                       v-model="form.dialysisNo"
@@ -142,7 +179,11 @@
                 </el-col>-->
 
                 <el-col :span="8">
-                  <el-form-item label="透析号 : " class="is-required" prop="dialysisNo">
+                  <el-form-item
+                    label="透析号 : "
+                    class="is-required"
+                    prop="dialysisNo"
+                  >
                     <el-input
                       v-model="form.dialysisNo"
                       placeholder="填写或自动生成"
@@ -150,16 +191,26 @@
                     ></el-input>
                     <el-button
                       style="width:35%;padding:10px 0;"
-                      :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                      :disabled="
+                        $store.getters.xt_user.subscibe.state == 3 ||
+                        !subscibeFlag
+                          ? true
+                          : false
+                      "
                       type="primary"
                       @click="generatedialysisno"
-                    >自动生成</el-button>
+                      >自动生成</el-button
+                    >
                   </el-form-item>
                 </el-col>
               </template>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="出生日期 : " class="is-required" prop="birth">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="出生日期 : "
+                  class="is-required"
+                  prop="birth"
+                >
                   <el-date-picker
                     v-model="form.birth"
                     type="date"
@@ -172,8 +223,12 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="6" :style="isEdit?'width:380px':''">
-                <el-form-item label="首次肾脏治疗时间:" prop="firstDialysisDate" label-width="150px">
+              <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+                <el-form-item
+                  label="首次肾脏治疗时间:"
+                  prop="firstDialysisDate"
+                  label-width="150px"
+                >
                   <el-date-picker
                     v-model="form.firstDialysisDate"
                     type="date"
@@ -182,43 +237,63 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="本人电话 : " class="is-required" prop="phone">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="本人电话 : "
+                  class="is-required"
+                  prop="phone"
+                >
                   <el-input v-model="form.phone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="家属姓名 : ">
-                  <el-input v-model="form.contact_name" maxlength="20"></el-input>
+                  <el-input
+                    v-model="form.contact_name"
+                    maxlength="20"
+                  ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="家属电话 : " prop="homeTelephone">
-                  <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
+                  <el-input
+                    v-model="form.homeTelephone"
+                    maxlength="20"
+                  ></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="患者来源 : " class="is-required" prop="source">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者来源 : "
+                  class="is-required"
+                  prop="source"
+                >
                   <el-radio-group v-model="form.source">
                     <el-radio
                       v-for="item in sourceOptions"
                       :key="item.value"
                       :label="item.value"
                       :value="item.value"
-                    >{{item.label}}</el-radio>
+                      >{{ item.label }}</el-radio
+                    >
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="治疗状态(转归) : "
+                  class="is-required"
+                  prop="lapseto"
+                >
                   <el-radio-group v-model="form.lapseto">
                     <el-radio
                       v-for="item in lapsetoOptions"
                       :key="item.value"
                       :label="item.value"
                       :value="item.value"
-                    >{{item.label}}</el-radio>
+                      >{{ item.label }}</el-radio
+                    >
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -229,15 +304,19 @@
                     <el-radio :label="1">无</el-radio>
                     <el-radio :label="2">有</el-radio>
                   </el-radio-group>
-                  <el-checkbox-group v-model="form.contagions" v-if="form.is_infectious == '2'">
+                  <el-checkbox-group
+                    v-model="form.contagions"
+                    v-if="form.is_infectious == '2'"
+                  >
                     <el-checkbox
                       v-for="item in contagionList"
-                      v-if="item.type==2"
+                      v-if="item.type == 2"
                       :label="item.id"
                       :key="item.id"
                       name="contagions"
                       :value="item.id"
-                    >{{item.name}}</el-checkbox>
+                      >{{ item.name }}</el-checkbox
+                    >
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
@@ -260,14 +339,22 @@
                     value-format="yyyy-MM-dd"
                     v-if="!isEdit"
                   ></el-date-picker>
-                  <el-button type="primary" @click="recordCheck()" v-if="!isEdit">录入检验检查</el-button>
+                  <el-button
+                    type="primary"
+                    @click="recordCheck()"
+                    v-if="!isEdit"
+                    >录入检验检查</el-button
+                  >
                   <!--<el-button type="primary"  v-if="isEdit">查看检验检查</el-button>-->
                 </el-form-item>
               </el-col>
 
               <el-col :span="24">
                 <el-form-item label="传染病周期提醒: ">
-                  <el-radio-group v-model="form.remind_cycle" @change="changeCycle()">
+                  <el-radio-group
+                    v-model="form.remind_cycle"
+                    @change="changeCycle()"
+                  >
                     <el-radio :label="1">一月一次</el-radio>
                     <el-radio :label="2">两月一次</el-radio>
                     <el-radio :label="3">三月一次</el-radio>
@@ -288,38 +375,48 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="民族 : " prop="nation">
                   <el-input v-model="form.nation" maxlength="30"></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="籍贯 : " prop="native_place">
-                  <el-input v-model="form.native_place" maxlength="30"></el-input>
+                  <el-input
+                    v-model="form.native_place"
+                    maxlength="30"
+                  ></el-input>
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="家庭住址 : " prop="homeAddress">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
               </el-col>
 
               <div v-show="!generic_info_fold">
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="别名 : " prop="alias">
                     <el-input v-model="form.alias"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="身高(cm) : " prop="height">
-                    <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>
+                    <el-input
+                      maxlength="5"
+                      v-model="form.height"
+                      @change="checkHeight"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="婚姻状况 : " prop="maritalStatus">
-                    <el-select v-model="form.maritalStatus" placeholder="请选择婚姻状况">
+                    <el-select
+                      v-model="form.maritalStatus"
+                      placeholder="请选择婚姻状况"
+                    >
                       <el-option
                         v-for="item in maritalOptions"
                         :key="item.id"
@@ -329,19 +426,23 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" style="clearfix" :style="isEdit?'width:360px':''">
+                <el-col
+                  :span="8"
+                  style="clearfix"
+                  :style="isEdit ? 'width:360px' : ''"
+                >
                   <el-form-item label="子女情况(个) : " prop="children">
                     <el-input maxlength="5" v-model="form.children"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label=" " style="float:left;" label-width="30px">
                   </el-form-item>-->
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="住院(门诊)号 : ">
                     <el-input v-model="form.admissionNumber"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="医保类型 : " prop="reimbursementWayID">
                     <el-select v-model="form.reimbursementWayID">
                       <el-option
@@ -353,12 +454,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="医保号 : " prop="healthCareNo">
                     <el-input v-model="form.healthCareNo"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="教育程度 : " prop="educationOptions">
                     <el-select v-model="form.education">
                       <el-option
@@ -371,13 +472,16 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="固定电话 : ">
-                    <el-input v-model="form.tell_phone" maxlength="20"></el-input>
+                    <el-input
+                      v-model="form.tell_phone"
+                      maxlength="20"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="费别 : ">
                     <el-select v-model="form.expense_kind">
                       <el-option
@@ -390,23 +494,33 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+                <el-col
+                  :span="8"
+                  :style="isEdit ? 'width:360px' : ''"
+                  style="height:59px;"
+                >
                   <el-form-item label="透析龄(月): ">
                     <el-input v-model="form.dialysis_age"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="亲友电话 : " prop="relative_phone">
-                    <el-input v-model="form.relative_phone" maxlength="20"></el-input>
+                    <el-input
+                      v-model="form.relative_phone"
+                      maxlength="20"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="亲友关系 : " prop="relative_relations">
-                    <el-input v-model="form.relative_relations" maxlength="20"></el-input>
+                    <el-input
+                      v-model="form.relative_relations"
+                      maxlength="20"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="职业 : " prop="profession">
                     <el-select v-model="form.profession">
                       <el-option
@@ -418,12 +532,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="工作单位 : " prop="work">
                     <el-input v-model="form.work"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="单位地址 : " prop="unit_address">
                     <el-input v-model="form.unit_address"></el-input>
                   </el-form-item>
@@ -431,9 +545,11 @@
               </div>
               <el-col :span="24">
                 <el-form-item>
-                  <el-button type="text" @click="generic_info_fold = !generic_info_fold">
-                    {{ generic_info_fold ? '更多资料' :
-                    '收起' }}
+                  <el-button
+                    type="text"
+                    @click="generic_info_fold = !generic_info_fold"
+                  >
+                    {{ generic_info_fold ? "更多资料" : "收起" }}
                     <i class="el-icon--right" :class="generic_fold_icon"></i>
                   </el-button>
                 </el-form-item>
@@ -443,7 +559,11 @@
           <el-col :span="4" align="center">
             <el-upload
               style="width:100%;"
-              :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+              :disabled="
+                $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+                  ? true
+                  : false
+              "
               :data="uploadData"
               class="uploadHead"
               :multiple="false"
@@ -454,14 +574,24 @@
               list-type="picture-card"
               :before-upload="beforeAvatarUpload"
             >
-              <img width="100%" height="100%" v-if="form.avatar" :src="form.avatar" class="avatar" />
+              <img
+                width="100%"
+                height="100%"
+                v-if="form.avatar"
+                :src="form.avatar"
+                class="avatar"
+              />
               <i class="el-icon-plus" v-else></i>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="dialogImageUrl" alt />
             </el-dialog>
             <el-upload
-              :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+              :disabled="
+                $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+                  ? true
+                  : false
+              "
               :data="uploadData"
               :multiple="false"
               action="https://upload.qiniup.com"
@@ -471,13 +601,22 @@
               :before-upload="beforeAvatarUpload"
             >
               <el-button
-                :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                :disabled="
+                  $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+                    ? true
+                    : false
+                "
                 class="uploadHeadBtn"
                 type="primary"
-              >上传头像</el-button>
+                >上传头像</el-button
+              >
             </el-upload>
             <el-form-item>
-              <el-input v-model="form.avatar" type="hidden" placeholder></el-input>
+              <el-input
+                v-model="form.avatar"
+                type="hidden"
+                placeholder
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -548,7 +687,13 @@
           <el-col></el-col>
           <el-col :span="24">
             <el-form-item label prop="remark">
-              <el-input type="textarea" :rows="3" v-model="form.remark" resize="none" placeholder></el-input>
+              <el-input
+                type="textarea"
+                :rows="3"
+                v-model="form.remark"
+                resize="none"
+                placeholder
+              ></el-input>
             </el-form-item>
           </el-col>
           <!--<el-col :span="24">-->
@@ -568,26 +713,31 @@
                   :label="item.id"
                   :key="item.id"
                   :value="item.id"
-                >{{item.name}}</el-checkbox>
+                  >{{ item.name }}</el-checkbox
+                >
               </el-checkbox-group>
             </el-form-item>
           </el-col>
 
           <div v-show="!treat_info_fold">
-            <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院首次透析 : " prop="is_hospital_first_dialysis">
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="is_hospital_first_dialysis"
+              >
                 <el-radio-group v-model="form.is_hospital_first_dialysis">
                   <el-radio
                     v-for="item in isHospitalFirstDialysisOptions"
                     :key="item.value"
                     :label="item.value"
                     :value="item.value"
-                  >{{item.label}}</el-radio>
+                    >{{ item.label }}</el-radio
+                  >
                 </el-radio-group>
               </el-form-item>
             </el-col>
 
-            <el-col :span="6" :style="isEdit?'width:360px':''">
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
               <el-form-item label="首次诊治时间 : ">
                 <el-date-picker
                   v-model="form.first_treatment_date"
@@ -597,35 +747,53 @@
                 ></el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="首次透析医院 : " prop="first_dialysis_hospital">
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="首次透析医院 : "
+                prop="first_dialysis_hospital"
+              >
                 <el-input v-model="form.first_dialysis_hospital"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="透析之前情况 : " prop="predialysis_condition">
+              <el-form-item
+                label="透析之前情况 : "
+                prop="predialysis_condition"
+              >
                 <el-checkbox-group v-model="form.predialysis_condition">
                   <el-checkbox
                     v-for="item in predialysisConditionOptions"
                     :label="item.label"
                     :key="item.value"
                     :value="item.label"
-                  >{{item.label}}</el-checkbox>
+                    >{{ item.label }}</el-checkbox
+                  >
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
-            <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院前透析频率 : " prop="pre_hospital_dialysis_frequency">
-                <el-input v-model="form.pre_hospital_dialysis_frequency"></el-input>
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院前透析频率 : "
+                prop="pre_hospital_dialysis_frequency"
+              >
+                <el-input
+                  v-model="form.pre_hospital_dialysis_frequency"
+                ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院前透析次数 : " prop="pre_hospital_dialysis_times">
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院前透析次数 : "
+                prop="pre_hospital_dialysis_times"
+              >
                 <el-input v-model="form.pre_hospital_dialysis_times"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院首次透析 : " prop="hospital_first_dialysis_date">
+            <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
+              <el-form-item
+                label="本院首次透析 : "
+                prop="hospital_first_dialysis_date"
+              >
                 <el-date-picker
                   v-model="form.hospital_first_dialysis_date"
                   type="date"
@@ -637,8 +805,11 @@
           </div>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="text" @click="treat_info_fold = !treat_info_fold">
-                {{ treat_info_fold ? '更多治疗信息' : '收起' }}
+              <el-button
+                type="text"
+                @click="treat_info_fold = !treat_info_fold"
+              >
+                {{ treat_info_fold ? "更多治疗信息" : "收起" }}
                 <i class="el-icon--right" :class="treat_fold_icon"></i>
               </el-button>
             </el-form-item>
@@ -646,28 +817,43 @@
 
           <el-col :span="24">
             <el-form-item label="登记人员 : ">
-              <span>{{adminusername}}</span>
+              <span>{{ adminusername }}</span>
             </el-form-item>
           </el-col>
 
           <el-col :span="24" align="right">
             <el-form-item>
-              <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
               <el-button
-                :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                @click="$router.back(-1)"
+                icon="el-icon-refresh"
+                size="small"
+                >取消</el-button
+              >
+              <el-button
+                :disabled="
+                  $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+                    ? true
+                    : false
+                "
                 @click="onSubmit('form')"
                 size="small"
                 type="primary"
                 icon="el-icon-setting"
-              >保存</el-button>
+                >保存</el-button
+              >
               <el-button
-                v-if="isEdit==false"
+                v-if="isEdit == false"
                 @click="onReSubmit('form')"
-                :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                :disabled="
+                  $store.getters.xt_user.subscibe.state == 3 || !subscibeFlag
+                    ? true
+                    : false
+                "
                 icon="el-icon-document-add"
                 size="small"
                 type="success"
-              >保存并继续新增</el-button>
+                >保存并继续新增</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -1595,4 +1781,3 @@ export default {
   z-index: 998 !important;
 }
 </style>
-