Преглед изворни кода

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 пре 7 месеци
родитељ
комит
569ad7d9cb

+ 3 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Прегледај датотеку

1412
                         <span v-if="record.prescription.anticoagulant == 16"
1412
                         <span v-if="record.prescription.anticoagulant == 16"
1413
                           >mg</span
1413
                           >mg</span
1414
                         >
1414
                         >
1415
+                        <span v-if="record.prescription.anticoagulant == 15"
1416
+                          >mg</span
1417
+                        >
1415
                         <span v-if="record.prescription.anticoagulant == 17"
1418
                         <span v-if="record.prescription.anticoagulant == 17"
1416
                           >U</span
1419
                           >U</span
1417
                         >
1420
                         >

+ 9 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue Прегледај датотеку

1181
                         <span v-if="record.prescription.anticoagulant == 1"
1181
                         <span v-if="record.prescription.anticoagulant == 1"
1182
                           >mg</span
1182
                           >mg</span
1183
                         >
1183
                         >
1184
+                        <span v-if="record.prescription.anticoagulant == 15"
1185
+                          >mg</span
1186
+                        >
1184
                       </div>
1187
                       </div>
1185
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
1188
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
1186
                         维持:
1189
                         维持:
1229
                         <span v-if="record.prescription.anticoagulant == 1"
1232
                         <span v-if="record.prescription.anticoagulant == 1"
1230
                           >mg/h</span
1233
                           >mg/h</span
1231
                         >
1234
                         >
1235
+                        <span v-if="record.prescription.anticoagulant == 15"
1236
+                          >mg/h</span
1237
+                        >
1232
                       </div>
1238
                       </div>
1233
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
1239
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
1234
                         总量:
1240
                         总量:
1255
                         <span v-if="record.prescription.anticoagulant == 1"
1261
                         <span v-if="record.prescription.anticoagulant == 1"
1256
                           >mg</span
1262
                           >mg</span
1257
                         >
1263
                         >
1264
+                        <span v-if="record.prescription.anticoagulant == 15"
1265
+                          >mg</span
1266
+                        >
1258
                       </div>
1267
                       </div>
1259
 
1268
 
1260
                       <div class="inline_block" style="margin-left: 20px">
1269
                       <div class="inline_block" style="margin-left: 20px">

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue Прегледај датотеку

173
         </li> -->
173
         </li> -->
174
 
174
 
175
 
175
 
176
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
176
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
177
           <label>处方脱水量 : </label>
177
           <label>处方脱水量 : </label>
178
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
178
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
179
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
179
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
180
         </li>
180
         </li>
181
 
181
 
182
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635">
182
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721">
183
           <label>处方脱水量 : </label>
183
           <label>处方脱水量 : </label>
184
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
184
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
185
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>
185
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

+ 2 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Прегледај датотеку

164
                     </el-col>
164
                     </el-col>
165
 
165
 
166
                     <el-col :span="8"
166
                     <el-col :span="8"
167
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
167
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
168
                         <el-form-item label="处方脱水量(ml):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
168
                         <el-form-item label="处方脱水量(ml):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
169
                             <el-input
169
                             <el-input
170
                                     type="number"
170
                                     type="number"
174
                     </el-col>
174
                     </el-col>
175
 
175
 
176
                     <el-col :span="8"
176
                     <el-col :span="8"
177
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635">
177
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
178
                         <el-form-item label="处方脱水量(L):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
178
                         <el-form-item label="处方脱水量(L):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
179
                             <el-input
179
                             <el-input
180
                                     type="number"
180
                                     type="number"

+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Прегледај датотеку

537
               {{
537
               {{
538
                 scope.row.ultrafiltration_rate
538
                 scope.row.ultrafiltration_rate
539
                   ? scope.row.ultrafiltration_rate
539
                   ? scope.row.ultrafiltration_rate
540
-                  : ""
540
+                  : "0"
541
               }}
541
               }}
542
             </template>
542
             </template>
543
           </el-table-column>
543
           </el-table-column>
592
               {{
592
               {{
593
                 scope.row.ultrafiltration_rate
593
                 scope.row.ultrafiltration_rate
594
                   ? scope.row.ultrafiltration_rate
594
                   ? scope.row.ultrafiltration_rate
595
-                  : ""
595
+                  : "0"
596
               }}
596
               }}
597
             </template>
597
             </template>
598
           </el-table-column>
598
           </el-table-column>

+ 1 - 1
src/xt_pages/dialysis/details/index.vue Прегледај датотеку

2756
           newArr.sort(this.compare('created_time'))
2756
           newArr.sort(this.compare('created_time'))
2757
         }
2757
         }
2758
 
2758
 
2759
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679){
2759
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702){
2760
           if(newArr!=null && newArr.length>0){
2760
           if(newArr!=null && newArr.length>0){
2761
             for(let i=0;i<newArr.length;i++){
2761
             for(let i=0;i<newArr.length;i++){
2762
               newArr[i].sort =0
2762
               newArr[i].sort =0

+ 6 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Прегледај датотеку

1439
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1439
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1440
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1440
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1441
                      <span v-if="prescription.anticoagulant == 13">iu</span>
1441
                      <span v-if="prescription.anticoagulant == 13">iu</span>
1442
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
1442
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1443
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1443
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1444
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1444
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1445
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1463
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1464
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1464
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1465
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1465
                      <span v-if="prescription.anticoagulant == 13">iu</span>
1466
                      <span v-if="prescription.anticoagulant == 13">iu</span>
1467
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
1466
                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
1468
                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
1467
                       <span v-if="org_id!=10644">mg</span>
1469
                       <span v-if="org_id!=10644">mg</span>
1468
                       <span v-if="org_id==10644">iu</span>
1470
                       <span v-if="org_id==10644">iu</span>
1514
                             <span v-if="org_id==10644">iu/h</span>
1516
                             <span v-if="org_id==10644">iu/h</span>
1515
                           </span>
1517
                           </span>
1516
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
1518
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
1519
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
1517
                       </span>
1520
                       </span>
1518
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
1521
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
1519
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
1522
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
1532
                             <span v-if="org_id==10644">iu/h</span>
1535
                             <span v-if="org_id==10644">iu/h</span>
1533
                           </span>
1536
                           </span>
1534
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
1537
                           <span v-if="prescription.anticoagulant == 17">U/h</span>
1538
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
1535
                       </span>
1539
                       </span>
1536
                     </div>
1540
                     </div>
1537
                     <div
1541
                     <div
1596
                       <span v-if="prescription.anticoagulant == 13">iu</span>
1600
                       <span v-if="prescription.anticoagulant == 13">iu</span>
1597
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1601
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1598
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1602
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1603
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
1599
 
1604
 
1600
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1605
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1601
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
1606
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
1623
                         <span v-if="org_id==10644">iu</span>
1628
                         <span v-if="org_id==10644">iu</span>
1624
                       </span>
1629
                       </span>
1625
                       <span v-if="prescription.anticoagulant == 17">U</span>
1630
                       <span v-if="prescription.anticoagulant == 17">U</span>
1631
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
1626
                     </span>
1632
                     </span>
1627
                     </div>
1633
                     </div>
1628
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
1634
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue Прегледај датотеку

3715
         //    this.advice_groups.push(group)
3715
         //    this.advice_groups.push(group)
3716
         //   }
3716
         //   }
3717
         // }
3717
         // }
3718
-        if (this.doctor_advices.length <= 6) {
3719
-          var nl = 6;
3720
-          this.print_length = 6;
3718
+        if (this.doctor_advices.length <= 4) {
3719
+          var nl = 4;
3720
+          this.print_length = 4;
3721
 
3721
 
3722
           for (let index = 0; index < nl; index++) {
3722
           for (let index = 0; index < nl; index++) {
3723
             if (
3723
             if (

+ 7 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Прегледај датотеку

1067
                      <span v-if="prescription.anticoagulant == 9">iu</span>
1067
                      <span v-if="prescription.anticoagulant == 9">iu</span>
1068
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1068
                      <span v-if="prescription.anticoagulant == 10">iu</span>
1069
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1069
                      <span v-if="prescription.anticoagulant == 11">iu</span>
1070
-                     <span v-if="prescription.anticoagulant == 13">iu</span>
1071
-
1070
+                     <span v-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
1071
+                     <span v-if="prescription.anticoagulant == 15">mg</span>
1072
+                     
1072
                     </span>
1073
                     </span>
1073
                     </div>
1074
                     </div>
1074
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
1075
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
1096
                           <span v-if="prescription.anticoagulant == 9">iu/h</span>
1097
                           <span v-if="prescription.anticoagulant == 9">iu/h</span>
1097
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
1098
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
1098
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
1099
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
1099
-                          <span v-if="prescription.anticoagulant == 13">iu/h</span>
1100
+                          <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu/h</span>
1101
+                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
1100
                       </span>
1102
                       </span>
1101
                     </div>
1103
                     </div>
1102
                     <div
1104
                     <div
1162
                        <span v-if="prescription.anticoagulant == 9">iu</span>
1164
                        <span v-if="prescription.anticoagulant == 9">iu</span>
1163
                        <span v-if="prescription.anticoagulant == 10">iu</span>
1165
                        <span v-if="prescription.anticoagulant == 10">iu</span>
1164
                       <span v-if="prescription.anticoagulant == 11">iu</span>
1166
                       <span v-if="prescription.anticoagulant == 11">iu</span>
1165
-                      <span v-if="prescription.anticoagulant == 13">iu</span>
1167
+                      <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu</span>
1168
+                      <span v-if="prescription.anticoagulant == 15">mg</span>
1166
                     </span>
1169
                     </span>
1167
                     </div>
1170
                     </div>
1168
                     <div class="inline_block" style="margin-left: 20px">
1171
                     <div class="inline_block" style="margin-left: 20px">

+ 26 - 26
src/xt_pages/stock/detail/stockOutDetail.vue Прегледај датотеку

15
       type="primary"
15
       type="primary"
16
       v-if="orgId !=10480"
16
       v-if="orgId !=10480"
17
       >明细导出
17
       >明细导出
18
-     
18
+
19
     </el-button>
19
     </el-button>
20
     <el-button
20
     <el-button
21
       style="float: right;margin-right:10px"
21
       style="float: right;margin-right:10px"
24
       type="primary"
24
       type="primary"
25
       v-if="orgId ==10480"
25
       v-if="orgId ==10480"
26
       >明细导出
26
       >明细导出
27
-     
27
+
28
     </el-button>
28
     </el-button>
29
      <el-button
29
      <el-button
30
       style="float: right;margin-right:10px"
30
       style="float: right;margin-right:10px"
142
             {{ getManufactuerName(scope.row.manufacturer) }}
142
             {{ getManufactuerName(scope.row.manufacturer) }}
143
           </template>
143
           </template>
144
         </el-table-column>
144
         </el-table-column>
145
-<!-- 
145
+<!--
146
         <el-table-column label="进销商" align="center">
146
         <el-table-column label="进销商" align="center">
147
             <template slot-scope="scope">
147
             <template slot-scope="scope">
148
               {{ getDealerName(scope.row.dealer) }}
148
               {{ getDealerName(scope.row.dealer) }}
189
             <span v-if="scope.row.is_total == 0">
189
             <span v-if="scope.row.is_total == 0">
190
               <span v-if="orgId!=9583">{{ scope.row.count }}</span>
190
               <span v-if="orgId!=9583">{{ scope.row.count }}</span>
191
               <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
191
               <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
192
-            </span> 
192
+            </span>
193
             <span v-if="scope.row.is_total == 1">
193
             <span v-if="scope.row.is_total == 1">
194
               {{scope.row.count}}
194
               {{scope.row.count}}
195
             </span>
195
             </span>
196
           </template>
196
           </template>
197
         </el-table-column>
197
         </el-table-column>
198
-      
198
+
199
         <el-table-column label="总价" align="center">
199
         <el-table-column label="总价" align="center">
200
           <template slot-scope="scope">
200
           <template slot-scope="scope">
201
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
201
             <span v-if="scope.row.is_total == 0 && scope.row.price > 0">{{getTotal(scope.row.price, scope.row.count)}}</span>
265
     this.fetchAllAdminUsers();
265
     this.fetchAllAdminUsers();
266
     this.goodUnit = this.$store.getters.good_unit
266
     this.goodUnit = this.$store.getters.good_unit
267
     var org_id = this.$store.getters.xt_user.org.id
267
     var org_id = this.$store.getters.xt_user.org.id
268
-   
268
+
269
     this.orgId = org_id
269
     this.orgId = org_id
270
 
270
 
271
 
271
 
388
           this.wareOutList =  response.data.data.list
388
           this.wareOutList =  response.data.data.list
389
           this.patientsList = []
389
           this.patientsList = []
390
           this.patientsList = response.data.data.patientsList
390
           this.patientsList = response.data.data.patientsList
391
-         
391
+
392
           var total = 0
392
           var total = 0
393
           var objOne = {
393
           var objOne = {
394
             warehouse_out_order_number: "合计",
394
             warehouse_out_order_number: "合计",
408
             this.cancelStockDate.push(obj);
408
             this.cancelStockDate.push(obj);
409
             objOne.count += response.data.data.list[i].count
409
             objOne.count += response.data.data.list[i].count
410
           }
410
           }
411
-       
411
+
412
           this.cancelStockDate.push(objOne);
412
           this.cancelStockDate.push(objOne);
413
 
413
 
414
         }
414
         }
479
             }
479
             }
480
             objOne.count +=response.data.data.list[i].count
480
             objOne.count +=response.data.data.list[i].count
481
             obj["is_total"] = 0;
481
             obj["is_total"] = 0;
482
-            
482
+
483
             this.cancelStockDate.push(obj);
483
             this.cancelStockDate.push(obj);
484
           }
484
           }
485
 
485
 
602
      },
602
      },
603
      getDealerNameOne(id){
603
      getDealerNameOne(id){
604
        var dealer_name = ""
604
        var dealer_name = ""
605
-     
605
+
606
        for(let i=0;i<this.dealerList.length;i++){
606
        for(let i=0;i<this.dealerList.length;i++){
607
           if(id == this.dealerList[i].id){
607
           if(id == this.dealerList[i].id){
608
               dealer_name = this.dealerList[i].dealer_name
608
               dealer_name = this.dealerList[i].dealer_name
609
           }
609
           }
610
        }
610
        }
611
        return dealer_name
611
        return dealer_name
612
-     }, 
612
+     },
613
     getManufactuerName: function(manufacturer_id) {
613
     getManufactuerName: function(manufacturer_id) {
614
       for (let i = 0; i < this.manufacturer.length; i++) {
614
       for (let i = 0; i < this.manufacturer.length; i++) {
615
         if (this.manufacturer[i].id == manufacturer_id) {
615
         if (this.manufacturer[i].id == manufacturer_id) {
755
     PrintAction: function() {
755
     PrintAction: function() {
756
       window.sessionStorage.setItem('start',this.start_time)
756
       window.sessionStorage.setItem('start',this.start_time)
757
       window.sessionStorage.setItem('end',this.end_time)
757
       window.sessionStorage.setItem('end',this.end_time)
758
-     
758
+
759
       if(this.orgId != 9671){
759
       if(this.orgId != 9671){
760
         this.$router.push({
760
         this.$router.push({
761
           path: "/stock/print",
761
           path: "/stock/print",
782
           }
782
           }
783
         });
783
         });
784
       }
784
       }
785
-    
785
+
786
     },
786
     },
787
     // getPrintStockGood(){
787
     // getPrintStockGood(){
788
     //   const params = {
788
     //   const params = {
887
       },
887
       },
888
 
888
 
889
     exportList(){
889
     exportList(){
890
-    
890
+
891
        for(let i=0;i<this.tableOut.length;i++){
891
        for(let i=0;i<this.tableOut.length;i++){
892
         this.tableOut[i].index = i+1
892
         this.tableOut[i].index = i+1
893
         this.tableOut[i].good_name = this.tableOut[i].good_name
893
         this.tableOut[i].good_name = this.tableOut[i].good_name
933
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
933
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
934
         }else if(this.orgId==10445){
934
         }else if(this.orgId==10445){
935
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
935
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
936
+        }else if(this.orgId==10635){
937
+           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
936
         }else{
938
         }else{
937
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
939
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
938
         }
940
         }
939
 
941
 
940
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
942
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610||this.orgId==0){
941
-
942
-         this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
943
+            this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
943
         }
944
         }
944
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.org_id ==10635 || this.org_id ==10726 || this.org_id == 10724 || this.org_id ==10635 || this.org_id ==10724 || this.org_id ==10726 || this.org_id ==10721){
945
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721){
945
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
946
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
946
-         
947
         }
947
         }
948
         if(this.orgId ==10445){
948
         if(this.orgId ==10445){
949
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
949
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
950
         }
950
         }
951
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.org_id !=10635  &&  this.org_id !=10724 &&  this.org_id !=10726  &&  this.org_id !=10721){
951
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721){
952
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
952
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
953
         }
953
         }
954
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
954
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
955
-       
955
+
956
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
956
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
957
 
957
 
958
         this.tableOut[i].order_time = this.start_time + " ~ " + this.end_time
958
         this.tableOut[i].order_time = this.start_time + " ~ " + this.end_time
959
        }
959
        }
960
        console.log("retusoossoso",this.tableOut)
960
        console.log("retusoossoso",this.tableOut)
961
-       
961
+
962
        import('@/vendor/Export2Excel').then(excel => {
962
        import('@/vendor/Export2Excel').then(excel => {
963
        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
963
        const tHeader = ['序号','耗材名称', '规格型号','生产厂商','进销商', '单位','数量','出货价','总价','出库时间','备注']
964
 
964
 
977
      },
977
      },
978
      exportListDetail(){
978
      exportListDetail(){
979
         console.log("hahhdhafhhahdf",this.tableDataList)
979
         console.log("hahhdhafhhahdf",this.tableDataList)
980
-      
980
+
981
         var obj = {index:"合计",total_price:0}
981
         var obj = {index:"合计",total_price:0}
982
         var total = 0
982
         var total = 0
983
         for(let i=0;i<this.tableDataList.length;i++){
983
         for(let i=0;i<this.tableDataList.length;i++){
1007
         }
1007
         }
1008
         obj.total_price = total.toFixed(2)
1008
         obj.total_price = total.toFixed(2)
1009
         console.log("WOHHAHHAHAH",this.tableDataList)
1009
         console.log("WOHHAHHAHAH",this.tableDataList)
1010
-      
1010
+
1011
         this.tableDataList.push(obj)
1011
         this.tableDataList.push(obj)
1012
        import('@/vendor/Export2Excel').then(excel => {
1012
        import('@/vendor/Export2Excel').then(excel => {
1013
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
1013
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','生产厂商','进销商','批号','生产日期','有效日期','操作时间','制单人','进货价','出货价','使用患者','数量','总价']
1049
               this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
1049
               this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
1050
               this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
1050
               this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
1051
               this.tableDataList[i].project_name ="居民报销"
1051
               this.tableDataList[i].project_name ="居民报销"
1052
-            
1052
+
1053
               out_total += this.tableDataList[i].count * this.tableDataList[i].price
1053
               out_total += this.tableDataList[i].count * this.tableDataList[i].price
1054
               in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
1054
               in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
1055
 
1055
 
1166
       return total
1166
       return total
1167
     },
1167
     },
1168
     getPatientName(id){
1168
     getPatientName(id){
1169
-     
1169
+
1170
       var name =""
1170
       var name =""
1171
       for(let i=0;i<this.patientsList.length;i++){
1171
       for(let i=0;i<this.patientsList.length;i++){
1172
         if(id == this.patientsList[i].id){
1172
         if(id == this.patientsList[i].id){
1199
 //   display: flex;
1199
 //   display: flex;
1200
 //   flex-direction: column;
1200
 //   flex-direction: column;
1201
 //   .el-table__header-wrapper {
1201
 //   .el-table__header-wrapper {
1202
-//     height: 70px !important; 
1202
+//     height: 70px !important;
1203
 //   }
1203
 //   }
1204
 // }
1204
 // }
1205
 </style>
1205
 </style>

+ 25 - 0
src/xt_pages/user/components/PatientDetail.vue Прегледај датотеку

393
               </el-form-item>
393
               </el-form-item>
394
             </el-col>
394
             </el-col>
395
 
395
 
396
+            <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
397
+                <el-form-item
398
+                  label="患者类型 : "
399
+                  class="is-required"
400
+                  prop="source"
401
+                >
402
+                  <el-radio-group v-model="form.patient_type">
403
+                    <el-radio
404
+                      v-for="item in patientType"
405
+                      :key="item.value"
406
+                      :label="item.value"
407
+                      :value="item.value"
408
+                      >{{ item.label }}</el-radio
409
+                    >
410
+                  </el-radio-group>
411
+                </el-form-item>
412
+              </el-col>
413
+
414
+
396
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
415
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
397
                 <el-form-item
416
                 <el-form-item
398
                   label="患者去向 : "
417
                   label="患者去向 : "
1647
   allergic_history:"",
1666
   allergic_history:"",
1648
   print_date:"",
1667
   print_date:"",
1649
   famality_record:"",
1668
   famality_record:"",
1669
+  patient_type:"",
1650
 };
1670
 };
1651
 
1671
 
1652
 export default {
1672
 export default {
1753
       operators:[],
1773
       operators:[],
1754
       liuAddresslist:[],
1774
       liuAddresslist:[],
1755
       patientVascularAccessOne:{},
1775
       patientVascularAccessOne:{},
1776
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
1756
     };
1777
     };
1757
   },
1778
   },
1758
   computed: {
1779
   computed: {
2036
             this.form.allergic_history = patietInfo.allergic_history
2057
             this.form.allergic_history = patietInfo.allergic_history
2037
             this.form.infectious_remark = patietInfo.infectious_remark
2058
             this.form.infectious_remark = patietInfo.infectious_remark
2038
             this.form.famality_record  = patietInfo.famality_record
2059
             this.form.famality_record  = patietInfo.famality_record
2060
+            if(patietInfo.patient_type >0){
2061
+               this.form.patient_type = patietInfo.patient_type
2062
+            }
2039
             // this.form.initial = patietInfo.initial_dialysis + "";
2063
             // this.form.initial = patietInfo.initial_dialysis + "";
2040
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
2064
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
2041
             // this.form.assessment = patietInfo.evaluate;
2065
             // this.form.assessment = patietInfo.evaluate;
2371
             } else {
2395
             } else {
2372
               this.patientPrint.hospital_first_dialysis_date = "";
2396
               this.patientPrint.hospital_first_dialysis_date = "";
2373
             }
2397
             }
2398
+          
2374
             // this.checkIdCardNo();
2399
             // this.checkIdCardNo();
2375
           } else {
2400
           } else {
2376
             console.log("patient get err state");
2401
             console.log("patient get err state");

+ 33 - 2
src/xt_pages/user/components/PatientForm.vue Прегледај датотеку

437
                   </el-radio-group>
437
                   </el-radio-group>
438
                 </el-form-item>
438
                 </el-form-item>
439
               </el-col>
439
               </el-col>
440
+
441
+              <el-col :span="24" :style="isEdit ? 'width:600px' : ''">
442
+                <el-form-item
443
+                  label="患者类型 : "
444
+                  class="is-required"
445
+                  prop="source"
446
+                >
447
+                  <el-radio-group v-model="form.patient_type">
448
+                    <el-radio
449
+                      v-for="item in patientType"
450
+                      :key="item.value"
451
+                      :label="item.value"
452
+                      :value="item.value"
453
+                      >{{ item.label }}</el-radio
454
+                    >
455
+                  </el-radio-group>
456
+                </el-form-item>
457
+              </el-col>
458
+
459
+              
440
       
460
       
441
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
461
               <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
442
                 <el-form-item
462
                 <el-form-item
1166
   response_result: "",
1186
   response_result: "",
1167
   remind_cycle: 0,
1187
   remind_cycle: 0,
1168
   record_date: "",
1188
   record_date: "",
1169
-
1189
+  patient_type:"1",
1170
   tell_phone: "",
1190
   tell_phone: "",
1171
   first_treatment_date: "",
1191
   first_treatment_date: "",
1172
   dialysis_age: "",
1192
   dialysis_age: "",
1430
       // typeOptions: null,
1450
       // typeOptions: null,
1431
       // styleOptions: null,
1451
       // styleOptions: null,
1432
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }, { value: 3, label: "门特" }],
1452
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }, { value: 3, label: "门特" }],
1453
+      patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
1433
       patientSourceList:[
1454
       patientSourceList:[
1434
         {value:1,label:"门诊"},
1455
         {value:1,label:"门诊"},
1435
         {value:2,label:"住院"},
1456
         {value:2,label:"住院"},
1711
             }
1732
             }
1712
             console.log("form---",this.form)
1733
             console.log("form---",this.form)
1713
 
1734
 
1735
+            if(this.form.patient_type >0){
1736
+               this.form.patient_type = parseInt(this.form.patient_type)
1737
+            }
1738
+
1714
             editPatient(this.patientID, this.form)
1739
             editPatient(this.patientID, this.form)
1715
 
1740
 
1716
               .then(response => {
1741
               .then(response => {
1755
             }
1780
             }
1756
             console.log("form233322332w",this.form)
1781
             console.log("form233322332w",this.form)
1757
 
1782
 
1783
+            if(this.form.patient_type >0){
1784
+               this.form.patient_type = parseInt(this.form.patient_type)
1785
+            }
1786
+
1758
             createPatient(this.form)
1787
             createPatient(this.form)
1759
               .then(response => {
1788
               .then(response => {
1760
                 if (response.data.state == 0) {
1789
                 if (response.data.state == 0) {
2113
             this.form.patient_address = patietInfo.patient_address
2142
             this.form.patient_address = patietInfo.patient_address
2114
             this.form.allergic_history = patietInfo.allergic_history
2143
             this.form.allergic_history = patietInfo.allergic_history
2115
             this.form.infectious_remark = patietInfo.infectious_remark
2144
             this.form.infectious_remark = patietInfo.infectious_remark
2116
-          
2145
+            if(patietInfo.patient_type >0){
2146
+              this.form.patient_type = patietInfo.patient_type
2147
+            }
2117
 
2148
 
2118
             // this.checkIdCardNo();
2149
             // this.checkIdCardNo();
2119
           } else {
2150
           } else {