瀏覽代碼

新分支

28169 2 年之前
父節點
當前提交
37911875ba

+ 91 - 0
src/api/device.js 查看文件

231
     method:"Get",
231
     method:"Get",
232
     params:params
232
     params:params
233
   })
233
   })
234
+}
235
+
236
+
237
+export function saveNewAirDisinfect(data){
238
+  
239
+  return request({
240
+    url:"/api/manage/savenewairdisinfect",
241
+    method:"post",
242
+    data:data,
243
+  })
244
+}
245
+
246
+export function getNewAirDisinfectList(params){
247
+
248
+  return request({
249
+    url:"/api/manage/getnewairdisinfectlist",
250
+    method:"get",
251
+    params:params
252
+  })
253
+}
254
+
255
+export function getNewAirDisinfectByIdList(id,params){
256
+  
257
+  return request({
258
+    url:"/api/manage/getnewairdisinfectbyidlist?id="+id,
259
+    method:"Get",
260
+    params:params
261
+  })
262
+}
263
+
264
+export function updateNewAirDisinfect(data){
265
+  
266
+  return request({
267
+    url:"/api/manage/updatenewairdisinfect",
268
+    method:post,
269
+    data:data,
270
+  })
271
+}
272
+
273
+export function deleteNewAirDisInfect(id,params){
274
+  
275
+  return request({
276
+    url:"/api/manage/deletenewairdisinfect?id="+id,
277
+    method:"get",
278
+    params:params
279
+  })
280
+}
281
+
282
+export function saveObjectTableDisinfect(data){
283
+  
284
+  return request({
285
+    url:"/api/manage/saveobjtabledisinfect",
286
+    method:"post",
287
+    data:data,
288
+  })
289
+}
290
+
291
+export function getObjectTableDisInfectList(params){
292
+
293
+  return request({
294
+    url:"/api/manage/getobjcttabledisinfectlist",
295
+    method:"Get",
296
+    params:params,
297
+  })
298
+}
299
+
300
+export function getObjectTableDisInfectByIdList(id,params){
301
+  
302
+  return request({
303
+    url:"/api/manage/getobjecttabledisinfectbyidlist?id="+id,
304
+    method:"Get",
305
+    params:params,
306
+  })
307
+}
308
+
309
+export function updateObjectTableDisinfect(data){
310
+
311
+  return request({
312
+    url:"/api/manage/updateobjecttabledisinfect",
313
+    method:"post",
314
+    data:data,
315
+  })
316
+}
317
+
318
+export function deleteObjectTableDisinfect(id,params){
319
+
320
+  return request({
321
+    url:"/api/manage/deleteobjecttabledisinfect?id="+id,
322
+    method:"get",
323
+    params:params
324
+  })
234
 }
325
 }

+ 61 - 0
src/api/manage.js 查看文件

737
   })
737
   })
738
 }
738
 }
739
 
739
 
740
+
741
+export function getAllDoctorList(params){
742
+  return request({
743
+    url:"/api/manage/getalldoctorlist",
744
+    method:"Get",
745
+    params:params
746
+  })
747
+}
748
+
749
+export function saveWaterList(equitmentid,data){
750
+  
751
+  return request({
752
+    url:"/api/manage/savewaterlist?equitment_id="+equitmentid,
753
+    method:"post",
754
+    data:data,
755
+  })
756
+}
757
+
758
+export function getWaterFormList(params){
759
+  return request({
760
+    url:"/api/manage/getwaterformlist",
761
+    method:"get",
762
+    params:params,
763
+  })
764
+}
765
+
766
+export function DeleteWater(id,params){
767
+  
768
+  return request({
769
+    url:"/api/manage/dialysisdeletewater?id="+id,
770
+    method:"Get",
771
+    params:params
772
+  })
773
+}
774
+
775
+export function getDialysisWaterDetail(id,params){
776
+  
777
+  return request({
778
+    url:"/api/manage/getdialysiswaterdetail?id="+id,
779
+    method:"Get",
780
+    params:params
781
+  })
782
+}
783
+
784
+export function UpdateDilaysisWater(data,equimentid){
785
+  
786
+  return request({
787
+    url:"/api/manage/updatedialysiswater?equitment_id="+equimentid,
788
+    method:"post",
789
+    data:data,
790
+  })
791
+}
792
+
793
+export function DeleteBatchDialyisWater(data){
794
+  console.log("data",data)
795
+  return request({
796
+    url:"/api/manage/deletebatchdialysiswater",
797
+    method:"Delete",
798
+    data:data,
799
+  })
800
+}

+ 39 - 9
src/router/modules/device.js 查看文件

48
 
48
 
49
       }
49
       }
50
     },
50
     },
51
+    // {
52
+    //   path: '/device/airDisinfect',
53
+    //   component: () => import('@/xt_pages/device/airDisinfect'),
54
+    //   name: 'airDisinfect',
55
+    //   meta: {
56
+    //     title: 'airDisinfect',
57
+    //     noCache: true,
58
+
59
+    //   }
60
+    // },
51
     {
61
     {
52
-      path: '/device/airDisinfect',
53
-      component: () => import('@/xt_pages/device/airDisinfect'),
54
-      name: 'airDisinfect',
62
+      path: '/device/airDisinfectTwo',
63
+      component: () => import('@/xt_pages/device/airDisinfectTwo'),
64
+      name: 'airDisinfectTwo',
55
       meta: {
65
       meta: {
56
-        title: 'airDisinfect',
66
+        title: 'airDisinfectTwo',
57
         noCache: true,
67
         noCache: true,
58
 
68
 
59
       }
69
       }
60
     },
70
     },
71
+    // {
72
+    //   path: '/device/objectTableDisinfect',
73
+    //   component: () => import('@/xt_pages/device/objectTableDisinfect'),
74
+    //   name: 'objectTableDisinfect',
75
+    //   meta: {
76
+    //     title: 'objectTableDisinfect',
77
+    //     noCache: true,
78
+
79
+    //   }
80
+    // },
61
     {
81
     {
62
-      path: '/device/objectTableDisinfect',
63
-      component: () => import('@/xt_pages/device/objectTableDisinfect'),
64
-      name: 'objectTableDisinfect',
82
+      path: '/device/objectNewTableDisinfect',
83
+      component: () => import('@/xt_pages/device/objectTableDisinfectTwo'),
84
+      name: 'objectTableDisinfectTwo',
65
       meta: {
85
       meta: {
66
-        title: 'objectTableDisinfect',
86
+        title: 'objectTableDisinfectTwo',
67
         noCache: true,
87
         noCache: true,
68
 
88
 
69
       }
89
       }
70
-    }
90
+    },
91
+    // {
92
+    //   path: '/device/waterformprint',
93
+    //   component: () => import('@/xt_pages/management/components/waterFormPrint'),
94
+    //   name: 'waterFormPrint',
95
+    //   meta: {
96
+    //     title: 'waterFormPrint',
97
+    //     noCache: true,
98
+
99
+    //   }
100
+    // }
71
 
101
 
72
   ]
102
   ]
73
 }
103
 }

文件差異過大導致無法顯示
+ 618 - 483
src/xt_pages/device/airDisinfectTwo.vue


+ 28 - 3
src/xt_pages/management/components/PlanForm.vue 查看文件

74
         </el-row>
74
         </el-row>
75
         <el-row>
75
         <el-row>
76
           <el-col :span="10">
76
           <el-col :span="10">
77
-            <el-form-item label="机表消毒方式:">
77
+            <el-form-item label="机表(床单元、床旁桌)消毒方式:" label-width="200">
78
               <el-select style="width:135px" v-model="form.way">
78
               <el-select style="width:135px" v-model="form.way">
79
                 <el-option
79
                 <el-option
80
                   v-for="item in this.disinfectType"
80
                   v-for="item in this.disinfectType"
86
             </el-form-item>
86
             </el-form-item>
87
           </el-col>
87
           </el-col>
88
           <el-col :span="10">
88
           <el-col :span="10">
89
-            <el-form-item label="机表消毒液:">
89
+            <el-form-item label="机表(床单元、床旁桌)消毒液:" label-width="200">
90
               <el-select
90
               <el-select
91
                 style="width:135px"
91
                 style="width:135px"
92
                 v-model="form.machine_disinfectant"
92
                 v-model="form.machine_disinfectant"
127
             </el-form-item>
127
             </el-form-item>
128
           </el-col>
128
           </el-col>
129
         </el-row>
129
         </el-row>
130
+
131
+        <el-row>
132
+          <el-col :span="10">
133
+            <el-form-item label="床单位更换:">
134
+              <el-select style="width:135px" v-model="form.bed_way">
135
+                <el-option
136
+                  v-for="item in this.bedType"
137
+                  :key="item.id"
138
+                  :label="item.name"
139
+                  :value="item.id"
140
+                ></el-option>
141
+              </el-select>
142
+            </el-form-item>
143
+          </el-col>
144
+        </el-row>
130
       </el-form>
145
       </el-form>
131
       <span slot="footer" class="dialog-footer">
146
       <span slot="footer" class="dialog-footer">
132
         <el-button @click="dialogVisible = false">取 消</el-button>
147
         <el-button @click="dialogVisible = false">取 消</el-button>
154
         way: 0,
169
         way: 0,
155
         machine_disinfectant: 0,
170
         machine_disinfectant: 0,
156
         disinfectant_way: 0,
171
         disinfectant_way: 0,
157
-        disinfectant: 0
172
+        disinfectant: 0,
173
+        bed_way:0,
158
       },
174
       },
159
       value: [],
175
       value: [],
160
       timeType: [
176
       timeType: [
211
         { id: 9, name: "5%次氯酸钠" },
227
         { id: 9, name: "5%次氯酸钠" },
212
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
228
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
213
       ],
229
       ],
230
+      // 床单位更换
231
+       bedType: [
232
+        { id: 0, name: "/" },
233
+        { id: 1, name: "床单" },
234
+        { id: 2, name: "被套" },
235
+        { id: 3, name: "枕套" },
236
+      
237
+      ],
214
       DeviceType: [],
238
       DeviceType: [],
215
       planid: 0,
239
       planid: 0,
216
       plandata: 0
240
       plandata: 0
251
       var disinfectants = this.form.disinfectant;
275
       var disinfectants = this.form.disinfectant;
252
       var disinfectant = parseInt(disinfectants);
276
       var disinfectant = parseInt(disinfectants);
253
       this.form.disinfectant = disinfectant;
277
       this.form.disinfectant = disinfectant;
278
+      this.form.bed_way = parseInt(this.form.bed_way)
254
       savePlan(this.form, this.equimentid).then(response => {
279
       savePlan(this.form, this.equimentid).then(response => {
255
         if (response.data.state === 1) {
280
         if (response.data.state === 1) {
256
           var msg = response.data.data.msg;
281
           var msg = response.data.data.msg;

+ 3 - 3
src/xt_pages/management/components/UserForm.vue 查看文件

100
         <el-table-column label="透析方式" align="center" min-width="90px">
100
         <el-table-column label="透析方式" align="center" min-width="90px">
101
           <template slot-scope="scope">{{ scope.row.dialysis_mode }}</template>
101
           <template slot-scope="scope">{{ scope.row.dialysis_mode }}</template>
102
         </el-table-column>
102
         </el-table-column>
103
-        <!-- <el-table-column label="使用次数" align="center" min-width="110px">
103
+        <el-table-column label="使用次数" align="center" min-width="110px">
104
           <template slot-scope="scope">{{ scope.row.user_total }}</template>
104
           <template slot-scope="scope">{{ scope.row.user_total }}</template>
105
-        </el-table-column>-->
105
+        </el-table-column>
106
         <el-table-column label="运行" align="center" min-width="110px">
106
         <el-table-column label="运行" align="center" min-width="110px">
107
           <template slot-scope="scope">{{ scope.row.move }}</template>
107
           <template slot-scope="scope">{{ scope.row.move }}</template>
108
         </el-table-column>
108
         </el-table-column>
109
-        <el-table-column label="机表消毒" align="center" min-width="110px">
109
+        <el-table-column label="机表(床单元、床旁桌)消毒" align="center" min-width="110px">
110
           <el-table-column label="消毒方式" align="center" min-width="110px">
110
           <el-table-column label="消毒方式" align="center" min-width="110px">
111
             <template slot-scope="scope">{{
111
             <template slot-scope="scope">{{
112
               scope.row.disinfect_type
112
               scope.row.disinfect_type

+ 38 - 12
src/xt_pages/management/home.vue 查看文件

773
                                                     {{scope.row.classtime}}
773
                                                     {{scope.row.classtime}}
774
                                                  </template>
774
                                                  </template>
775
                                         </el-table-column>
775
                                         </el-table-column>
776
-                                         <el-table-column label="机表消毒方式" align="center" min-width="110px" >
776
+                                         <el-table-column label="机表(床单元、床旁桌)消毒方式" align="center" min-width="110px" >
777
                                                 <template slot-scope="scope">
777
                                                 <template slot-scope="scope">
778
                                                     {{scope.row.way}}
778
                                                     {{scope.row.way}}
779
                                                  </template>
779
                                                  </template>
780
                                         </el-table-column>
780
                                         </el-table-column>
781
-                                         <el-table-column label="机表消毒液" align="center" min-width="100px"  >
781
+                                         <el-table-column label="机表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
782
                                                 <template slot-scope="scope">
782
                                                 <template slot-scope="scope">
783
                                                      {{scope.row.machine_disinfectant}}
783
                                                      {{scope.row.machine_disinfectant}}
784
                                                  </template>
784
                                                  </template>
792
                                                 <template slot-scope="scope">
792
                                                 <template slot-scope="scope">
793
                                                     {{scope.row.disinfectant}}
793
                                                     {{scope.row.disinfectant}}
794
                                                  </template>
794
                                                  </template>
795
+                                        </el-table-column>
796
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
797
+                                                <template slot-scope="scope">
798
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
799
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
800
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
801
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
802
+                                                 </template>
795
                                         </el-table-column>
803
                                         </el-table-column>
796
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
804
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
797
                                                 <template slot-scope="scope">
805
                                                 <template slot-scope="scope">
863
                                                     {{scope.row.classtime}}
871
                                                     {{scope.row.classtime}}
864
                                                  </template>
872
                                                  </template>
865
                                         </el-table-column>
873
                                         </el-table-column>
866
-                                         <el-table-column label="基表消毒方式" align="center" min-width="110px"  >
874
+                                         <el-table-column label="基表(床单元、床旁桌)消毒方式" align="center" min-width="110px"  >
867
                                                 <template slot-scope="scope">
875
                                                 <template slot-scope="scope">
868
                                                     {{scope.row.way}}
876
                                                     {{scope.row.way}}
869
                                                  </template>
877
                                                  </template>
870
                                         </el-table-column>
878
                                         </el-table-column>
871
-                                         <el-table-column label="基表消毒液" align="center" min-width="100px"  >
879
+                                         <el-table-column label="基表(床单元、床旁桌)消毒液" align="center" min-width="100px"  >
872
                                                 <template slot-scope="scope">
880
                                                 <template slot-scope="scope">
873
                                                    {{scope.row.machine_disinfectant}}
881
                                                    {{scope.row.machine_disinfectant}}
874
                                                  </template>
882
                                                  </template>
882
                                                 <template slot-scope="scope">
890
                                                 <template slot-scope="scope">
883
                                                    {{scope.row.disinfectan_way}}
891
                                                    {{scope.row.disinfectan_way}}
884
                                                  </template>
892
                                                  </template>
893
+                                        </el-table-column>
894
+                                        <el-table-column label="床单位更换" align="center" min-width="100px" >
895
+                                                <template slot-scope="scope">
896
+                                                  
897
+                                                   <span v-if="scope.row.bed_way ==0">/</span>
898
+                                                   <span v-if="scope.row.bed_way ==1">床单</span>
899
+                                                   <span v-if="scope.row.bed_way ==2">被套</span>
900
+                                                   <span v-if="scope.row.bed_way ==3">枕套</span>
901
+                                                 </template>
885
                                         </el-table-column>
902
                                         </el-table-column>
886
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
903
                                          <el-table-column label="消毒时长/min" align="center" min-width="60px" >
887
                                                 <template slot-scope="scope">
904
                                                 <template slot-scope="scope">
930
                         <el-tabs type="border-card" v-model="activeNameThree" @tab-click="handleClick">
947
                         <el-tabs type="border-card" v-model="activeNameThree" @tab-click="handleClick">
931
                           <el-tab-pane label="新增使用登记" name="first">
948
                           <el-tab-pane label="新增使用登记" name="first">
932
 
949
 
933
-                             <el-form :model="userform" ref="userform" :rules="userRules">
950
+                             <el-form :model="userform" ref="userform" :rules="userRules" v-if="device_type == 1">
934
                                 <el-row>
951
                                 <el-row>
935
                                   <el-col :span="8">
952
                                   <el-col :span="8">
936
                                      <el-form-item label="日期:" required prop="date" class="st">
953
                                      <el-form-item label="日期:" required prop="date" class="st">
1348
                                 </el-row>
1365
                                 </el-row>
1349
                              </el-form>
1366
                              </el-form>
1350
 
1367
 
1368
+                            <water-form ref="waterForm" v-if="device_type == 2" :equimentid="equimentid"></water-form>
1369
+
1351
                           </el-tab-pane>
1370
                           </el-tab-pane>
1352
-                           <el-tab-pane label="使用登记列表" name="second">
1353
-                             <user-form ref="userForm" :userdata="userdata"></user-form>
1371
+
1372
+                           <el-tab-pane label="使用登记列表" name="second" >
1373
+                             <user-form ref="userForm" :userdata="userdata" v-if="device_type == 1"></user-form>
1374
+                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
1354
                            </el-tab-pane>
1375
                            </el-tab-pane>
1355
                        </el-tabs>
1376
                        </el-tabs>
1356
                      </div>
1377
                      </div>
2649
   import QualityForm from './components/QualityForm'
2670
   import QualityForm from './components/QualityForm'
2650
   import RepairForm from './components/RepairForm'
2671
   import RepairForm from './components/RepairForm'
2651
   import RemanderForm from './components/RemanderForm'
2672
   import RemanderForm from './components/RemanderForm'
2673
+  import WaterForm from './components/WaterForm'
2674
+  import WaterFormList from './components/WaterFormList.vue'
2652
   import { parseTime } from '@/utils'
2675
   import { parseTime } from '@/utils'
2653
   import { getFileExtension } from '@/utils/tools'
2676
   import { getFileExtension } from '@/utils/tools'
2654
   import { PostSearch } from '@/api/patient'
2677
   import { PostSearch } from '@/api/patient'
2665
       UserForm,
2688
       UserForm,
2666
       QualityForm,
2689
       QualityForm,
2667
       RepairForm,
2690
       RepairForm,
2668
-      RemanderForm
2691
+      RemanderForm,
2692
+      WaterForm,
2693
+      WaterFormList
2669
     },
2694
     },
2670
     data() {
2695
     data() {
2671
       return {
2696
       return {
3356
         this.tabIndex = index
3381
         this.tabIndex = index
3357
       },
3382
       },
3358
       handleCurrentChange(val) {
3383
       handleCurrentChange(val) {
3359
-        console.log("val-------------------------",val)
3384
+       console.log("val232323232323------",val)
3360
         // 通过设备型号区分质量控制
3385
         // 通过设备型号区分质量控制
3361
         this.device_type = val.device_type
3386
         this.device_type = val.device_type
3362
         this.unitType = val.unit_type
3387
         this.unitType = val.unit_type
4948
             if (total === '') {
4973
             if (total === '') {
4949
               this.userform.user_total = ''
4974
               this.userform.user_total = ''
4950
             }
4975
             }
4951
-            this.userform.user_total = total
4976
+            // this.userform.user_total = total
4952
           } else {
4977
           } else {
4953
             this.$message.error('数据返回失败')
4978
             this.$message.error('数据返回失败')
4954
           }
4979
           }
4980
         getTimeBeteen(id, todayTime).then(response => {
5005
         getTimeBeteen(id, todayTime).then(response => {
4981
           if (response.data.state === 1) {
5006
           if (response.data.state === 1) {
4982
             var timedata = response.data.data.timeData
5007
             var timedata = response.data.data.timeData
5008
+            // console.log("timedata----------------------",timedata)
4983
             if (timedata.length === 0) {
5009
             if (timedata.length === 0) {
4984
-              this.warnShow = true
5010
+              this.warnShow = false
4985
             }
5011
             }
4986
             if (timedata.length !== 0) {
5012
             if (timedata.length !== 0) {
4987
               this.warnShow = false
5013
               this.warnShow = false
5077
               if(addmacher.user_total == ''){
5103
               if(addmacher.user_total == ''){
5078
                   addmacher.user_total = 0
5104
                   addmacher.user_total = 0
5079
               }   
5105
               }   
5080
-              this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
5106
+              // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
5081
             }
5107
             }
5082
          })
5108
          })
5083
        },
5109
        },