no message

src/api/manage.js

@@ -71,7 +71,6 @@ export function getMachineDetailById(id, params) {
 }
 
 export function UpdateMachineInfo(data) {
-  console.log("data是什么", data);
   return request({
     url: "/api/management/updatemachineinfo",
     method: "Post",
@@ -87,11 +86,110 @@ export function getAllEquimentName(params) {
   });
 }
 
-export function savePlan(data) {
+export function savePlan(data, id) {
   console.log("data是什么", data);
+  console.log("id", id);
+  return request({
+    url: "/api/management/saveplan?id=" + id,
+    method: "Post",
+    data: data
+  });
+}
+
+export function getAllPlan(params) {
+  return request({
+    url: "/api/management/getallplan",
+    method: "Get",
+    params: params
+  });
+}
+
+export function getAllPlanDetail(id, params) {
+  return request({
+    url: "/api/management/getallplandetail?id=" + id,
+    method: "Get",
+    params: params
+  });
+}
+
+export function getEditMachine(id, params) {
+  return request({
+    url: "/api/management/geteditmachine?id=" + id,
+    method: "Get",
+    params: params
+  });
+}
+
+export function DeletePlans(data) {
+  return request({
+    url: "/api/staff/deleteplans",
+    method: "delete",
+    data: data
+  });
+}
+
+export function EditPlanDetail(id, params) {
+  return request({
+    url: "/api/manage/editplandetail?id=" + id,
+    method: "get",
+    params: params
+  });
+}
+
+export function UpdatePlanInfo(data) {
   return request({
-    url: "/api/management/saveplan",
+    url: "/api/manage/updateplaninfo",
     method: "Post",
     data: data
   });
 }
+
+export function getComprehensive(params) {
+  return request({
+    url: "/api/manage/getcomprehensive",
+    method: "Get",
+    params: params
+  });
+}
+
+export function SaveInformation(data) {
+  return request({
+    url: "/api/manage/saveinformation",
+    method: "Post",
+    data: data
+  });
+}
+
+export function getPatientInfo(id, params) {
+  return request({
+    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",
+    params: params
+  });
+}
+
+export function changePatient(equitid, id) {
+  console.log("equitid", equitid);
+  console.log("id", id);
+  const params = {
+    equitid: equitid,
+    id: id
+  };
+  return request({
+    url: "/api/manage/changepatient",
+    method: "Get",
+    params: params
+  });
+}

src/router/modules/device.js

@@ -11,47 +11,49 @@ export default {
     title: 'deviceManage',
     icon: 'shebei'
   },
-  children: [{
-    path: '/device/zones',
-    component: () => import('@/xt_pages/device/zone_main'),
-    name: 'deviceZoneManage',
-    meta: {
-      title: 'deviceZoneManage'
+  children: [
+    {
+      path: '/device/zones',
+      component: () => import('@/xt_pages/device/zone_main'),
+      name: 'deviceZoneManage',
+      meta: {
+        title: 'deviceZoneManage'
+      }
+    },
+    {
+      path: '/device/groups',
+      component: () => import('@/xt_pages/device/group_main'),
+      name: 'deviceGroupManage',
+      meta: {
+        title: 'deviceGroupManage'
+      }
+    },
+    {
+      path: '/device/numbers',
+      component: () => import('@/xt_pages/device/number_main'),
+      name: 'deviceNumberManage',
+      meta: {
+        title: 'deviceNumberManage'
+      }
+    },
+    {
+      path: '/device/main',
+      // component: () => import("@/xt_pages/management/index"),
+      component: () => import('@/xt_pages/device/main'),
+      name: 'dialysisMachineManage',
+      meta: {
+        title: 'dialysisMachineManage'
+      }
+    },
+    {
+      path: '/device/home',
+      component: () => import('@/xt_pages/management/home'),
+      name: 'managementHome',
+      is_menu: false,
+      hidden: true,
+      meta: {
+        title: '设备管理详情页'
+      }
     }
-  },
-  {
-    path: '/device/groups',
-    component: () => import('@/xt_pages/device/group_main'),
-    name: 'deviceGroupManage',
-    meta: {
-      title: 'deviceGroupManage'
-    }
-  },
-  {
-    path: '/device/numbers',
-    component: () => import('@/xt_pages/device/number_main'),
-    name: 'deviceNumberManage',
-    meta: {
-      title: 'deviceNumberManage'
-    }
-  },
-  {
-    path: '/device/main',
-    component: () => import('@/xt_pages/management/index'),
-    name: 'dialysisMachineManage',
-    meta: {
-      title: 'dialysisMachineManage'
-    }
-  },
-  {
-    path: '/device/home',
-    component: () => import('@/xt_pages/management/home'),
-    name: 'managementHome',
-    is_menu: false,
-    hidden: true,
-    meta: {
-      title: '设备管理详情页'
-    }
-  }
   ]
 }

src/xt_pages/data/printTemplate.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container" style="text-align: center">
-     <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
+      <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
       <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
           <div>
@@ -71,7 +71,8 @@
 
         url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
         imgs_one: [
-          'https://images.shengws.com/template_one.jpg'
+          // 'https://images.shengws.com/template_one.jpg'
+          'https://images.shengws.com/fangji.jpg'
         ],
         imgs_two: [
           'https://images.shengws.com/template_two.jpg'

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -418,7 +418,7 @@
                       <div class="under_line" style="width: 40px;">
                         {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:''}}
                       </div>
-                      ml
+                      L
                     </div>
                     <div class="inline_block" style="margin-left: 15px;">
                       透后体重：
@@ -493,9 +493,9 @@
                   </div>
                   <div class="row" style="padding: 2px 0;">
                     <div>透析小结:
-                    <div style="width:95%;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;">
-                      {{record.summer&&record.summer.dialysis_summary.length>0?record.summer.dialysis_summary:''}}
-                    </div>
+                      <div style="width:95%;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;">
+                        {{record.summer&&record.summer.dialysis_summary.length>0?record.summer.dialysis_summary:''}}
+                      </div>
                     </div>
                   </div>
 

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

@@ -7,6 +7,8 @@
       :modal-append-to-body="false"
       :append-to-body="true"
     >
+      <el-button @click="handlePatientInfo">{{patient.name}}</el-button>
+
       <el-form ref="dialysisPrescription" :model="dialysisPrescription" label-width="148px">
         <el-row :gutter="24">
           <el-col :span="8" v-if="isShows('透析模式')">
@@ -489,6 +491,12 @@
                 <el-button type="primary" @click="handleAdviceCommit">保 存</el-button>
     </span>
     </el-dialog>
+
+
+
+
+
+
   </div>
 
 </template>
@@ -1798,6 +1806,11 @@
           this.huShow = true
           this.totalShow = true
         }
+      },handlePatientInfo(){
+
+
+
+
       }
     },
     created() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -194,45 +194,6 @@
                     <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==5">
                       HF
                     </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==6">
-                      SCUF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==7">
-                      IUF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==8">
-                      HFHD
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==9">
-                      HFHD+HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==10">
-                      PHF
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==11">
-                      HFR
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==12">
-                      HDF+HP
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==13">
-                      CRRT
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==14">
-                      腹水回输
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==15">
-                      HD前置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==16">
-                      HD后置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==17">
-                      HDF前置换
-                    </div>
-                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==18">
-                      HDF后置换
-                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">
@@ -378,31 +339,31 @@
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
                   透析机号：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}
-                    </div>
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                    {{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}
                   </div>
                 </div>
-              </td>
-            </tr>
-            <tr>
-              <td style="padding: 0; position: relative;" colspan="2">
-                <table class="inside_table">
-                  <tbody>
-                    <tr><td :colspan="(prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12) ? 12 :11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
-                    <tr>
-                      <td width="60">时间</td>
-                      <td width="60">血压<br/>(mmHg)</td>
-                      <td width="50">脉搏<br>(次/分)</td>
-                      <td width="50">呼吸<br/>(次/分)</td>
-                      <td width="50">血流量<br/>(ml/min)</td>
-                      <td width="50">静脉压<br/>(mmHg)</td>
-                      <td width="50">跨膜压<br/>(mmHg)</td>
-                      <td width="60">透析液温度(°C)</td>
-                      <td width="50">电导度<br/>(ms/cm)</td>
-                      <td width="50">超滤量<br/>(ml)</td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50">置换量<br/>(ml)</td>
-                      <td width="200">病情变化及处理</td>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 0; position: relative;" colspan="2">
+              <table class="inside_table">
+                <tbody>
+                <tr><td :colspan="(prescription.mode_id==2 || prescription.mode_id==5) ? 12 :11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
+                <tr>
+                  <td width="60">时间</td>
+                  <td width="60">血压<br/>(mmHg)</td>
+                  <td width="50">脉搏<br>(次/分)</td>
+                  <td width="50">呼吸<br/>(次/分)</td>
+                  <td width="50">血流量<br/>(ml/min)</td>
+                  <td width="50">静脉压<br/>(mmHg)</td>
+                  <td width="50">跨膜压<br/>(mmHg)</td>
+                  <td width="60">透析液温度(°C)</td>
+                  <td width="50">电导度<br/>(ms/cm)</td>
+                  <td width="50">超滤量<br/>(ml)</td>
+                  <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">置换量<br/>(ml)</td>
+                  <td width="200">病情变化及处理</td>
 
                       <!-- <td width="100">时间</td>
                       <td width="30">T<br>C°</td>
@@ -417,68 +378,68 @@
                       <td  width="100">护士签名</td> -->
                     </tr>
 
-                    <tr v-for="(monitor,monindex) in monitors" :key="monindex">
-                      <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
-                      <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure+'/':''}}{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</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.venous_pressure?monitor.venous_pressure:''}}</td>
-                      <td>{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:0}}</td>
-                      <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
-                      <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
-                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
-                      <td style="line-height:16px;padding:0px;">
-                        <div style="min-height:35px;line-height:35px; overflow:hidden;">
+                <tr v-for="(monitor,monindex) in monitors" :key="monindex">
+                  <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
+                  <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure+'/':''}}{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</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.venous_pressure?monitor.venous_pressure:''}}</td>
+                  <td>{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:0}}</td>
+                  <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
+                  <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
+                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
+                  <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
+                  <td style="line-height:16px;padding:0px;">
+                    <div style="min-height:35px;line-height:35px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="monindex == 0">【开始透析】</template>
                             {{monitor.end}}
                             {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}
                           </span>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr v-for="(monitor,monindex) in monitors2" :key="monindex">
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td> </td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50"></td>
-                      <td style="line-height:16px;padding:0px;"><div style="height:40px;line-height:20px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> </span> </div></td>
-                    </tr>
-                  </tbody>
-                </table>
-              </td>
-            </tr>
-            <tr>
-              <td style="padding: 0; position: relative;" colspan="2">
-                <table class="inside_table">
-                  <tbody>
-                    <tr style="line-height:35px;padding:8px 5px;">
-                      <td colspan="7" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">医嘱内容</td>
-                    </tr>
-                    <!-- <tr style="line-height:35px;padding:8px 5px;">
-                      <td colspan="4" style="font-size: 16px">开医嘱</td>
-                      <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                    </tr> -->
-                    <tr style="line-height:35px;padding:8px 5px;">
-                      <td style="font-size: 16px" width="10%">时间</td>
-                      <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
-                      <td style="font-size: 16px" width="10%">医生签名</td>
-                      <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
-                      <td style="font-size: 16px" width="10%">执行人签名</td>
-                      <td style="font-size: 16px" width="10%">时间</td>
-                    </tr>
-                    <!-- <template v-for="group in doctor_advices" > -->
-                      <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index" >
-                        <td height="32px" >
+                    </div>
+                  </td>
+                </tr>
+                <tr v-for="(monitor,monindex) in monitors2" :key="monindex">
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td> </td>
+                  <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50"></td>
+                  <td style="line-height:16px;padding:0px;"><div style="height:40px;line-height:20px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> </span> </div></td>
+                </tr>
+                </tbody>
+              </table>
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 0; position: relative;" colspan="2">
+              <table class="inside_table">
+                <tbody>
+                <tr style="line-height:35px;padding:8px 5px;">
+                  <td colspan="7" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">医嘱内容</td>
+                </tr>
+                <!-- <tr style="line-height:35px;padding:8px 5px;">
+                  <td colspan="4" style="font-size: 16px">开医嘱</td>
+                  <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
+                </tr> -->
+                <tr style="line-height:35px;padding:8px 5px;">
+                  <td style="font-size: 16px" width="10%">时间</td>
+                  <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
+                  <td style="font-size: 16px" width="10%">医生签名</td>
+                  <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                  <td style="font-size: 16px" width="10%">执行人签名</td>
+                  <td style="font-size: 16px" width="10%">时间</td>
+                </tr>
+                <!-- <template v-for="group in doctor_advices" > -->
+                <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index" >
+                  <td height="32px" >
                             <span v-if="advice.start_time">
                               {{getTime(advice.start_time,'{h}:{i}')}}
                             </span>
@@ -678,7 +639,7 @@
                   </div>
                   次/分
                 </div>
-                <div class="inline_block" style="margin-left:10px;flex:1.5;">
+                <div class="inline_block" style="margin-left:10px;flex:1;">
                   BP：
                   <div class="under_line" style="width: 50px;text-align: center;">
                     {{afterdialysis.systolic_blood_pressure?afterdialysis.systolic_blood_pressure:'/'}}
@@ -689,17 +650,6 @@
                   </div>
                   mmHg
                 </div>
-                <div class="inline_block" style="margin-left:10px;flex:1.5;">
-                  实际治疗时间：
-                  <div class="under_line" style="width: 30px;text-align: center">
-                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
-                  </div>
-                  h
-                  <div class="under_line" style="width: 30px;text-align: center">
-                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
-                  </div>
-                  min
-                </div>
               </div>
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex:2;">
@@ -708,9 +658,9 @@
                     {{afterdialysis.cruor?afterdialysis.cruor:'/'}}
                   </div>
                 </div>
-                <div class="inline_block" style="flex:2;">
+                <div class="inline_block" style="flex:1;">
                   内瘘：
-                  <div class="under_line" style="width: 200px;text-align: center">
+                  <div class="under_line" style="width: 70px;text-align: center">
                     {{afterdialysis.internal_fistula?afterdialysis.internal_fistula:'/'}}
                   </div>
                 </div>
@@ -720,7 +670,17 @@
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
                   </div>
                 </div>
-                
+                <div class="inline_block" style="flex:1.5;">
+                  实际治疗时间：
+                  <div class="under_line" style="width: 30px;text-align: center">
+                    {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
+                  </div>
+                  h
+                  <div class="under_line" style="width: 30px;text-align: center">
+                    {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
+                  </div>
+                  min
+                </div>
               </div>
 
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

src/xt_pages/management/components/EditMachineForm.vue

@@ -0,0 +1,243 @@
+<template>
+  <div id="edit-machine-form">
+    <el-dialog title="编辑消毒计划" :visible.sync="dialogVisible" width="44%" center>
+      <el-form :model="form" ref="form">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="设备型号:">
+              <el-select style="width:135px" v-model="form.device_type">
+                <el-option
+                  v-for="item in this.DeviceType"
+                  :key="item.id"
+                  :label="item.equitment_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="消毒时长:">
+              <el-input style="width:135px" v-model="form.disinfec_time"></el-input>
+              <span>分钟</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="时间:">
+              <el-select
+                v-model="form.time"
+                multiple
+                filterable
+                allow-create
+                default-first-option
+                placeholder="请选择时间"
+              >
+                <el-option
+                  v-for="item in this.timeType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="班次:">
+              <el-select
+                v-model="form.class_time"
+                multiple
+                filterable
+                allow-create
+                default-first-option
+                placeholder="请选择时间"
+              >
+                <el-option
+                  v-for="item in this.classType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="机表消毒方式:">
+              <el-select style="width:135px" v-model="form.way">
+                <el-option
+                  v-for="item in this.disinfectType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="机表消毒液:">
+              <el-select
+                style="width:135px"
+                v-model="form.machine_disinfectant"
+                @change="changeDeviceType"
+              >
+                <el-option
+                  v-for="item in this.disinfectantType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="液路消毒方式:">
+              <el-select style="width:135px" v-model="form.disinfectant_way">
+                <el-option
+                  v-for="item in this.sterilizeType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="液路消毒液:">
+              <el-select style="width:135px" v-model="form.disinfectant">
+                <el-option
+                  v-for="item in this.fluidPathType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getAllEquimentName, getEditMachine } from "@/api/manage";
+export default {
+  name: "EditMachineForm",
+  props: {
+    planData: {
+      type: Array,
+      default: function() {
+        return {
+          newPlanid: 0
+        };
+      }
+    },
+    planid: Number
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      DeviceType: [],
+      form: {
+        device_type: "",
+        disinfec_time: "",
+        time: [],
+        class_time: [],
+        way: "",
+        machine_disinfectant: "",
+        disinfectant_way: "",
+        disinfectant: ""
+      },
+      timeType: [
+        { 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: "晚上" }
+      ],
+      // 基表消毒方式
+      disinfectType: [{ id: 1, name: "擦拭" }, { id: 2, name: "化学消毒" }],
+      // 基表消毒液
+      disinfectantType: [
+        { id: 1, name: "0.22%季铵盐" },
+        { id: 2, name: "500mg/l含氯消毒剂" },
+        { id: 3, name: "1000mg/l含氯消毒剂" },
+        { id: 4, name: "1500mg/l含氯消毒剂" }
+      ],
+      // 夜路消毒方式
+      sterilizeType: [
+        { id: 1, name: "热化学消毒" },
+        { id: 2, name: "化学消毒 + 除钙" },
+        { id: 3, name: "热化学消毒 + 除钙" },
+        { id: 4, name: "热消毒" },
+        { id: 5, name: "化学消毒" },
+        { id: 6, name: "除钙" },
+        { id: 7, name: "清洗" }
+      ],
+      // 夜路消毒液
+      fluidPathType: [
+        { 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%次氯酸钠" }
+      ]
+    };
+  },
+  methods: {
+    open: function() {
+      this.dialogVisible = true;
+    },
+    getAllEquimentName() {
+      getAllEquimentName().then(response => {
+        if (response.data.state === 1) {
+          var equit = response.data.data.equit;
+          console.log("equit", equit);
+          this.DeviceType = equit;
+        }
+      });
+    },
+    getEditMachine(id) {
+      getEditMachine(id).then(response => {
+        if (response.data.state === 1) {
+        }
+      });
+    }
+  },
+  created() {
+    this.getAllEquimentName();
+    console.log("planid是什么东西===========================", this.newPlanid);
+    this.getEditMachine(this.planid);
+  },
+  mounted() {
+    this.newPlanid = this.planid;
+  },
+  watch: {
+    planid(newV, oldV) {
+      this.newPlanid = this.planid;
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>

src/xt_pages/management/components/ManageForm.vue

@@ -35,7 +35,12 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="机位号:" prop="bed_number" v-show="bedShow">
+            <el-form-item
+              label="机位号:"
+              required
+              prop="bed_number"
+              v-show="bedShow"
+            >
               <el-select style="width:135px" v-model="form.bed_number">
                 <el-option
                   v-for="item in this.bedNumber"
@@ -75,7 +80,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="设备型号:" prop="unit_type">
+            <el-form-item label="设备型号:" required prop="unit_type">
               <el-input style="width:135px" v-model="form.unit_type"></el-input>
             </el-form-item>
           </el-col>
@@ -401,7 +406,9 @@ export default {
       rules: {
         serial_number: [{ required: true, message: "请填写序列号" }],
         device_name: [{ required: true, message: "请填写序列号" }],
-        device_type: [{ required: true, message: "请填写设备类型" }]
+        device_type: [{ required: true, message: "请填写设备类型" }],
+        unit_type: [{ required: true, message: "请填写设备型号" }],
+        bed_number: [{ required: true, message: "请填写机位号" }]
       },
       DisinfectionShow: false,
       reverseShow: false,
@@ -452,6 +459,7 @@ export default {
         this.allShow = false;
         this.treatShow = false;
         this.reverseShow = true;
+        this.bedShow = true;
       }
 
       if (val === 3) {

src/xt_pages/management/components/MultipleForm.vue

@@ -0,0 +1,432 @@
+<template>
+  <div>
+    <el-dialog
+      title="综合查询"
+      :visible.sync="dialogVisible"
+      width="95%"
+      center
+    >
+      <el-form>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="透析分区:">
+              <el-select style="width:120px" v-model="form.zone">
+                <el-option
+                  v-for="item in this.DeviceType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="机号:">
+              <el-select style="width:120px" v-model="form.device_number">
+                <el-option
+                  v-for="item in this.Numbers"
+                  :key="item.id"
+                  :label="item.number"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备类型:">
+              <el-select style="width:120px" v-model="form.device_type">
+                <el-option
+                  v-for="item in this.EquitmentType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备型号:">
+              <el-select style="width:120px" v-model="form.device_model">
+                <el-option
+                  v-for="item in this.EquitmentName"
+                  :key="item.id"
+                  :label="item.equitment_name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="使用年限:">
+              <el-select style="width:90px" v-model="form.user_year">
+                <el-option
+                  v-for="item in this.userYear"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">日期查询</span> : </label>
+              <el-date-picker
+                size="small"
+                clearable
+                v-model="form.start_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+              <span class="cellLine"> - </span>
+              <el-date-picker
+                size="small"
+                clearable
+                v-model="form.end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="合计:">
+              故障次数
+              <span>{{ failure_times }}</span
+              >次
+              <!-- <el-input style="width:90px"></el-input> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" size="medium" @click="getComprehensive()"
+              >查询</el-button
+            >
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-table :data="tableData" border style="width: 100%">
+            <el-table-column prop="date" label="序号" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.id }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="分区" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="序列号"
+              width="80"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.serial_number }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="设备类型"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_type }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="机号"
+              width="80"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.bed_number }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="设备名称"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_name }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="设备型号"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.device_type }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="启用日期"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ getTime(scope.row.start_date) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="保修期限"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.guarantee_date }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="机器状态"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.machine_status }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="报废日期"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ getTime(scope.row.rubbish_date) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="报废原因"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.rubbish_reason }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="使用年限"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.user_year }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="工作时长"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.work_time }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="使用次数"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.user_total }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="故障次数"
+              width="100"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ failure_times }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getAllSubregion,
+  getAllEquimentName,
+  getComprehensive
+} from "@/api/manage";
+import { uParseTime } from "@/utils/tools";
+export default {
+  name: "MultipleForm",
+  data() {
+    return {
+      failure_times: 0,
+      dialogVisible: false,
+      form: {
+        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年以上" }
+      ],
+      value1: "",
+      value2: "",
+      tableData: [],
+      EquitmentType: [
+        { id: 0, name: "全部" },
+        { id: 1, name: "透析机" },
+        { id: 2, name: "水处理机" },
+        { id: 3, name: "其他" }
+      ],
+      DeviceType: [{ id: 0, name: "不限" }],
+      Numbers: [{ id: 0, number: "不限" }],
+      EquitmentName: [{ id: 0, equitment_name: "全部" }],
+      runOptions: [
+        { value: "1", label: "正常" },
+        { value: "2", label: "故障" }
+      ]
+    };
+  },
+  methods: {
+    open: function() {
+      this.dialogVisible = true;
+    },
+    getAllSubregion() {
+      getAllSubregion().then(response => {
+        if (response.data.state === 1) {
+          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 });
+          }
+          this.DeviceType = zones;
+          console.log("zones是什么", zone);
+
+          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 });
+          }
+          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: "全部" }];
+          for (let index = 0; index < equit.length; index++) {
+            const item = equit[index];
+            equits.push({ id: item.id, equitment_name: item.equitment_name });
+          }
+          this.EquitmentName = equits;
+        }
+      });
+    },
+    getComprehensive() {
+      const params = {
+        zone: this.form.zone,
+        number: this.form.device_number,
+        devicetype: this.form.device_type,
+        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;
+          for (let index = 0; index < macher.length; index++) {
+            if (macher[index].device_type === 1) {
+              macher[index].device_type = "透析机";
+            }
+            if (macher[index].device_type === 2) {
+              macher[index].device_type = "水处理机";
+            }
+            if (macher[index].device_type === 3) {
+              macher[index].device_type = "其他";
+            }
+
+            if (macher[index].machine_status === 1) {
+              macher[index].machine_status = "使用机";
+            }
+            if (macher[index].machine_status === 2) {
+              macher[index].machine_status = "备用机";
+            }
+            if (macher[index].machine_status === 3) {
+              macher[index].machine_status = "急诊机";
+            }
+            if (macher[index].machine_status === 4) {
+              macher[index].machine_status = "报废机";
+            }
+
+            if (macher[index].start_date === 0) {
+              macher[index].start_date = "";
+            }
+            if (macher[index].rubbish_date === 0) {
+              macher[index].rubbish_date = "";
+            }
+          }
+          console.log("macher", macher);
+          this.tableData = macher;
+        }
+      });
+    },
+    getTime(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    }
+  },
+  created() {
+    this.getAllSubregion();
+    this.getAllEquimentName();
+  }
+};
+</script>
+
+<style scoped></style>

src/xt_pages/management/components/PlanForm.vue

@@ -1,6 +1,11 @@
 <template>
   <div id="plan-form">
-    <el-dialog title="新增计划" :visible.sync="dialogVisible" width="44%" center>
+    <el-dialog
+      title="新增计划"
+      :visible.sync="dialogVisible"
+      width="50%"
+      center
+    >
       <el-form ref="form" :model="form">
         <el-row>
           <el-col :span="10">
@@ -17,7 +22,10 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="消毒时长:">
-              <el-input style="width:135px" v-model="form.disinfec_time"></el-input>
+              <el-input
+                style="width:135px"
+                v-model="form.disinfec_time"
+              ></el-input>
               <span>分钟</span>
             </el-form-item>
           </el-col>
@@ -80,7 +88,6 @@
               <el-select
                 style="width:135px"
                 v-model="form.machine_disinfectant"
-                @change="changeDeviceType"
               >
                 <el-option
                   v-for="item in this.disinfectantType"
@@ -131,6 +138,9 @@
 import { getAllEquimentName, savePlan } from "@/api/manage";
 export default {
   name: "PlanForm",
+  props: {
+    equimentid: Number
+  },
   data() {
     return {
       dialogVisible: false,
@@ -159,13 +169,19 @@ export default {
         { id: 2, name: "下午" },
         { id: 3, name: "晚上" }
       ],
-      disinfectType: [{ id: 1, name: "擦拭" }, { id: 2, name: "化学消毒" }],
+      // 基表消毒方式
+      disinfectType: [
+        { id: 1, name: "擦拭" },
+        { id: 2, name: "化学消毒" }
+      ],
+      // 基表消毒液
       disinfectantType: [
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" }
       ],
+      // 夜路消毒方式
       sterilizeType: [
         { id: 1, name: "热化学消毒" },
         { id: 2, name: "化学消毒 + 除钙" },
@@ -175,6 +191,7 @@ export default {
         { id: 6, name: "除钙" },
         { id: 7, name: "清洗" }
       ],
+      // 夜路消毒液
       fluidPathType: [
         { id: 1, name: "20%柠檬酸" },
         { id: 2, name: "25%柠檬酸" },
@@ -186,7 +203,8 @@ export default {
         { id: 8, name: "50%冰醋酸" },
         { id: 9, name: "5%次氯酸钠" }
       ],
-      DeviceType: []
+      DeviceType: [],
+      planid: 0
     };
   },
   methods: {
@@ -203,6 +221,8 @@ 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;
@@ -222,8 +242,14 @@ export default {
       var disinfectants = this.form.disinfectant;
       var disinfectant = parseInt(disinfectants);
       this.form.disinfectant = disinfectant;
-      savePlan(this.form).then(response => {
+      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");
         }
       });
     }

src/xt_pages/management/components/UserForm.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="user-form">
+    <el-row>
+      <el-col :span="2">
+        <el-checkbox
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
+          @change="handleCheckAllChange"
+          >全选</el-checkbox
+        >
+      </el-col>
+      <el-col :span="2">
+        <el-button size="small">删除</el-button>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item label="机号:">
+          <el-select style="width:135px" v-model="value">
+            <el-option
+              v-for="item in this.fluidPathType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "UserForm",
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-08",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-06",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        },
+        {
+          date: "2016-05-07",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333
+        }
+      ],
+      fluidPathType: [{ id: 1, name: "zs" }],
+      value: ""
+    };
+  }
+};
+</script>
+
+<style scoped></style>

src/xt_pages/management/index.vue

@@ -9,8 +9,7 @@
         icon="el-icon-circle-plus-outline"
         size="small"
         @click="AddManage()"
-        >新增</el-button
-      >
+      >新增</el-button>
     </div>
     <div class="app-container">
       <div class="cell clearfix">
@@ -27,8 +26,7 @@
           icon="el-icon-search"
           size="small"
           @click="seahcerMacherInfo()"
-          >搜索</el-button
-        >
+        >搜索</el-button>
       </div>
 
       <div class="cell clearfix">
@@ -42,9 +40,7 @@
               v-for="item in this.zones"
               :key="item.id"
               @click="selectSchedulType(item.id)"
-            >
-              {{ item.name }}
-            </li>
+            >{{ item.name }}</li>
           </ul>
         </div>
       </div>
@@ -60,9 +56,7 @@
               v-for="item in this.DeviceType"
               :key="item.id"
               @click="selectSchedulTypeOne(item.id)"
-            >
-              {{ item.name }}
-            </li>
+            >{{ item.name }}</li>
           </ul>
         </div>
       </div>
@@ -78,9 +72,7 @@
               v-for="item in this.AllStatus"
               :key="item.id"
               @click="selectSchedulTypeTwo(item.id)"
-            >
-              {{ item.name }}
-            </li>
+            >{{ item.name }}</li>
           </ul>
         </div>
       </div>
@@ -122,12 +114,7 @@
 
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button
-              @click="handleClick(scope.row.id, scope.$index)"
-              type="text"
-              size="small"
-              >查看</el-button
-            >
+            <el-button @click="handleClick(scope.row.id, scope.$index)" type="text" size="small">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -143,10 +130,7 @@
         :total="total"
       ></el-pagination>
       <!-- 新增设备 -->
-      <manage-form
-        ref="manageForm"
-        v-on:getAllMachineInfo="getAllMachineInfo"
-      ></manage-form>
+      <manage-form ref="manageForm" v-on:getAllMachineInfo="getAllMachineInfo"></manage-form>
     </div>
   </div>
 </template>

src/xt_pages/workforce/components/tableData.vue

@@ -656,10 +656,11 @@
                 theSchedules.forEach(function(schedule, sindex) {
                   if (zone.jihao_id == schedule.bed_id) {
                     // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
-
                     var weekPath = that.weekPath(schedule.schedule_week, schedule.schedule_type)
 
                     if (weekPath.length == 2) {
+                      console.log(schedule)
+
                       var weekPathKey = weekPath[0] + '_' + weekPath[1]
                       that.scheduleZone[index][weekPathKey] = {
                         schedule_id: schedule.id,
@@ -1381,7 +1382,7 @@
       }, getDialysisDate: function(row) {
         let week = ''
         switch (row.schedule_week) {
-          case 0:
+          case 7:
             week = '周日'
             break
           case 1:
@@ -1528,18 +1529,18 @@
     height: 15px;
   }
   .el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{
-  border-color: #d0d3da; 
+  border-color: #d0d3da;
 }
 .el-table--border::after, .el-table--group::after, .el-table::before{
   background-color: #d0d3da;
 }
 .el-table--border th{
-  border-color: #d0d3da; 
+  border-color: #d0d3da;
 }
 .el-table--border td{
-  border-color: #d0d3da; 
+  border-color: #d0d3da;
 }
 .el-table td{
-  border-color: #d0d3da; 
+  border-color: #d0d3da;
 }
 </style>