28169 hace 9 meses
padre
commit
cd3e2619c7

+ 7 - 0
src/api/inspection.js Ver fichero

@@ -105,7 +105,14 @@ export function getNewInspectionList(params){
105 105
   })
106 106
 }
107 107
 
108
+export function getNewInspectionDetailList(params){
108 109
 
110
+  return request({
111
+    url:"/api/getnewinspectiondetaillist",
112
+    method:"Get",
113
+    params:params,
114
+  })
115
+}
109 116
 
110 117
 
111 118
 

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue Ver fichero

@@ -2371,7 +2371,7 @@
2371 2371
                       >
2372 2372
 
2373 2373
                         <span v-if="org_id!=10460 && org_id!=10551">
2374
-                          透析中入量  (L)
2374
+                          透析中入量:
2375 2375
                         </span>
2376 2376
                         <span v-if="org_id==10460 || org_id ==10551">
2377 2377
                           透析中入量  (ml):

+ 4 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Ver fichero

@@ -3195,10 +3195,13 @@ mu
3195 3195
         if(moment().weekday() == 0){
3196 3196
            total_day ="周日"
3197 3197
         }
3198
-
3198
+         
3199
+        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhh",this.targetAdvices)
3199 3200
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
3200 3201
             for (let i = 0; i < this.targetAdvices.length; i++) {
3202
+              console.log("WOOWOWOWOWOWOW",this.targetAdvices[i].week_day.indexOf(total_day))
3201 3203
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
3204
+                console.log("尽力啊=--------------------")
3202 3205
                 this.targetAdvices[i].isCheck = 1
3203 3206
               }
3204 3207
               if(this.targetAdvices[i].frequency_type == 1){

+ 14 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue Ver fichero

@@ -85,7 +85,7 @@
85 85
             </td>
86 86
           </tr>
87 87
           <tr>
88
-            <td style="text-align: left" colspan="2">
88
+            <td style="text-align: left" colspan="3">
89 89
               <span style="display: inline-block; margin-left: 15px"
90 90
                 >治疗方式:</span
91 91
               >
@@ -106,8 +106,16 @@
106 106
                     : false
107 107
                 "
108 108
                 showValue="HP"
109
-              ></label-box
110
-              >&nbsp;
109
+              ></label-box>&nbsp;
110
+              <label-box
111
+                :isChecked="
112
+                  prescription.mode_id == 12
113
+                    ? true
114
+                    : false
115
+                "
116
+                showValue="HD+HP"
117
+              ></label-box>&nbsp;
118
+              
111 119
               <!-- <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp; -->
112 120
               <!-- <label-box
113 121
                 :isChecked="prescription.mode_id == 5 ? true : false"
@@ -137,9 +145,9 @@
137 145
                                 <span v-if="prescription.mode_id == 11">
138 146
                                 HFR
139 147
                                 </span>
140
-                                <span v-if="prescription.mode_id == 12">
148
+                                <!-- <span v-if="prescription.mode_id == 12">
141 149
                                 HDF+HP
142
-                                </span>
150
+                                </span> -->
143 151
                                 <span v-if="prescription.mode_id == 13">
144 152
                                 CRRT
145 153
                                 </span>
@@ -203,7 +211,7 @@
203 211
                                 </span>
204 212
                 
205 213
             </td>
206
-            <td style="text-align: left" colspan="5">
214
+            <td style="text-align: left" colspan="4">
207 215
               <span
208 216
                 style="display: inline-block; margin-left: 15px; width: 100%"
209 217
                 >诊断: {{ patientInfo.diagnose }}</span

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Ver fichero

@@ -2170,7 +2170,7 @@
2170 2170
                       v-if="org_id != 10223 || org_id!=10375"
2171 2171
                     >
2172 2172
                         <span v-if="org_id!=10460 && org_id!=10551">
2173
-                          透析中入量(L)
2173
+                          透析中入量:
2174 2174
                         </span>
2175 2175
                         <span v-if="org_id==10460 || org_id ==10551">
2176 2176
                           透析中入量(ml):
@@ -2185,7 +2185,7 @@
2185 2185
                             : "/"
2186 2186
                         }}
2187 2187
                       </div>
2188
-                      {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
2188
+                      <!-- {{ getUnit(afterdialysis.dialysis_intakes_unit) }} -->
2189 2189
                     </div>
2190 2190
 
2191 2191
                     <div class="inline_block" style="flex: 1">

+ 43 - 9
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue Ver fichero

@@ -18,7 +18,6 @@
18 18
             format="yyyy-MM-dd"
19 19
             value-format="yyyy-MM-dd"
20 20
             :picker-options="pickerOptions"
21
-            @change="startTimeChange"
22 21
             :clearable="false"
23 22
            ></el-date-picker>
24 23
             <span>-</span>
@@ -34,9 +33,9 @@
34 33
               format="yyyy-MM-dd"
35 34
               value-format="yyyy-MM-dd"
36 35
               :picker-options="pickerOptions"
37
-              @change="endTimeChange"
38 36
               :clearable="false"
39 37
           ></el-date-picker>
38
+          <el-button  type="primary" icon="el-icon-search" @click="getDrugQuery">查询</el-button>
40 39
           <span style="font-size:14px;color:#606266">药品类型:</span>
41 40
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
42 41
           filterable
@@ -452,19 +451,36 @@ export default {
452 451
            
453 452
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
454 453
               list[i].drugInMoney = list[i].last_price
455
-              list[i].drugSaleMoney = "/"
454
+              if(this.org_id == 0){
455
+                list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
456
+              }else{
457
+                list[i].drugSaleMoney = "/"
458
+              }
459
+             
456 460
 
457 461
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
458 462
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
459
-           
460
-              list[i].drugAddPrice = "/"
461
-              list[i].drugAddSalePrice = "/"
463
+              
464
+              if(this.org_id == 0){
465
+                 list[i].drugAddPrice = list[i].last_price
466
+                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
467
+              }else{
468
+                list[i].drugAddPrice = "/"
469
+                list[i].drugAddSalePrice = "/"
470
+              }
471
+             
462 472
 
463 473
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
464 474
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
465 475
            
466
-              list[i].drugOutPrice = "/"
467
-              list[i].drugOutSalePrice = "/"
476
+              if(this.org_id == 0){
477
+                list[i].drugOutPrice = list[i].retail_price
478
+                list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
479
+              }else{
480
+                list[i].drugOutPrice = "/"
481
+                list[i].drugOutSalePrice = "/"
482
+              }
483
+            
468 484
 
469 485
          
470 486
             if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402 || this.org_id ==10215){
@@ -472,10 +488,17 @@ export default {
472 488
             }else{
473 489
               list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
474 490
             }
475
-            
491
+             
492
+            list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
493
+            if(this.org_id == 0){
494
+                list[i].overDrugPrice = list[i].retail_price
495
+                list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
496
+            }else{
476 497
              list[i].overDrugPrice = "/"
477 498
              list[i].oveDrugSaleMoney = "/"
478 499
             }
500
+           
501
+            }
479 502
             this.tableList = list;
480 503
             this.total = response.data.data.total
481 504
             this.manufacturerList = response.data.data.manufacturerList
@@ -1469,6 +1492,14 @@ export default {
1469 1492
         return max_str + min_str;
1470 1493
       }
1471 1494
     },
1495
+    GetDrugOverOne(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
1496
+      var total = 0
1497
+      
1498
+      total = totalone + totaltwo - totalthree
1499
+       
1500
+      return total
1501
+       
1502
+    },
1472 1503
     GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
1473 1504
       var total_one =0
1474 1505
       var total_two = 0
@@ -1589,6 +1620,9 @@ export default {
1589 1620
         return 0
1590 1621
       }
1591 1622
      
1623
+    },
1624
+    getDrugQuery(){
1625
+      this.getlist()
1592 1626
     }
1593 1627
   }
1594 1628
 }

+ 41 - 22
src/xt_pages/stock/query/purchaseNewStockQuery.vue Ver fichero

@@ -18,7 +18,6 @@
18 18
             align="right"
19 19
             format="yyyy-MM-dd"
20 20
             value-format="yyyy-MM-dd"
21
-            @change="startTimeChange"
22 21
             :picker-options="pickerOptions"
23 22
             :clearable="false"
24 23
            ></el-date-picker> 
@@ -34,10 +33,10 @@
34 33
               align="right"
35 34
               format="yyyy-MM-dd"
36 35
               value-format="yyyy-MM-dd"
37
-              @change="endTimeChange"
38 36
               :picker-options="pickerOptions"
39 37
               :clearable="false"
40 38
           ></el-date-picker>  
39
+          <el-button  type="primary" icon="el-icon-search" @click="getAllQuery">查询</el-button>
41 40
           <span style="font-size:14px;color:#606266">耗材类型:</span>
42 41
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
43 42
           filterable
@@ -69,7 +68,8 @@
69 68
             :class="signAndWeighBoxPatients"
70 69
             border
71 70
           >
72
-          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
71
+        
72
+            <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
73 73
               <template slot-scope="scope">
74 74
                 <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
75 75
               </template>
@@ -287,17 +287,36 @@ export default {
287 287
                
288 288
               }
289 289
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
290
-               list[i].stock_in_price = "/"
291
-               list[i].stockMoney = "/"
290
+               if(this.org_id == 0){
291
+                  list[i].stock_in_price = list[i].buy_price
292
+                  list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
293
+               }else{
294
+                list[i].stock_in_price = "/"
295
+                list[i].stockMoney = "/"
296
+               }
297
+             
292 298
               
293 299
               
294 300
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
295
-              list[i].addStockMoney = "/"
296
-              list[i].saleStockMoney = "/"
301
+
302
+              if(this.org_id == 0){
303
+               list[i].addStockMoney = list[i].buy_price 
304
+                list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
305
+              }else{
306
+               list[i].addStockMoney = "/"
307
+               list[i].saleStockMoney = "/"
308
+              }
309
+             
297 310
 
298 311
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
299
-              list[i].stockOutprice = "/"
300
-              list[i].saleOutMoney = "/"
312
+              if(this.org_id == 0){
313
+                list[i].stockOutprice = list[i].packing_price
314
+                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
315
+              }else{
316
+                list[i].stockOutprice = "/"
317
+                list[i].saleOutMoney = "/"
318
+              }
319
+             
301 320
               if(this.org_id == 10265){
302 321
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
303 322
               }else{
@@ -312,9 +331,14 @@ export default {
312 331
                
313 332
               }
314 333
             
315
-            
316
-              list[i].overPrice = "/"
317
-              list[i].overMoney = "/"
334
+              if(this.org_id == 0){
335
+                list[i].overPrice = list[i].packing_price
336
+                list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
337
+              }else{
338
+                list[i].overPrice = "/"
339
+                list[i].overMoney = "/"
340
+              }
341
+             
318 342
              
319 343
             }
320 344
             console.log("listwowowoowowowow",list)
@@ -622,11 +646,6 @@ export default {
622 646
         countfive +=arr5[i].count
623 647
       }
624 648
     }
625
-    console.log("countOne",countOne)
626
-    console.log("countTwo",countTwo)
627
-    console.log("countthree",countthree)
628
-    console.log("countfour",countfour)
629
-    console.log("*********************")
630 649
     count = countOne - countTwo + countthree - countfour + countfive
631 650
     if(count > 0 ){
632 651
       return count
@@ -660,10 +679,7 @@ export default {
660 679
      }
661 680
     }
662 681
     all_count = count + countOne
663
-    console.log("count2332323223232o2222222222wide",count)
664
-    console.log("countONE23232322323323223",countOne)
665
-    console.log("all_count9999999999999wode",all_count)
666
-    console.log("-------------------------------------------")
682
+
667 683
     if(all_count > 0 ){
668 684
       return all_count
669 685
     }else{
@@ -1150,7 +1166,10 @@ export default {
1150 1166
         }
1151 1167
       }
1152 1168
       return count
1153
-    } 
1169
+    },
1170
+    getAllQuery(){
1171
+     this.getlist()
1172
+    }
1154 1173
   },
1155 1174
 
1156 1175
 }

+ 141 - 205
src/xt_pages/user/lapsoInspection.vue Ver fichero

@@ -88,7 +88,7 @@
88 88
                 type="primary"
89 89
                 icon="el-icon-edit-outline"
90 90
                 @click="openEdit()"
91
-                :disabled="itemDate ? false : true"
91
+                :disabled="itemDateShow ? false : true"
92 92
               >修改
93 93
               </el-button
94 94
               >
@@ -113,9 +113,12 @@
113 113
             </div>
114 114
             <div v-if="!isPic">
115 115
               <el-table
116
+                highlight-current-row
117
+               @current-change="handleCurrentChangeOne"
116 118
                 :header-cell-style="{
117 119
                 backgroundColor: 'rgb(245, 247, 250)',
118 120
                 color: '#606266'
121
+                
119 122
               }"
120 123
                 :row-style="{ color: '#303133' }"
121 124
                 :data="tabileList"
@@ -183,17 +186,6 @@
183 186
   
184 187
             </div>
185 188
   
186
-            <!-- <el-pagination
187
-              align="right"
188
-              @current-change="handleCurrentChangePage"
189
-              :current-page="queryParams.page"
190
-              :page-size="1"
191
-              background
192
-              style="margin-top:20px;"
193
-              layout="total, prev, pager, next, jumper"
194
-              :total="total"
195
-            >
196
-            </el-pagination> -->
197 189
           </el-col>
198 190
         </el-row>
199 191
       </div>
@@ -218,11 +210,6 @@
218 210
               </el-form-item>
219 211
             </el-col>
220 212
   
221
-  <!--          <el-col :span="24">-->
222
-  <!--            <p style="margin-top:20px;">是否弹窗提醒:-->
223
-  <!--              <el-switch v-model="is_open"></el-switch>-->
224
-  <!--            </p>-->
225
-  <!--          </el-col>-->
226 213
           </el-row>
227 214
         </el-form>
228 215
         <div slot="footer" class="dialog-footer">
@@ -281,7 +268,7 @@
281 268
             </el-col>
282 269
             <el-col :span="7">
283 270
               <el-form-item
284
-                label="检验日期"
271
+                label="检验日期222"
285 272
                 prop="inspect_date"
286 273
                 :rules="[
287 274
                   { required: true, message: '请输入检验日期', trigger: 'blur' }
@@ -463,7 +450,8 @@
463 450
     fetchPatientInspections,
464 451
     setRemind,
465 452
     setRemindDialog,
466
-    getNewInspectionList
453
+    getNewInspectionList,
454
+    getNewInspectionDetailList
467 455
   } from '@/api/inspection'
468 456
   import { getFileExtension, uParseTime } from '@/utils/tools'
469 457
   
@@ -523,7 +511,9 @@
523 511
         org_id:0,
524 512
         rowList:[],
525 513
         tabileList:[],
526
-        inspectionList:[]
514
+        inspectionList:[],
515
+        inspectionData:[],
516
+        itemDateShow:false
527 517
       }
528 518
     },
529 519
     methods: {
@@ -729,84 +719,31 @@
729 719
             this.dialogRemindFormVisible = false
730 720
           }
731 721
         })
732
-      }, openEdit() {
733
-  
734
-        if (this.project == null) {
735
-          this.$message.error('请先选择项目')
736
-          return false
737
-        }
738
-        if(this.isPic){
739
-          this.form.pic_method = 'edit'
740
-          this.formTitle = '修改' + this.project.project_name
741
-          this.form.project_id = this.project.project_id
742
-          this.form.inspect_date = this.itemDate
743
-          this.form.old_inspect_date = this.itemDate
744
-          this.form.imgs = []
745
-          this.form.delete_imgs = []
746
-          for(var index in this.inspections){
747
-            this.form.imgs.push({
748
-              id: this.inspections[index].id,
749
-              img_url: this.inspections[index].inspect_value,
750
-              desc: this.inspections[index].item_name
751
-            })
752
-          }
753
-          console.log(this.form.imgs)
754
-          this.dialogPicFormVisible = true
755
-        }else{
756
-          console.log("22222")
757
-          this.form.method = 'edit'
722
+      },
723
+     
724
+      openEdit(){
725
+        this.form.formItem = []
726
+        if(this.inspectionData!=null){
758 727
           this.formTitle = '修改' + this.project.project_name
759
-          this.form.project_id = this.project.project_id
760
-          this.form.inspect_date = this.itemDate
761
-          this.form.old_inspect_date = this.itemDate
762
-          if(this.form.project_id == 14) {
763
-            this.form.remind_cycle = this.patient_info.remind_cycle
764
-          }else{
765
-            this.form.remind_cycle =""
766
-          }
767
-          console.log(this.form.remind_cycle)
768
-           
769
-         
770
-          this.form.formItem = []
771
-          console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
772
-          console.log("inspectionsMap",this.inspectionsMap)
773
-          for (var index in this.project.inspection_reference) {
774
-            if(this.org_id ==10138){
775
-              this.form.formItem.push({
776
-                id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
777
-                project_id: this.project.inspection_reference[index].project_id,
778
-                project_name: this.project.inspection_reference[index].project_name,
779
-                item_id: this.project.inspection_reference[index].id,
780
-                item: this.project.inspection_reference[index].item,
781
-                item_name: this.project.inspection_reference[index].item_name,
782
-                range_type: this.project.inspection_reference[index].range_type,
783
-                value: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].item_id].inspect_value : '',
784
-                select_options: this.project.inspection_reference[index].range_options.split(','),
785
-                unit: this.project.inspection_reference[index].unit,
786
-                item_id:parseInt(this.project.inspection_reference[index].item_id) ,
787
-              })
788
-            }else{
789
-              this.form.formItem.push({
790
-              id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
791
-              project_id: this.project.inspection_reference[index].project_id,
792
-              project_name: this.project.inspection_reference[index].project_name,
793
-              item_id: this.project.inspection_reference[index].id,
794
-              item: this.project.inspection_reference[index].item,
795
-              item_name: this.project.inspection_reference[index].item_name,
796
-              range_type: this.project.inspection_reference[index].range_type,
797
-              value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
798
-              select_options: this.project.inspection_reference[index].range_options.split(','),
799
-              unit: this.project.inspection_reference[index].unit
800
-            })
801
-            }
802
-           
728
+          
729
+          for(let i=0;i<this.inspectionData.length;i++){
730
+            console.log("类型====================",this.inspectionData[i].inspect_type)
731
+            var obj = {id:0,project_id:0,project_name:"",item_id:0,item_name:"",range_type:"",value:"",unit:"",item_id:0} 
732
+            obj.id=this.inspectionData[i].id,
733
+            obj.project_id=this.inspectionData[i].project_id
734
+            obj.project_name=this.inspectionData[i].project_name
735
+            obj.item_id = this.inspectionData[i].item_id
736
+            obj.item_name = this.inspectionData[i].item_name
737
+            obj.range_type = this.inspectionData[i].inspect_type
738
+            obj.value = this.inspectionData[i].inspect_value
739
+            obj.unit = this.inspectionData[i].unit
740
+            this.form.formItem.push(obj)
803 741
           }
804
-          console.log(this.form.formItem)
805
-          this.dialogFormVisible = true
806
-  
807 742
         }
808
-  
809
-      },setRemindDialog(){
743
+        console.log("this.form.formItem-----------------------",this.form.formItem)
744
+        this.dialogFormVisible = true
745
+      },
746
+      setRemindDialog(){
810 747
         this.dialogRemindDialogFormVisible = true
811 748
   
812 749
   
@@ -832,11 +769,6 @@
832 769
         this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
833 770
         this.form.formItem = []
834 771
         for (var index in this.project.inspection_reference) {
835
-          // var formItem = this.project.inspection_reference[index];
836
-          // formItem["value"] = '';
837
-          // if (formItem.range_type==2) {
838
-          //   formItem["select_options"] = formItem.range_options.split(",");
839
-          // }
840 772
           this.form.formItem.push({
841 773
             id: 0,
842 774
             project_id: this.project.inspection_reference[index].project_id,
@@ -893,86 +825,94 @@
893 825
         console.log('form.formItem', this.form.formItem)
894 826
         this.dialogFormVisible = true
895 827
       },
896
-      submitEdit(formName) {
897
-        this.$refs[formName].validate(valid => {
898
-          if (valid) {
899
-            this.formLoading = true
900
-            if (this.form.formItem.length == 0) {
901
-              this.$message.error('未填写项目')
902
-              return false
903
-            }
904
-            for (var index in this.form.formItem) {
905
-              this.form.formItem[index].value = '' + this.form.formItem[index].value
906
-            }
907
-  
908
-            EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
909
-              if (response.data.state == 1) {
910
-                this.$notify({
911
-                  title: '成功',
912
-                  message: '修改成功',
913
-                  type: 'success',
914
-                  duration: 2000
915
-                })
916
-                this.patient_info.remind_cycle =
917
-                  response.data.data.remind_cycle
918
-                this.itemDate = this.form.inspect_date
919
-                this.items = []
920
-                var inspections = response.data.data.inspections
921
-                this.inspections = response.data.data.inspections
922
-                if (inspections == null) {
923
-                  this.inspections = []
924
-                  return false
925
-                }
926
-                var inspectionsMap = {}
927
-                this.inspectionsMap = {}
928
-                for (var index in inspections) {
929
-                  inspectionsMap[inspections[index].item_id] =
930
-                    inspections[index]
931
-                  this.inspectionsMap[inspections[index].item_id] =
932
-                    inspections[index]
933
-                }
934
-                var items = this.project.inspection_reference
935
-                console.log('itmes', items)
936
-                for (var index in items) {
937
-                  if (items[index].id in inspectionsMap) {
938
-                    var item = {}
939
-                    for (var key in items[index]) {
940
-                      item[key] = items[index][key]
941
-                    }
942
-                    item.value = inspectionsMap[items[index].id].inspect_value
943
-                    item.value_direction = ''
944
-                    if (item.range_type == 1) {
945
-                      var value = parseFloat(item.value)
946
-                      var range_min = parseFloat(item.range_min)
947
-                      var range_max = parseFloat(item.range_max)
948
-                      if (value < range_min) {
949
-                        item.value_direction = '↓'
950
-                      } else if (value > range_max) {
951
-                        item.value_direction = '↑'
952
-                      }
953
-                    }
954
-                    this.items.push(item)
955
-                  }
956
-                }
957
-  
958
-                this.resetForm(formName)
959
-                this.dialogFormVisible = false
960
-              } else {
961
-                this.$message.error(response.data.msg)
962
-                return false
963
-              }
964
-            })
965
-              .catch(v => {
966
-                this.$message.error(v)
967
-                return false
968
-              })
969
-            this.formLoading = false
970
-            return false
971
-          } else {
972
-            return false
973
-          }
828
+      // submitEdit(formName) {
829
+      //   this.$refs[formName].validate(valid => {
830
+      //     if (valid) {
831
+      //       this.formLoading = true
832
+      //       if (this.form.formItem.length == 0) {
833
+      //         this.$message.error('未填写项目')
834
+      //         return false
835
+      //       }
836
+      //       for (var index in this.form.formItem) {
837
+      //         this.form.formItem[index].value = '' + this.form.formItem[index].value
838
+      //       }
839
+  
840
+      //       EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
841
+      //         if (response.data.state == 1) {
842
+      //           this.$notify({
843
+      //             title: '成功',
844
+      //             message: '修改成功',
845
+      //             type: 'success',
846
+      //             duration: 2000
847
+      //           })
848
+      //           this.patient_info.remind_cycle =
849
+      //             response.data.data.remind_cycle
850
+      //           this.itemDate = this.form.inspect_date
851
+      //           this.items = []
852
+      //           var inspections = response.data.data.inspections
853
+      //           this.inspections = response.data.data.inspections
854
+      //           if (inspections == null) {
855
+      //             this.inspections = []
856
+      //             return false
857
+      //           }
858
+      //           var inspectionsMap = {}
859
+      //           this.inspectionsMap = {}
860
+      //           for (var index in inspections) {
861
+      //             inspectionsMap[inspections[index].item_id] =
862
+      //               inspections[index]
863
+      //             this.inspectionsMap[inspections[index].item_id] =
864
+      //               inspections[index]
865
+      //           }
866
+      //           var items = this.project.inspection_reference
867
+      //           console.log('itmes', items)
868
+      //           for (var index in items) {
869
+      //             if (items[index].id in inspectionsMap) {
870
+      //               var item = {}
871
+      //               for (var key in items[index]) {
872
+      //                 item[key] = items[index][key]
873
+      //               }
874
+      //               item.value = inspectionsMap[items[index].id].inspect_value
875
+      //               item.value_direction = ''
876
+      //               if (item.range_type == 1) {
877
+      //                 var value = parseFloat(item.value)
878
+      //                 var range_min = parseFloat(item.range_min)
879
+      //                 var range_max = parseFloat(item.range_max)
880
+      //                 if (value < range_min) {
881
+      //                   item.value_direction = '↓'
882
+      //                 } else if (value > range_max) {
883
+      //                   item.value_direction = '↑'
884
+      //                 }
885
+      //               }
886
+      //               this.items.push(item)
887
+      //             }
888
+      //           }
889
+  
890
+      //           this.resetForm(formName)
891
+      //           this.dialogFormVisible = false
892
+      //         } else {
893
+      //           this.$message.error(response.data.msg)
894
+      //           return false
895
+      //         }
896
+      //       })
897
+      //         .catch(v => {
898
+      //           this.$message.error(v)
899
+      //           return false
900
+      //         })
901
+      //       this.formLoading = false
902
+      //       return false
903
+      //     } else {
904
+      //       return false
905
+      //     }
906
+      //   })
907
+      // },
908
+      submitEdit(){
909
+         
910
+         console.log("hhahahahh",this.form.formItem)
911
+        EditPatientNewInspection().then(response=>{
912
+
974 913
         })
975 914
       },
915
+      
976 916
       submitNew(formName) {
977 917
         this.$refs[formName].validate(valid => {
978 918
           if (valid) {
@@ -1154,27 +1094,7 @@
1154 1094
                 }
1155 1095
               }
1156 1096
               this.total += 1
1157
-              // var inspections = response.data.data.inspections
1158
-              // this.inspections = response.data.data.inspections
1159
-              // if (inspections == null) {
1160
-              //   this.inspections = []
1161
-              //   return false
1162
-              // }
1163
-              // var inspectionsMap = {}
1164
-              // this.inspectionsMap = {}
1165
-              //
1166
-              // var items = this.project.inspection_reference
1167
-              // for (var index in items) {
1168
-              //   if (items[index].id in inspectionsMap) {
1169
-              //     var item = {}
1170
-              //     for (var key in items[index]) {
1171
-              //       item[key] = items[index][key]
1172
-              //     }
1173
-              //     item.value = inspectionsMap[items[index].id].inspect_value
1174
-              //     item.value_direction = ''
1175
-              //     this.items.push(item)
1176
-              //   }
1177
-              // }
1097
+             
1178 1098
               this.dialogPicFormVisible = false
1179 1099
               this.queryParams.patient = this.patientID
1180 1100
               this.queryParams.project_id = this.project.project_id
@@ -1239,7 +1159,7 @@
1239 1159
          
1240 1160
         
1241 1161
           this.getNewInspectionList(this.queryParams)
1242
-          this.fetchPatientInspections(this.queryParams)
1162
+          // this.fetchPatientInspections(this.queryParams)
1243 1163
 
1244 1164
         }
1245 1165
       },
@@ -1252,7 +1172,7 @@
1252 1172
       fetchPatientInspections(params) {
1253 1173
         this.items = []
1254 1174
         this.isPic = false
1255
-        console.log("params------------------",params)
1175
+       
1256 1176
         fetchPatientInspections(params)
1257 1177
           .then(response => {
1258 1178
             if (response.data.state == 1) {
@@ -1375,22 +1295,21 @@
1375 1295
       },
1376 1296
 
1377 1297
       getNewInspectionList(params){
1378
-         console.log("params-----",params)
1379 1298
          getNewInspectionList(params).then(response=>{
1380 1299
            if(response.data.state == 1){
1381 1300
              var list =  response.data.data.list
1382
-             console.log("list=====================",list)
1301
+            
1383 1302
              this.isPic = false
1384 1303
              this.tabileList = list
1385 1304
 
1386 1305
              var inspectionGroup = response.data.data.inspectionGroup
1387 1306
 
1388 1307
              this.rowList = inspectionGroup
1389
-              console.log("inspectionGroup",inspectionGroup)
1308
+             
1390 1309
              var inspection = response.data.data.inspection
1391 1310
 
1392 1311
              this.inspectionList = inspection
1393
-             console.log("inspection-------------",inspection)
1312
+           
1394 1313
              this.pageLoading = false
1395 1314
              this.itemLoading = false
1396 1315
              this.formLoading = false
@@ -1405,6 +1324,23 @@
1405 1324
           }
1406 1325
         }
1407 1326
         return inspect_value
1327
+      },
1328
+      handleCurrentChangeOne(val){
1329
+        
1330
+           var params = {
1331
+             patient_id:this.patientID,
1332
+             project_id:val.project_id,
1333
+             inspect_date:val.inspect_date,
1334
+           }
1335
+         getNewInspectionDetailList(params).then(response=>{
1336
+            if(response.data.state == 1){
1337
+                var inspection =  response.data.data.inspection
1338
+                this.itemDateShow = true
1339
+                this.inspectionData = inspection
1340
+                this.form.inspect_date = uParseTime(val.inspect_date, '{y}-{m}-{d} {h}:{i}')
1341
+              
1342
+            }
1343
+         })
1408 1344
       }
1409 1345
     },
1410 1346
     created() {