XMLWAN 4 years ago
parent
commit
aa5d1b069f

+ 1 - 1
src/xt_pages/data/components/editInspection.vue View File

@@ -255,7 +255,7 @@ export default {
255 255
                console.log('projectlist33333',projectList)
256 256
                this.projectList = projectList
257 257
                var hisprojectlist = response.data.data.hisprojectlist
258
-            //    console.log("hisprojectlist",hisprojectlist)
258
+             console.log("hisprojectlist",hisprojectlist)
259 259
             //    this.tableData = hisprojectlist
260 260
              }
261 261
           })   

+ 5 - 4
src/xt_pages/device/airDisinfect.vue View File

@@ -152,7 +152,7 @@
152 152
                 <el-form-item label="检测结果" label-width="110px">
153 153
                     <el-input v-model="form.detection_result"></el-input>
154 154
                 </el-form-item>
155
-                <el-form-item label="上传时间" label-width="110px">
155
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
156 156
                     <el-date-picker
157 157
                     value-format="yyyy-MM-dd"
158 158
                     v-model="form.upload_time"
@@ -243,7 +243,7 @@
243 243
                 <el-form-item label="检测结果" label-width="110px">
244 244
                     <el-input v-model="form.detection_result"></el-input>
245 245
                 </el-form-item>
246
-                <el-form-item label="上传时间" label-width="110px">
246
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
247 247
                     <el-date-picker
248 248
                     value-format="yyyy-MM-dd"
249 249
                     v-model="form.upload_time"
@@ -320,13 +320,14 @@
320 320
         ],
321 321
        airRules: {
322 322
         start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
323
-        class:[{required:true,message:"请选择班次",trigger:"blur"}],
323
+        class:[{required:true,message:"请选择消毒班次",trigger:"blur"}],
324 324
         created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
325 325
         sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
326 326
         detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
327 327
         check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
328 328
         modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
329
-        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
329
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}],
330
+        upload_time:[{required:true,message:"请选择上传时间",trigger:"blur"}]
330 331
        },
331 332
        limit:20,
332 333
        page:1,

+ 5 - 4
src/xt_pages/device/objectTableDisinfect.vue View File

@@ -152,7 +152,7 @@
152 152
                 <el-form-item label="检测结果" label-width="110px">
153 153
                     <el-input v-model="form.detection_result"></el-input>
154 154
                 </el-form-item>
155
-                <el-form-item label="上传时间" label-width="110px">
155
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
156 156
                     <el-date-picker
157 157
                     value-format="yyyy-MM-dd"
158 158
                     v-model="form.upload_time"
@@ -243,7 +243,7 @@
243 243
                 <el-form-item label="检测结果" label-width="110px">
244 244
                     <el-input v-model="form.detection_result"></el-input>
245 245
                 </el-form-item>
246
-                <el-form-item label="上传时间" label-width="110px">
246
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
247 247
                     <el-date-picker
248 248
                     value-format="yyyy-MM-dd"
249 249
                     v-model="form.upload_time"
@@ -320,13 +320,14 @@
320 320
         ],
321 321
        airRules: {
322 322
         start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
323
-        class:[{required:true,message:"请选择班次",trigger:"blur"}],
323
+        class:[{required:true,message:"请选择消毒班次",trigger:"blur"}],
324 324
         created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
325 325
         sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
326 326
         detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
327 327
         check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
328 328
         modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
329
-        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
329
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}],
330
+        upload_time:[{required:true,message:"请选择报告日期",trigger:"blur"}]
330 331
        },
331 332
        limit:20,
332 333
        page:1,

+ 1 - 14
src/xt_pages/management/home.vue View File

@@ -4630,8 +4630,6 @@ export default {
4630 4630
               this.qualityForm.concentrate_noa = '',
4631 4631
               this.qualityForm.concentrate_nob = '',
4632 4632
               this.qualityForm.sampling_locationa = '',
4633
-              this.qualityForm.sampler = ''
4634
-              this.qualityForm.reporting_date = ''
4635 4633
               this.qualityForm.detection_result = ''
4636 4634
               this.$refs.mychild.getAllQulityInfo()
4637 4635
             }else{
@@ -4683,8 +4681,6 @@ export default {
4683 4681
                 this.qualityFormTwo.concentrate_noc = ''
4684 4682
                 this.qualityFormTwo.concentrateb_nod = ''
4685 4683
                 this.qualityFormTwo.sampling_locationb = ''
4686
-                this.qualityFormTwo.samplerb = ''
4687
-                this.qualityFormTwo.reporting_dateb = ''
4688 4684
                 this.qualityFormTwo.detection_resultb = ''
4689 4685
                
4690 4686
               
@@ -4716,10 +4712,8 @@ export default {
4716 4712
                 var ion = response.data.data.ion
4717 4713
                 this.$message.success('保存成功')
4718 4714
                 this.$refs.mychild.getAllQulityInfo()
4719
-                this.qualityFormThree.samplerc = ''
4720 4715
                 this.qualityFormThree.concentrate_nof = ''
4721 4716
                 this.qualityFormThree.concentrate_nog = ''
4722
-                this.qualityFormThree.date_reportc = ''
4723 4717
                 this.qualityFormThree.actual_na = ''
4724 4718
                 this.qualityFormThree.actual_pna = ''
4725 4719
                 this.qualityFormThree.actual_k = ''
@@ -5104,8 +5098,7 @@ export default {
5104 5098
                 this.qualityFormFour.concentrate_noc = ''
5105 5099
                 this.qualityFormFour.concentrateb_nod = ''
5106 5100
                 this.qualityFormFour.sampling_locationb = ''
5107
-                this.qualityFormFour.samplerb = ''
5108
-                this.qualityFormFour.reporting_dateb = ''
5101
+             
5109 5102
                 this.qualityFormFour.detection_resultb = ''
5110 5103
                 
5111 5104
               
@@ -5149,8 +5142,6 @@ export default {
5149 5142
                 this.qualityFormFive.concentrate_noc = ''
5150 5143
                 this.qualityFormFive.concentrateb_nod = ''
5151 5144
                 this.qualityFormFive.sampling_locationb = ''
5152
-                this.qualityFormFive.samplerb = ''
5153
-                this.qualityFormFive.reporting_dateb = ''
5154 5145
                 this.qualityFormFive.detection_resultb = ''
5155 5146
                
5156 5147
               
@@ -5194,8 +5185,6 @@ export default {
5194 5185
                 this.qualityFormSix.concentrate_noc = ''
5195 5186
                 this.qualityFormSix.concentrateb_nod = ''
5196 5187
                 this.qualityFormSix.sampling_locationb = ''
5197
-                this.qualityFormSix.samplerb = ''
5198
-                this.qualityFormSix.reporting_dateb = ''
5199 5188
                 this.qualityFormSix.detection_resultb = ''
5200 5189
              
5201 5190
               
@@ -5241,8 +5230,6 @@ export default {
5241 5230
                 this.qualityFormSeven.concentrate_noc = ''
5242 5231
                 this.qualityFormSeven.concentrateb_nod = ''
5243 5232
                 this.qualityFormSeven.sampling_locationb = ''
5244
-                this.qualityFormSeven.samplerb = ''
5245
-                this.qualityFormSeven.reporting_dateb = ''
5246 5233
                 this.qualityFormSeven.detection_resultb = ''
5247 5234
               
5248 5235
               

+ 36 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -319,7 +319,7 @@
319 319
             </el-tabs>
320 320
           </div>
321 321
           <div style="height:100%;" v-show="showTwo">
322
-            <el-tabs class="rightTabs" v-model="activeName">
322
+            <el-tabs class="rightTabs" v-model="activeName" >
323 323
               <el-tab-pane label="项目列表" name="1">
324 324
                 <div style="margin-bottom:5px;">
325 325
                   <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
@@ -433,7 +433,7 @@
433 433
   import selectTemplate from './selectTemplate'
434 434
   import saveTemplate from './saveTemplate'
435 435
   import additionalCharges from './additionalCharges'
436
-  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
436
+  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById,getAllProjectList } from '@/api/project/project'
437 437
   import { uParseTime } from '@/utils/tools'
438 438
   import NextOrLastPrescription from './nextOrLastPrescription'
439 439
   import CallPrescription from './callPrescription'
@@ -572,7 +572,8 @@
572 572
               return time.getTime() <= new Date(beginDateVal).getTime()
573 573
             }
574 574
           }
575
-        }
575
+        },
576
+        hisList:[]
576 577
 
577 578
       }
578 579
     },
@@ -1655,6 +1656,7 @@
1655 1656
             this.prescription_id = this.prescriptions[i].id
1656 1657
             this.$emit('event1', this.prescription_id)
1657 1658
             this.curPrescriptions = this.prescriptions[i]
1659
+
1658 1660
             this.teamList = []
1659 1661
             this.curDrugs = []
1660 1662
             this.$refs.multipleTable.clearSelection()
@@ -1697,6 +1699,7 @@
1697 1699
 
1698 1700
       },
1699 1701
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
1702
+     
1700 1703
         this.curMonthPrescriptions = {}
1701 1704
         this.curPrescriptions = {}
1702 1705
 
@@ -2226,7 +2229,10 @@
2226 2229
       selectDrugs(selection, row) {
2227 2230
         this.curDrugs = selection
2228 2231
       },
2232
+    
2229 2233
       comfirm() {
2234
+        console.log("222222222222",this.curPrescriptions)
2235
+   
2230 2236
         if (this.dayorMonth == 'month') {
2231 2237
           this.$message.error('月结状态下,无法添加药品或者项目')
2232 2238
           return
@@ -2361,7 +2367,20 @@
2361 2367
               this.curStatus = 1
2362 2368
             }
2363 2369
 
2370
+           if(this.activeName == 2){
2371
+             
2372
+              for(let i = 0; i<temp2.length;i++){
2373
+               for(let j=0;j<this.hisList.length;j++){
2374
+                   if(temp2[i].id == this.hisList[j].project_id){
2375
+                      temp2[i].total =  this.hisList[j].number
2376
+                   }
2377
+               }
2378
+              }
2379
+            }
2380
+          
2381
+
2364 2382
             if (temp2.length > 0) {
2383
+              console.log("temp2222222222",temp2)
2365 2384
               for (let b = 0; b < temp2.length; b++) {
2366 2385
                 let obj = {
2367 2386
                   id: 0,
@@ -2429,11 +2448,13 @@
2429 2448
         getAllProjectTeam().then(response => {
2430 2449
           if (response.data.state == 1) {
2431 2450
             var team = response.data.data.team
2451
+            console.log("team2222",team) 
2432 2452
             this.tabPrjectTeam = team
2433 2453
           }
2434 2454
         })
2435 2455
       },
2436 2456
       selectTeam(row) {
2457
+        console.log("row",row)
2437 2458
         var arr = []
2438 2459
         for (let i = 0; i < row.length; i++) {
2439 2460
           arr.push(row[i].project_id)
@@ -2484,6 +2505,15 @@
2484 2505
 
2485 2506
         }
2486 2507
 
2508
+      },
2509
+      getAllProjectList(){
2510
+        getAllProjectList().then(response=>{
2511
+          if(response.data.state == 1){
2512
+            var hisprojectlist = response.data.data.hisprojectlist
2513
+             console.log("hisprojectlist",hisprojectlist)
2514
+             this.hisList = hisprojectlist
2515
+          }
2516
+        })
2487 2517
       }
2488 2518
     }, mounted() {
2489 2519
       this.request_record_date = this.record_date
@@ -2492,10 +2522,12 @@
2492 2522
       this.getlist()
2493 2523
       //获取所以项目组套
2494 2524
       this.getAllProjectTeam()
2525
+      
2526
+      this.getAllProjectList()
2495 2527
       this.$nextTick(() => {
2496 2528
         this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
2497 2529
       })
2498
-
2530
+      
2499 2531
     },
2500 2532
     watch: {
2501 2533
 

+ 2 - 3
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue View File

@@ -378,10 +378,9 @@
378 378
       },
379 379
     },mounted(){
380 380
       this.getInitData()
381
+     
381 382
     },
382
-    created(){
383
-      console.log("数据元",this.prescription)
384
-    }
383
+    
385 384
   }
386 385
 </script>
387 386