新分支

src/api/device.js

@@ -231,4 +231,95 @@ export function DeleteDevicePh(id,params){
     method:"Get",
     params:params
   })
+}
+
+
+export function saveNewAirDisinfect(data){
+  
+  return request({
+    url:"/api/manage/savenewairdisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewAirDisinfectList(params){
+
+  return request({
+    url:"/api/manage/getnewairdisinfectlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getNewAirDisinfectByIdList(id,params){
+  
+  return request({
+    url:"/api/manage/getnewairdisinfectbyidlist?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function updateNewAirDisinfect(data){
+  
+  return request({
+    url:"/api/manage/updatenewairdisinfect",
+    method:post,
+    data:data,
+  })
+}
+
+export function deleteNewAirDisInfect(id,params){
+  
+  return request({
+    url:"/api/manage/deletenewairdisinfect?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function saveObjectTableDisinfect(data){
+  
+  return request({
+    url:"/api/manage/saveobjtabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getObjectTableDisInfectList(params){
+
+  return request({
+    url:"/api/manage/getobjcttabledisinfectlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getObjectTableDisInfectByIdList(id,params){
+  
+  return request({
+    url:"/api/manage/getobjecttabledisinfectbyidlist?id="+id,
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updateObjectTableDisinfect(data){
+
+  return request({
+    url:"/api/manage/updateobjecttabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteObjectTableDisinfect(id,params){
+
+  return request({
+    url:"/api/manage/deleteobjecttabledisinfect?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/api/manage.js

@@ -737,3 +737,64 @@ export function deleteManageMent(id) {
   })
 }
 
+
+export function getAllDoctorList(params){
+  return request({
+    url:"/api/manage/getalldoctorlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function saveWaterList(equitmentid,data){
+  
+  return request({
+    url:"/api/manage/savewaterlist?equitment_id="+equitmentid,
+    method:"post",
+    data:data,
+  })
+}
+
+export function getWaterFormList(params){
+  return request({
+    url:"/api/manage/getwaterformlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function DeleteWater(id,params){
+  
+  return request({
+    url:"/api/manage/dialysisdeletewater?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getDialysisWaterDetail(id,params){
+  
+  return request({
+    url:"/api/manage/getdialysiswaterdetail?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function UpdateDilaysisWater(data,equimentid){
+  
+  return request({
+    url:"/api/manage/updatedialysiswater?equitment_id="+equimentid,
+    method:"post",
+    data:data,
+  })
+}
+
+export function DeleteBatchDialyisWater(data){
+  console.log("data",data)
+  return request({
+    url:"/api/manage/deletebatchdialysiswater",
+    method:"Delete",
+    data:data,
+  })
+}

src/router/modules/device.js

@@ -48,26 +48,56 @@ export default {
 
       }
     },
+    // {
+    //   path: '/device/airDisinfect',
+    //   component: () => import('@/xt_pages/device/airDisinfect'),
+    //   name: 'airDisinfect',
+    //   meta: {
+    //     title: 'airDisinfect',
+    //     noCache: true,
+
+    //   }
+    // },
     {
-      path: '/device/airDisinfect',
-      component: () => import('@/xt_pages/device/airDisinfect'),
-      name: 'airDisinfect',
+      path: '/device/airDisinfectTwo',
+      component: () => import('@/xt_pages/device/airDisinfectTwo'),
+      name: 'airDisinfectTwo',
       meta: {
-        title: 'airDisinfect',
+        title: 'airDisinfectTwo',
         noCache: true,
 
       }
     },
+    // {
+    //   path: '/device/objectTableDisinfect',
+    //   component: () => import('@/xt_pages/device/objectTableDisinfect'),
+    //   name: 'objectTableDisinfect',
+    //   meta: {
+    //     title: 'objectTableDisinfect',
+    //     noCache: true,
+
+    //   }
+    // },
     {
-      path: '/device/objectTableDisinfect',
-      component: () => import('@/xt_pages/device/objectTableDisinfect'),
-      name: 'objectTableDisinfect',
+      path: '/device/objectNewTableDisinfect',
+      component: () => import('@/xt_pages/device/objectTableDisinfectTwo'),
+      name: 'objectTableDisinfectTwo',
       meta: {
-        title: 'objectTableDisinfect',
+        title: 'objectTableDisinfectTwo',
         noCache: true,
 
       }
-    }
+    },
+    // {
+    //   path: '/device/waterformprint',
+    //   component: () => import('@/xt_pages/management/components/waterFormPrint'),
+    //   name: 'waterFormPrint',
+    //   meta: {
+    //     title: 'waterFormPrint',
+    //     noCache: true,
+
+    //   }
+    // }
 
   ]
 }

src/xt_pages/management/components/PlanForm.vue

@@ -74,7 +74,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="机表消毒方式:">
+            <el-form-item label="机表(床单元、床旁桌)消毒方式:" label-width="200">
               <el-select style="width:135px" v-model="form.way">
                 <el-option
                   v-for="item in this.disinfectType"
@@ -86,7 +86,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="机表消毒液:">
+            <el-form-item label="机表(床单元、床旁桌)消毒液:" label-width="200">
               <el-select
                 style="width:135px"
                 v-model="form.machine_disinfectant"
@@ -127,6 +127,21 @@
             </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.bed_way">
+                <el-option
+                  v-for="item in this.bedType"
+                  :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>
@@ -154,7 +169,8 @@ export default {
         way: 0,
         machine_disinfectant: 0,
         disinfectant_way: 0,
-        disinfectant: 0
+        disinfectant: 0,
+        bed_way:0,
       },
       value: [],
       timeType: [
@@ -211,6 +227,14 @@ export default {
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
       ],
+      // 床单位更换
+       bedType: [
+        { id: 0, name: "/" },
+        { id: 1, name: "床单" },
+        { id: 2, name: "被套" },
+        { id: 3, name: "枕套" },
+      
+      ],
       DeviceType: [],
       planid: 0,
       plandata: 0
@@ -251,6 +275,7 @@ export default {
       var disinfectants = this.form.disinfectant;
       var disinfectant = parseInt(disinfectants);
       this.form.disinfectant = disinfectant;
+      this.form.bed_way = parseInt(this.form.bed_way)
       savePlan(this.form, this.equimentid).then(response => {
         if (response.data.state === 1) {
           var msg = response.data.data.msg;

src/xt_pages/management/components/UserForm.vue

@@ -100,13 +100,13 @@
         <el-table-column label="透析方式" align="center" min-width="90px">
           <template slot-scope="scope">{{ scope.row.dialysis_mode }}</template>
         </el-table-column>
-        <!-- <el-table-column label="使用次数" align="center" min-width="110px">
+        <el-table-column label="使用次数" align="center" min-width="110px">
           <template slot-scope="scope">{{ scope.row.user_total }}</template>
-        </el-table-column>-->
+        </el-table-column>
         <el-table-column label="运行" align="center" min-width="110px">
           <template slot-scope="scope">{{ scope.row.move }}</template>
         </el-table-column>
-        <el-table-column label="机表消毒" align="center" min-width="110px">
+        <el-table-column label="机表(床单元、床旁桌)消毒" align="center" min-width="110px">
           <el-table-column label="消毒方式" align="center" min-width="110px">
             <template slot-scope="scope">{{
               scope.row.disinfect_type

src/xt_pages/management/home.vue

@@ -773,12 +773,12 @@
                                                     {{scope.row.classtime}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="机表消毒方式" align="center" min-width="110px" >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒方式" align="center" min-width="110px" >
                                                 <template slot-scope="scope">
                                                     {{scope.row.way}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="机表消毒液" align="center" min-width="100px"  >
+                                         <el-table-column label="机表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
                                                 <template slot-scope="scope">
                                                      {{scope.row.machine_disinfectant}}
                                                  </template>
@@ -792,6 +792,14 @@
                                                 <template slot-scope="scope">
                                                     {{scope.row.disinfectant}}
                                                  </template>
+                                        </el-table-column>
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
+                                                <template slot-scope="scope">
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
+                                                 </template>
                                         </el-table-column>
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
                                                 <template slot-scope="scope">
@@ -863,12 +871,12 @@
                                                     {{scope.row.classtime}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="基表消毒方式" align="center" min-width="110px"  >
+                                         <el-table-column label="基表(床单元、床旁桌)消毒方式" align="center" min-width="110px"  >
                                                 <template slot-scope="scope">
                                                     {{scope.row.way}}
                                                  </template>
                                         </el-table-column>
-                                         <el-table-column label="基表消毒液" align="center" min-width="100px"  >
+                                         <el-table-column label="基表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
                                                 <template slot-scope="scope">
                                                    {{scope.row.machine_disinfectant}}
                                                  </template>
@@ -882,6 +890,15 @@
                                                 <template slot-scope="scope">
                                                    {{scope.row.disinfectan_way}}
                                                  </template>
+                                        </el-table-column>
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
+                                                <template slot-scope="scope">
+                                                  
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
+                                                 </template>
                                         </el-table-column>
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
                                                 <template slot-scope="scope">
@@ -930,7 +947,7 @@
                         <el-tabs type="border-card" v-model="activeNameThree" @tab-click="handleClick">
                           <el-tab-pane label="新增使用登记" name="first">
 
-                             <el-form :model="userform" ref="userform" :rules="userRules">
+                             <el-form :model="userform" ref="userform" :rules="userRules" v-if="device_type == 1">
                                 <el-row>
                                   <el-col :span="8">
                                      <el-form-item label="日期:" required prop="date" class="st">
@@ -1348,9 +1365,13 @@
                                 </el-row>
                              </el-form>
 
+                            <water-form ref="waterForm" v-if="device_type == 2" :equimentid="equimentid"></water-form>
+
                           </el-tab-pane>
-                           <el-tab-pane label="使用登记列表" name="second">
-                             <user-form ref="userForm" :userdata="userdata"></user-form>
+
+                           <el-tab-pane label="使用登记列表" name="second" >
+                             <user-form ref="userForm" :userdata="userdata" v-if="device_type == 1"></user-form>
+                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
                            </el-tab-pane>
                        </el-tabs>
                      </div>
@@ -2649,6 +2670,8 @@
   import QualityForm from './components/QualityForm'
   import RepairForm from './components/RepairForm'
   import RemanderForm from './components/RemanderForm'
+  import WaterForm from './components/WaterForm'
+  import WaterFormList from './components/WaterFormList.vue'
   import { parseTime } from '@/utils'
   import { getFileExtension } from '@/utils/tools'
   import { PostSearch } from '@/api/patient'
@@ -2665,7 +2688,9 @@ export default {
       UserForm,
       QualityForm,
       RepairForm,
-      RemanderForm
+      RemanderForm,
+      WaterForm,
+      WaterFormList
     },
     data() {
       return {
@@ -3356,7 +3381,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-        console.log("val-------------------------",val)
+       console.log("val232323232323------",val)
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -4948,7 +4973,7 @@ export default {
             if (total === '') {
               this.userform.user_total = ''
             }
-            this.userform.user_total = total
+            // this.userform.user_total = total
           } else {
             this.$message.error('数据返回失败')
           }
@@ -4980,8 +5005,9 @@ export default {
         getTimeBeteen(id, todayTime).then(response => {
           if (response.data.state === 1) {
             var timedata = response.data.data.timeData
+            // console.log("timedata----------------------",timedata)
             if (timedata.length === 0) {
-              this.warnShow = true
+              this.warnShow = false
             }
             if (timedata.length !== 0) {
               this.warnShow = false
@@ -5077,7 +5103,7 @@ export default {
               if(addmacher.user_total == ''){
                   addmacher.user_total = 0
               }   
-              this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
+              // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
             }
          })
        },