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

src/api/manage.js

@@ -79,6 +79,7 @@ export function UpdateMachineInfo(data) {
 }
 
 export function UpdateMachineInfoTwo(data) {
+  console.log('data==================',data)
   return request({
     url: '/api/management/updatemachineinfotwo',
     method: 'post',
@@ -110,9 +111,13 @@ export function getAllPlan(params) {
   })
 }
 
-export function getAllPlanDetail(id, params) {
+export function getAllPlanDetail(unitype) {
+  // eslint-disable-next-line no-redeclare
+  const params = {
+    unitype: unitype
+  }
   return request({
-    url: '/api/management/getallplandetail?id=' + id,
+    url: '/api/management/getallplandetail',
     method: 'Get',
     params: params
   })
@@ -208,7 +213,7 @@ export function getAllOrganization(params) {
 }
 
 export function getUserRegister(id, params) {
-  console.log('id是什么================', id)
+
   return request({
     url: '/api/manage/getregisterinfo?id=' + id,
     method: 'Get',
@@ -486,6 +491,7 @@ export function getUserForm(id, limit, page) {
 }
 
 export function UpdateMacheineTwo(data) {
+  console.log("data",data)
   return request({
     url: '/api/manage/updatemacheinettwo',
     method: 'post',

src/xt_pages/management/components/ManageForm.vue

@@ -424,8 +424,8 @@ export default {
       bedShow: true,
       bedShowTwo: false,
       disa: true,
-      buttonShow:true,
-      buttonShowTwo:false,
+      buttonShow: true,
+      buttonShowTwo: false,
     }
   },
   methods: {
@@ -569,29 +569,21 @@ export default {
       var machine_statuss = parseInt(machine_status)
       this.form.machine_status = machine_statuss
 
-      if (this.form.revers_mode === '') {
-        this.form.revers_mode = 0
+      if (this.form.bed_number === '') {
+        this.form.bed_number = 0
       }
-      var revers_mode = this.form.revers_mode
-      var revers_modes = parseInt(revers_mode)
-      this.form.revers_mode = revers_modes
+      var bed_numbers = this.form.bed_number
+      var bed_numberss = parseInt(bed_numbers)
+      this.form.bed_number = bed_numberss
+      console.log('购买日期', this.form.buy_date)
 
       if (this.form.Disinfection_mode === '') {
         this.form.Disinfection_mode = 0
       }
-
       var disinfecction_modes = this.form.Disinfection_mode
       var disinfecction_modess = parseInt(disinfecction_modes)
       this.form.Disinfection_mode = disinfecction_modess
 
-      if (this.form.bed_number === '') {
-        this.form.bed_number = 0
-      }
-      var bed_numbers = this.form.bed_number
-      var bed_numberss = parseInt(bed_numbers)
-      this.form.bed_number = bed_numberss
-      console.log('购买日期', this.form.buy_date)
-
       if (this.form.revers_mode === '') {
         this.form.revers_mode = 0
       }

src/xt_pages/management/components/PlanForm.vue

@@ -14,7 +14,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.unit_type"
+                  :label="item.equitment_name"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -137,9 +137,9 @@
 </template>
 
 <script>
-import { getAllEquimentName, savePlan, getAllEquitType } from "@/api/manage";
+import { getAllEquimentName, savePlan, getAllEquitType } from '@/api/manage';
 export default {
-  name: "PlanForm",
+  name: 'PlanForm',
   props: {
     equimentid: Number
   },
@@ -147,8 +147,8 @@ export default {
     return {
       dialogVisible: false,
       form: {
-        device_type: "",
-        disinfec_time: "",
+        device_type: '',
+        disinfec_time: '',
         time: [],
         class_time: [],
         way: 0,
@@ -158,56 +158,56 @@ export default {
       },
       value: [],
       timeType: [
-        { id: 1, name: "周一" },
-        { id: 2, name: "周二" },
-        { id: 3, name: "周三" },
-        { id: 4, name: "周四" },
-        { id: 5, name: "周五" },
-        { id: 6, name: "周六" },
-        { id: 7, name: "周日" }
+        { id: 1, name: '周一' },
+        { id: 2, name: '周二' },
+        { id: 3, name: '周三' },
+        { id: 4, name: '周四' },
+        { id: 5, name: '周五' },
+        { id: 6, name: '周六' },
+        { id: 7, name: '周日' }
       ],
       classType: [
-        { id: 1, name: "上午" },
-        { id: 2, name: "下午" },
-        { id: 3, name: "晚上" }
+        { id: 1, name: '上午' },
+        { id: 2, name: '下午' },
+        { id: 3, name: '晚上' }
       ],
       // 机表消毒方式
       disinfectType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "擦拭" },
-        { id: 2, name: "化学消毒" }
+        { id: 0, name: '/' },
+        { id: 1, name: '擦拭' },
+        { id: 2, name: '化学消毒' }
       ],
       // 基表消毒液
       disinfectantType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "0.22%季铵盐" },
-        { id: 2, name: "500mg/l含氯消毒剂" },
-        { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 0, name: '/' },
+        { id: 1, name: '0.22%季铵盐' },
+        { id: 2, name: '500mg/l含氯消毒剂' },
+        { id: 3, name: '1000mg/l含氯消毒剂' },
+        { id: 4, name: '1500mg/l含氯消毒剂' }
       ],
       // 夜路消毒方式
       sterilizeType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "热化学消毒" },
-        { id: 2, name: "化学消毒 + 除钙" },
-        { id: 3, name: "热化学消毒 + 除钙" },
-        { id: 4, name: "热消毒" },
-        { id: 5, name: "化学消毒" },
-        { id: 6, name: "除钙" },
-        { id: 7, name: "清洗" }
+        { id: 0, name: '/' },
+        { id: 1, name: '热化学消毒' },
+        { id: 2, name: '化学消毒 + 除钙' },
+        { id: 3, name: '热化学消毒 + 除钙' },
+        { id: 4, name: '热消毒' },
+        { id: 5, name: '化学消毒' },
+        { id: 6, name: '除钙' },
+        { id: 7, name: '清洗' }
       ],
       // 夜路消毒液
       fluidPathType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "20%柠檬酸" },
-        { id: 2, name: "25%柠檬酸" },
-        { id: 3, name: "50%柠檬酸" },
-        { id: 4, name: "50%柠檬酸 + 5%次氯酸钠" },
-        { id: 5, name: "20%柠檬酸 + 10%冰醋酸" },
-        { id: 6, name: "0.2%过氧化乙酸" },
-        { id: 7, name: "10%冰醋酸" },
-        { id: 8, name: "50%冰醋酸" },
-        { id: 9, name: "5%次氯酸钠" }
+        { id: 0, name: '/' },
+        { id: 1, name: '20%柠檬酸' },
+        { id: 2, name: '25%柠檬酸' },
+        { id: 3, name: '50%柠檬酸' },
+        { id: 4, name: '50%柠檬酸 + 5%次氯酸钠' },
+        { id: 5, name: '20%柠檬酸 + 10%冰醋酸' },
+        { id: 6, name: '0.2%过氧化乙酸' },
+        { id: 7, name: '10%冰醋酸' },
+        { id: 8, name: '50%冰醋酸' },
+        { id: 9, name: '5%次氯酸钠' }
       ],
       DeviceType: [],
       planid: 0,
@@ -222,14 +222,14 @@ export default {
       getAllEquimentName().then(response => {
         if (response.data.state === 1) {
           var equit = response.data.data.equit;
-          console.log("equit", equit);
+          console.log('equit', equit);
           // this.DeviceType = equit;
         }
       });
     },
     savePlan(formName) {
       var equimentid = this.equimentid;
-      console.log("equimentid", equimentid);
+      console.log('equimentid', equimentid);
       var devicetype = this.form.device_type;
       var devicetypes = parseInt(devicetype);
       this.form.device_type = devicetypes;
@@ -252,26 +252,27 @@ export default {
       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("保存成功");
+          console.log('msg', msg);
+          this.$message.success('保存成功');
           this.dialogVisible = false;
-          this.$emit("getAllPlan");
-          this.$emit("getAllPlanDetail");
+          this.$emit('getAllPlan');
+          this.$emit('getAllPlanDetail');
           // 如果保存成功通过状态值改变父组键表格的值
           this.plandata = 1;
-          this.$emit("func", this.plandata);
+          this.$emit('func', this.plandata);
         } else {
-          this.$message.error("该消毒计划已存在");
+          this.$message.error('该消毒计划已存在');
         }
       });
     },
     getAllEquitType() {
       getAllEquitType().then(response => {
         if (response.data.state === 1) {
-          var addmacher = response.data.data.addmacher;
-          this.DeviceType = addmacher;
+          var equitname = response.data.data.equitname
+          console.log('equitname=============', equitname)
+          this.DeviceType = equitname
         }
-      });
+      })
     }
   },
   created() {

src/xt_pages/management/components/RepairForm.vue

@@ -63,7 +63,7 @@
           width="55"
         ></el-table-column>
         <el-table-column prop="date" label="机号" width="80" align="center">
-          <template slot-scope="scope">{{ scope.row.bed_id }}</template>
+          <template slot-scope="scope">{{ scope.row.bed_number}}</template>
         </el-table-column>
         <el-table-column
           prop="name"

src/xt_pages/management/components/UserForm.vue

@@ -1621,9 +1621,10 @@ export default {
       getUserForm(id, this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information
-          console.log('洗濯', information)
+          // eslint-disable-next-line no-unused-vars
           var addmacher = response.data.data.addmacher
-          this.bed = addmacher.bed_number
+          // console.log('addmacher', addmacher)
+          // this.bed = addmacher.bed_number
 
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 1) {
@@ -1862,20 +1863,23 @@ export default {
       getBedForm(id).then(response => {
         if (response.data.state === 1) {
           var addmacher = response.data.data.addmacher
+          console.log('addmacher=============', addmacher)
           var number = response.data.data.number
-          console.log('number-------', number)
+          console.log('number',number)
           this.form.zone = addmacher.zone_id
           this.form.bed = addmacher.bed_id
-
+           
           var bed = [{ id: 0, number: '全部' }]
           for (let i = 0; i < number.length; i++) {
             const item = number[i]
             bed.push({ id: item.id, number: item.number })
           }
+          console.log('bed是什么点东西', bed)
           this.bedNumberTwo = bed
         }
       })
     },
+    // eslint-disable-next-line no-dupe-keys
     querySearchAsync(keyword, cb) {
       let key = ''
       if (keyword != undefined) {
@@ -1899,7 +1903,6 @@ export default {
       };
     },
     handleSelect(item) {
-      console.log('item====', item)
       this.userform.patient_id = item.id
       this.userform.patient_name = item.name
     },

src/xt_pages/management/home.vue

@@ -326,6 +326,11 @@
                                   </el-select>
                                  </el-form-item>
                               </el-col>
+                               <el-col :span="7">
+                                   <el-form-item label="机号">
+                                       <el-input style="width:150px" v-model="form.bed_number" :disabled="disableFour"></el-input>
+                                   </el-form-item>
+                               </el-col>
                              </el-row>
                              <el-row>
                                <el-col :span="7">
@@ -466,6 +471,32 @@
                                        <el-input style="width:150px" v-model="form.work_time" :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-form-item>
+                                  </el-col>
+                                 <el-col :span="8">
+                                  <el-form-item label="反渗模式:">
+                                      <el-select style="width:135px" v-model="form.revers_mode" :disabled="disableFour">
+                                        <el-option
+                                            v-for="item in this.reverseMode"
+                                            :key="item.id"
+                                            :label="item.name"
+                                             :value="item.id"
+                                       ></el-option>
+                                       </el-select>
+                                   </el-form-item>
+                                  </el-col>
                              </el-row>
                               <el-row>
                                <div class="but">
@@ -795,7 +826,7 @@
                                         <el-table-column align="center" type="selection" width="55"></el-table-column>
                                         <el-table-column label="型号" align="center" min-width="70px">
                                                 <template slot-scope="scope">
-                                                    {{scope.row.unit_type}}
+                                                    {{scope.row.equitment_name}}
                                                  </template>
                                         </el-table-column>
                                          <el-table-column label="时间" align="center" min-width="70px" >
@@ -1014,7 +1045,7 @@
                                   <el-col :span="8">
                                         <el-form-item label="运行:">
                                            <el-radio-group v-model="userform.run" @change="changeRun">
-                                                <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in runOption" :key="index">{{gender.name}}</el-radio>
+                                                <el-radio :label="gender.id" :value="gender.id" v-for="(gender, index) in runOption" :key="gender.id">{{gender.name}}</el-radio>
                                             </el-radio-group>
                                         </el-form-item>
                                   </el-col>
@@ -1875,7 +1906,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.unit_type"
+                  :label="item.equitment_name"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -1994,7 +2025,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 } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -2062,7 +2093,9 @@ export default {
           work_time: '',
           treat_mode: [],
           treat_type: [],
-          bed: '' // 治疗模式
+          bed: '', // 治疗模式
+          Disinfection_mode: '',
+          revers_mode: ''
         },
         activeName: 'first',
         activeNameTwo: 'first',
@@ -2135,12 +2168,12 @@ export default {
         },
         qualitRules: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
-          sampler: [{ required: true, message: '请填写取样者' }],
+          sampler: [{ required: true, message: '请填写取样者' }]
 
         },
         diaRules: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
-          samplerb: [{ required: true, message: '请填写取样者' }],
+          samplerb: [{ required: true, message: '请填写取样者' }]
         },
         repirRules: {
           guarantee_date: [{ required: true, message: '请填写保修日期' }],
@@ -2361,7 +2394,7 @@ export default {
           detection_unit: '', // 检测单位
           sampler: '', // 取样者
           reporting_date: '', // 报告日期
-          detection_result: '', // 检测结果
+          detection_result: '' // 检测结果
         },
         qualityFormTwo: {
           // 内毒素检测
@@ -2373,7 +2406,7 @@ export default {
           sampling_locationb: '', // 采样部位
           samplerb: '', // 取样者
           reporting_dateb: '', // 出报告日期
-          detection_resultb: '', // 检测结果
+          detection_resultb: '' // 检测结果
         },
         qualityFormThree: {
           detection_unit: '', // 检测单位
@@ -2455,6 +2488,11 @@ export default {
         warnShowThree: false,
         bedZoneThree: [],
         bedNumberTwo: [],
+        reverseMode: [
+          { id: 0, name: '请选择' },
+          { id: 1, name: '单级反渗' },
+          { id: 2, name: '双级反渗' }
+        ]
       }
     },
     methods: {
@@ -2463,7 +2501,7 @@ export default {
           this.runDisable = true
           this.userform.failure_stage = ''
         }
-        if (val===2) {
+        if (val === 2) {
           this.runDisable = false
         }
       },
@@ -2526,7 +2564,6 @@ export default {
             bed.push({ id: item.id, number: item.number })
           }
           this.bedNumberTwo = bed
-          console.log('bed', bed)
           this.bedZoneTwo = zones
           this.bedZoneThree = zoness
           this.bedNumber = numbers
@@ -2558,22 +2595,23 @@ export default {
         })
       },
       handleCurrentChange(val) {
+        console.log('val是什么', val)
         this.currentRow = val
         this.$forceUpdate()
         this.getMachineDetailById(val.id)
         this.equimentid = val.id
         this.userdata = val.id
-        this.getAllPlanDetail(val.id)
+        this.getAllPlanDetail(val.unit_type)
         this.getPatientInfo(val.id)
         // 获取基本信息
         this.getUserRegister(val.id)
-        //病人下机后插入数据
+        // 病人下机后插入数据
         this.getAutoData(val.id)
         this.getTotalNumber(val.id)
         this.getTimeWarning(val.id)
       },
       getAutoData(id) {
-        getAutoData(id).then(response=>{
+        getAutoData(id).then(response => {
           if (response.data.state === 1) {
             var dialysis = response.data.data.dialysis
           }
@@ -2583,14 +2621,15 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
+           // console.log('addmacher======', addmacher)
             if (addmacher.device_type === 1) {
-              this.sShow = false;
-              this.qShow = false;
-              this.tShow = true;
-              this.DisShow = true;
-              this.DioShow = false;
-              this.zhiShow = true;
-              this.zhShow = false;
+              this.sShow = false
+              this.qShow = false
+              this.tShow = true
+              this.DisShow = true
+              this.DioShow = false
+              this.zhiShow = true
+              this.zhShow = false
               this.UserShow = true
               this.Ushow = false
             }
@@ -2714,6 +2753,20 @@ export default {
             this.form.rubbish_reason = addmacher.rubbish_reason
             this.form.user_year = addmacher.user_year
             this.form.work_time = addmacher.work_time
+  
+            // eslint-disable-next-line eqeqeq
+            if (addmacher.disinfection_mode == 0) {
+              this.form.Disinfection_mode = 0
+            } else {
+              this.form.Disinfection_mode = addmacher.disinfection_mode
+            }
+
+            // eslint-disable-next-line eqeqeq
+            if (addmacher.revers_mode == 0) {
+              this.form.revers_mode = 0
+            } else {
+              this.form.revers_mode = addmacher.revers_mode
+            }
             this.getAllSubregion()
           }
         })
@@ -2814,6 +2867,7 @@ export default {
         })
       },
 
+      // eslint-disable-next-line no-irregular-whitespace
       // 更新水处理机
       UpdateMachineInfoTwo(formName) {
         var device_type = this.form.devicetype
@@ -2830,10 +2884,20 @@ export default {
         var machine_status = this.form.machine_status
         var machine_statuss = parseInt(machine_status)
         this.form.machine_status = machine_statuss
-        this.$refs[formName].validate(valid=>{
+  
+        var revers_mode = this.form.revers_mode
+        var revers_modes = parseInt(revers_mode)
+        this.form.revers_mode = revers_modes
+
+        var disinfecction_modes = this.form.Disinfection_mode
+        var disinfecction_modess = parseInt(disinfecction_modes)
+        this.form.Disinfection_mode = disinfecction_modess
+       
+        this.$refs[formName].validate(valid => {
           if (valid) {
-            UpdateMacheineTwo(this.form).then(response=>{
+            UpdateMachineInfoTwo(this.form).then(response => {
               if (response.data.state === 1) {
+                // eslint-disable-next-line no-unused-vars
                 var addmacher = response.data.data.addmacher
                 this.$message.success('修改成功')
                 this.getAllMachine()
@@ -2858,8 +2922,9 @@ export default {
         var machine_status = this.form.machine_status
         var machine_statuss = parseInt(machine_status)
         this.form.machine_status = machine_statuss
-        this.$refs[formName].validate(valid =>{
-          UpdateMacheineTwo(this.form).then(response=>{
+  
+        this.$refs[formName].validate(valid => {
+          UpdateMacheineTwo(this.form).then(response => {
             if (response.data.state === 1) {
               var add = response.data.data.addmacher
               this.$message.success('修改成功')
@@ -2910,17 +2975,18 @@ export default {
       },
       changeMachineStatus(val) {
         if (val === 4) {
-          this.readisable = false;
+          this.readisable = false
         } else {
-          this.readisable = true;
-          this.form.rubbish_date = '';
-          this.form.rubbish_reason = '';
+          this.readisable = true
+          this.form.rubbish_date = ''
+          this.form.rubbish_reason = ''
         }
       },
       getAllPlan() {
         getAllPlan().then(response => {
           if (response.data.state === 1) {
             var plan = response.data.data.plan
+            
             for (let index = 0; index < plan.length; index++) {
               if (plan[index].time === 1) {
                 plan[index].time = '周一'
@@ -3050,10 +3116,11 @@ export default {
           }
         })
       },
-      getAllPlanDetail(id) {
-        getAllPlanDetail(id).then(response => {
+      getAllPlanDetail(unit_type) {
+        getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
+            console.log('plandetail=====================', plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3372,7 +3439,7 @@ export default {
         ChangeClass(this.equimentid, id).then(response => {
           if (response.data.state === 1) {
             var patients = response.data.data.patients
-            console.log('patients', patients)
+           
             if (patients.is_infectious === 0) {
               this.userform.contagion = ''
             }
@@ -3387,10 +3454,10 @@ export default {
             this.userform.patient_id = patients.patient_id
             // this.userform.patient_name = patients.name
             var zone = response.data.data.zone
-            console.log('zone==========', zone)
+            // console.log('zone==========', zone)
             this.userform.zone = zone.id
             var number = response.data.data.number
-            console.log('nubmer', number)
+            // console.log('nubmer', number)
             this.userform.bed_number = number.id
             // this.userform.bed_number = number.number
             var order = response.data.data.order
@@ -3519,13 +3586,16 @@ export default {
         if (this.userform.end_time === '') {
           this.userform.end_time = '0'
         }
+        if (this.userform.user_total === '0') {
+          this.userform.user_total = 0
+        }
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
               if (response.data.state === 1) {
                 // eslint-disable-next-line no-unused-vars
                 var information = response.data.data.information
-
+                var infor = response.data.data.infor
                 this.$message.success('添加成功')
                 // this.$refs.child.getInformationData()
               }
@@ -3567,14 +3637,19 @@ export default {
         getUserRegister(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.information
-            console.log('information========', information)
-
             // eslint-disable-next-line no-unused-vars
             var role = response.data.data.role
             // console.log('role', role)
             // eslint-disable-next-line eqeqeq
+            var dislysis = response.data.data.dislysis
+           
             this.userform.id = information.id
-            this.userform.date = information.date
+            if (information.date == 0) {
+              this.userform.date = moment(new Date()).format('YYYY-MM-DD')
+            } else {
+              this.userform.date = uParseTime(information.date, '{y}-{m}-{d}')
+            }
+
             this.userform.classtype = information.class
             this.userform.zone = information.zone
             this.userform.bed_number = information.bed_number
@@ -3583,15 +3658,22 @@ export default {
             this.userform.patient_id = information.patient_id
             this.userform.contagion = information.contagion
             this.userform.dialysis_mode = information.dialysis_mode
-            this.userform.date = uParseTime(information.date, '{y}-{m}-{d} {h}:{i}')
+
             this.userform.start_time = uParseTime(information.start_time, '{y}-{m}-{d} {h}:{i}')
             this.userform.end_time = uParseTime(information.end_time, '{y}-{m}-{d} {h}:{i}')
-            this.userform.dialysis_time = information.dialysis_hour
-            this.userform.hyperfiltratio = information.hyperfiltratio
-            this.userform.weight_loss = information.weight_loss
+            // 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
             this.userform.warning_value = information.warning_value
             this.userform.user_total = information.user_total
-            this.userform.run = information.move
+            if (information.move == 0) {
+              this.userform.run = 1
+            } else {
+              this.userform.run = information.move
+            }
             this.userform.failure_stage = information.failure_stage
             this.userform.fault_description = information.fault_description
             this.userform.code_information = information.code_information
@@ -3637,7 +3719,6 @@ export default {
             } else {
               this.userform.sign_name = information.admin_user_id
             }
-
             this.$forceUpdate()
           }
         })
@@ -3742,7 +3823,7 @@ export default {
             SaveQualityControl(this.equimentid, this.qualityFormThree).then(response => {
               if (response.data.state === 1) {
                 var ion = response.data.data.ion
-                //console.log('ion', ion)
+                // console.log('ion', ion)
                 this.$message.success('保存成功')
                 this.$refs.child.getAllQulityInfo()
                 this.qualityFormThree.samplerc = ''
@@ -3859,7 +3940,7 @@ export default {
           this.guaForm.finish_time = '0'
         }
 
-        if ( this.guaForm.failure_stage === '') {
+        if (this.guaForm.failure_stage === '') {
           this.guaForm.failure_stage = '0'
         }
 
@@ -3881,8 +3962,8 @@ export default {
                 console.log('reqair', repair)
                 this.$message.success('保存成功')
                 this.$refs.child.getAllRepair()
-                this.guaForm.start_time = '';
-                this.guaForm.arrive_time = '';
+                this.guaForm.start_time = ''
+                this.guaForm.arrive_time = ''
                 this.guaForm.finish_time = ''
                 this.guaForm.total_distance = ''
                 this.guaForm.code_information = ''
@@ -3918,24 +3999,24 @@ export default {
       },
       createFilter(queryString) {
         return (searchArray) => {
-          return (searchArray.id.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
+          return (searchArray.id.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
       },
       handleSelect(item) {
-        console.log('item====', item)
         this.userform.patient_id = item.id
         this.userform.patient_name = item.name
       },
       getAllEquitType() {
         getAllEquitType().then(response => {
           if (response.data.state === 1) {
-            var addmacher = response.data.data.addmacher
-            this.DeviceType = addmacher
+            var equitname = response.data.data.equitname
+            console.log('区号================', equitname)
+            this.DeviceType = equitname
           }
         })
       },
       getTotalNumber() {
-        getTotalNumber(this.equimentid).then(response=>{
+        getTotalNumber(this.equimentid).then(response => {
           if (response.data.state === 1) {
             var total = response.data.data.total
             if (total === '') {
@@ -3948,16 +4029,16 @@ export default {
         })
       },
       getAllpatient() {
-        getAllpatient().then(response=>{
+        getAllpatient().then(response => {
           if (response.data.state === 1) {
             var allpatient = response.data.data.allpatient
-            console.log('all', allpatient)
+          
             this.patientName = allpatient
           }
         })
       },
       getTimeWarning(id) {
-        getTimeWarning(id).then(response=>{
+        getTimeWarning(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.information
             var time = this.userform.date - information.date
@@ -3983,7 +4064,7 @@ export default {
         if (data === 1) {
           this.getAllPlanDetail(this.equimentid)
         }
-      },
+      }
     },
     created() {
       this.getAllSubregion()
@@ -3997,7 +4078,7 @@ export default {
       this.getOrgName()
       this.getAllEquitType()
       this.getAllpatient()
-    },
+    }
   }
 </script>
 <style lang="scss" scoped>