Procházet zdrojové kódy

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

yq1 před 1 rokem
rodič
revize
86c1e277f5

+ 2 - 11
src/xt_pages/Pharmacy/PatientDispensing.vue Zobrazit soubor

@@ -648,8 +648,7 @@ export default {
648 648
         confirmButtonText: "确 定",
649 649
         cancelButtonText: "取 消",
650 650
         type: "warning",
651
-      })
652
-        .then(() => {
651
+      }).then(() => {
653 652
           dispensingmedicine(params).then((res) => {
654 653
             if (res.data.state == 1) {
655 654
               this.$message.success("操作成功");
@@ -658,15 +657,7 @@ export default {
658 657
               this.tableData = null;
659 658
               this.fun4(tmp);
660 659
               this.state = 2;
661
-              // console.log("this.alreadmount_data",this.alreadmount_data)
662
-              // for (let i = 0;i < this.alreadmount_data.length;i++){
663
-              //   console.log("tmp = ",tmp)
664
-              //     if (this.alreadmount_data[i].PatientID == tmp){
665
-              //       console.log("i = ",i)
666
-              //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
667
-              //       this.handleCurrentChange(this.alreadmount_data[i])
668
-              //     }
669
-              // }
660
+           
670 661
             } else {
671 662
               this.$message.error(res.data.msg);
672 663
             }

+ 7 - 7
src/xt_pages/dialysis/details/DialysisPrescription.vue Zobrazit soubor

@@ -62,10 +62,10 @@
62 62
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
63 63
           <label>总量: </label>
64 64
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
65
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
65
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45 && this.$store.getters.xt_user.template_info.org_id != 10600">
66 66
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
67
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
68
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
67
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65  && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
68
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
69 69
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
70 70
             
71 71
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
@@ -204,8 +204,8 @@
204 204
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
205 205
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
206 206
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
207
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
208
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
207
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0 && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
208
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10600)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
209 209
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
210 210
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
211 211
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
@@ -315,8 +315,8 @@
315 315
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
316 316
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
317 317
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
318
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
319
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
318
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.org_id!=10600 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
319
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
320 320
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
321 321
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
322 322
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}

+ 2 - 1
src/xt_pages/dialysis/details/consumable/dialysisGather.vue Zobrazit soubor

@@ -441,6 +441,7 @@
441 441
     import { uParseTime } from "@/utils/tools";
442 442
     import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
443 443
     import { getDataConfig } from '@/utils/data'
444
+    import print from "print-js";
444 445
     const moment = require('moment')
445 446
     import store from "@/store";
446 447
     export default {
@@ -659,7 +660,7 @@
659 660
                     if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf("导管")!=-1){
660 661
                          total_one ++
661 662
                     }
662
-                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')==-1){
663
+                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')!=-1){
663 664
                         total_two ++
664 665
                     }
665 666
                   }

+ 1 - 1
src/xt_pages/dialysis/newDoctorAdvice.vue Zobrazit soubor

@@ -1332,7 +1332,7 @@ export default {
1332 1332
          if(nameOne == '全部'){
1333 1333
           nameOne = ""
1334 1334
         }
1335
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
1335
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword,excution_way:this.excution_way} });
1336 1336
 
1337 1337
     },
1338 1338
     batchPrintActionOne: function() {

+ 23 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue Zobrazit soubor

@@ -1545,10 +1545,29 @@ export default {
1545 1545
       return "";
1546 1546
     },
1547 1547
     getAge: function (val) {
1548
-      if (val.birthday != 0) {
1549
-        return jsGetAge(val.birth, "-");
1550
-      } else {
1551
-        return "";
1548
+      // if (val.birthday != 0) {
1549
+      //   return jsGetAge(val.birth, "-");
1550
+      // } else {
1551
+      //   return "";
1552
+      // }
1553
+      if (val.id_card_no) {
1554
+        var thisLen = val.id_card_no.length
1555
+
1556
+        var birth = ''
1557
+        if (thisLen == 15) {
1558
+          birth = '19' + val.id_card_no.substr(6, 6)
1559
+        } else {
1560
+          birth = val.id_card_no.substr(6, 8)
1561
+        }
1562
+        var birthtwo =
1563
+          birth.substr(0, 4) +
1564
+          '-' +
1565
+          birth.substr(4, 2) +
1566
+          '-' +
1567
+          birth.substr(6, 2)
1568
+
1569
+        var age = jsGetAge(birthtwo, '-')
1570
+        return age
1552 1571
       }
1553 1572
     },
1554 1573
     newAdviceGroupObject: function () {

+ 9 - 3
src/xt_pages/stock/drugs/drugStockOutOrder.vue Zobrazit soubor

@@ -1580,18 +1580,19 @@ export default {
1580 1580
       });
1581 1581
     },
1582 1582
     toExport() {
1583
-
1583
+      
1584
+      console.log("EXPORTLSOT",this.exportList)
1584 1585
       if (this.order_id == "") {
1585 1586
         this.$message.error("请勾选出库单");
1586 1587
         return;
1587 1588
       }
1588
-     
1589
+      
1589 1590
       for (let i = 0; i < this.exportList.length; i++) {
1590 1591
         this.exportList[i].retail_price_one = 0
1591 1592
         if(this.outInfoList.length!=null){
1592 1593
           for(let j=0;j<this.outInfoList.length;j++){
1593 1594
            if(this.exportList[i].warehouse_out_id == this.outInfoList[j].warehouse_out_id && this.exportList[i].drug_id == this.outInfoList[j].drug_id){
1594
-            this.exportList[i].retail_price_one = this.outInfoList[j].price
1595
+             this.exportList[i].retail_price_one = this.outInfoList[j].price
1595 1596
            }
1596 1597
         }
1597 1598
         }
@@ -1630,6 +1631,9 @@ export default {
1630 1631
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
1631 1632
           }
1632 1633
         }
1634
+        if(this.exportList[i].retail_price ==0){
1635
+           this.exportList[i].retail_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
1636
+        }
1633 1637
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
1634 1638
       }
1635 1639
 
@@ -1682,6 +1686,8 @@ export default {
1682 1686
       
1683 1687
 
1684 1688
         const data = this.formatJson(filterVal, this.exportList);
1689
+        console.log("Datewoo2o2o2o",data)
1690
+      
1685 1691
         excel.export_json_to_excel({
1686 1692
           header: tHeader,
1687 1693
           data,

+ 30 - 2
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue Zobrazit soubor

@@ -249,6 +249,20 @@
249 249
             </template>
250 250
           </el-table-column>
251 251
 
252
+
253
+          <el-table-column label="使用患者"  width="150" align="center">
254
+            <template slot-scope="scope">
255
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
256
+                <el-option
257
+                  v-for="(option, index) in patients"
258
+                  :key="index"
259
+                  :label="option.name"
260
+                  :value="option.id">
261
+                </el-option>
262
+               </el-select>
263
+            </template>
264
+          </el-table-column>
265
+
252 266
           <!-- <el-table-column width="120" align="center">
253 267
             <template slot="header" slot-scope="scope">
254 268
               <span>进货价</span>
@@ -502,6 +516,7 @@ export default {
502 516
       showCheck:false,
503 517
       showReturnCheck:false,
504 518
       warehouse_out_id:0,
519
+      patients:[],
505 520
     };
506 521
   },
507 522
   methods: {
@@ -544,7 +559,14 @@ export default {
544 559
             response.data.data.configlist.drug_storehouse_out;
545 560
           this.list = response.data.data.list;
546 561
           this.doctorList = response.data.data.doctorList;
547
-          
562
+          var obj ={id:0,name:"系统"}
563
+          this.patients =[]
564
+          this.patients.push(obj)
565
+          if(response.data.data.patients!=null){
566
+            for(let i=0;i<response.data.data.patients.length;i++){
567
+              this.patients.push(response.data.data.patients[i])
568
+            }
569
+          }
548 570
           // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
549 571
         
550 572
         }
@@ -594,6 +616,9 @@ export default {
594 616
       tempObj["max_unit_fisrt"] = 0;
595 617
       tempObj["min_unit_fisrt"] = 0;
596 618
       tempObj["total_price"] = 0;
619
+      tempObj["patient_id"] =0
620
+      tempObj["expiry_date"] = ""
621
+      tempObj["product_date"] = ""
597 622
       this.recordInfo.recordData.push(tempObj);
598 623
     },
599 624
     handleDelete: function (index, row) {
@@ -779,7 +804,7 @@ export default {
779 804
                 warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
780 805
                 warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
781 806
                 warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
782
-
807
+                warehousingOutInfo[i].patient_id = warehousingOutInfo[i].patient_id
783 808
                 for(let z=0;z<drugTypeList.length;z++){
784 809
                    if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
785 810
                       warehousingOutInfo[i].drug_type = drugTypeList[z].name
@@ -1208,6 +1233,9 @@ export default {
1208 1233
     tempObj["max_unit_fisrt"] = 0;
1209 1234
     tempObj["min_unit_fisrt"] = 0;
1210 1235
     tempObj["total_price"] = 0;
1236
+    tempObj["patient_id"] = 0
1237
+    tempObj["product_date"] = ""
1238
+    tempObj["expiry_date"]=""
1211 1239
     this.recordInfo.recordData.push(tempObj);
1212 1240
     this.GetConfigInfo();
1213 1241
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 30 - 4
src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue Zobrazit soubor

@@ -276,6 +276,25 @@
276 276
             </template>
277 277
           </el-table-column>
278 278
 
279
+          <el-table-column label="使用患者" width="140" align="center">
280
+            <template slot-scope="scope">
281
+              <el-select
282
+                v-model="scope.row.patient_id"
283
+                filterable
284
+                placeholder="请选择使用患者"
285
+                :disabled="drug_show"
286
+              >
287
+                <el-option
288
+                  v-for="(option, index) in patients"
289
+                  :key="index"
290
+                  :label="option.name"
291
+                  :value="option.id"
292
+                >
293
+                </el-option>
294
+              </el-select>
295
+            </template>
296
+          </el-table-column>
297
+
279 298
           <!-- <el-table-column width="120" align="center">
280 299
             <template slot="header" slot-scope="scope">
281 300
               <span>进货价</span>
@@ -530,6 +549,7 @@ export default {
530 549
       storehouse_id: "",
531 550
       is_check:0,
532 551
       order_id:0,
552
+      patients:[]
533 553
     };
534 554
   },
535 555
   methods: {
@@ -664,6 +684,7 @@ export default {
664 684
       tempObj["total_count"] = 0;
665 685
       tempObj["max_unit_fisrt"] = 0;
666 686
       tempObj["min_unit_fisrt"] = 0;
687
+      tempObj["patient_id"] =0
667 688
       this.recordInfo.recordData.push(tempObj);
668 689
     },
669 690
     handleDelete: function (index, row) {
@@ -933,10 +954,7 @@ export default {
933 954
               response.data.data.list[i].drug.min_unit +
934 955
               "/" +
935 956
               response.data.data.list[i].drug.max_unit;
936
-            // if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
937
-            //    response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
938
-            //    response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
939
-            // }
957
+          
940 958
             if (
941 959
               response.data.data.list[i].number == "0" ||
942 960
               response.data.data.list[i].number == 0
@@ -1017,6 +1035,14 @@ export default {
1017 1035
           );
1018 1036
           this.houstList = response.data.data.houstList;
1019 1037
           this.doctorList = response.data.data.doctorList;
1038
+          var obj ={id:0,name:"系统"}
1039
+          this.patients =[]
1040
+          this.patients.push(obj)
1041
+          if(response.data.data.patients!=null){
1042
+            for(let i=0;i<response.data.data.patients.length;i++){
1043
+              this.patients.push(response.data.data.patients[i])
1044
+            }
1045
+          }
1020 1046
         }
1021 1047
 
1022 1048
         if (this.recordInfo.recordData.length == 0) {

+ 28 - 0
src/xt_pages/stock/stockOutOrderAdd.vue Zobrazit soubor

@@ -201,6 +201,20 @@
201 201
                </el-select>
202 202
             </template>
203 203
           </el-table-column>
204
+
205
+
206
+          <el-table-column label="使用患者"  width="150" align="center">
207
+            <template slot-scope="scope">
208
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
209
+                <el-option
210
+                  v-for="(option, index) in patients"
211
+                  :key="index"
212
+                  :label="option.name"
213
+                  :value="option.id">
214
+                </el-option>
215
+               </el-select>
216
+            </template>
217
+          </el-table-column>
204 218
 <!--
205 219
           <el-table-column  width="150" align="center">
206 220
             <template slot="header" slot-scope="scope">
@@ -435,6 +449,7 @@ export default {
435 449
       warehouseOut_id:0,
436 450
       is_check:0,
437 451
       loading:false,
452
+      patients:[]
438 453
     };
439 454
   },
440 455
   methods: {
@@ -500,6 +515,15 @@ export default {
500 515
           this.list = response.data.data.list
501 516
           this.storehouse_id = response.data.data.configlist.storehouse_out_info
502 517
           this.doctorList =  response.data.data.doctorList
518
+          var obj ={id:0,name:"系统"}
519
+          this.patients =[]
520
+          this.patients.push(obj)
521
+          if(response.data.data.patients!=null){
522
+            for(let i=0;i<response.data.data.patients.length;i++){
523
+              this.patients.push(response.data.data.patients[i])
524
+            }
525
+          }
526
+          
503 527
         }
504 528
       });
505 529
     },
@@ -549,6 +573,7 @@ export default {
549 573
       tempObj["stock_count"] = ""
550 574
       tempObj["id"] = 0
551 575
       tempObj['register_number'] = ''
576
+      tempObj['patient_id'] =0
552 577
       this.recordInfo.recordData.push(tempObj);
553 578
     },
554 579
     handleDelete: function(index, row) {
@@ -800,6 +825,7 @@ export default {
800 825
                     warehouseOutInfoList[i].name =  warehouseOutInfoList[i].GoodInfo.specification_name +"/"+ warehouseOutInfoList[i].GoodInfo.packing_unit
801 826
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
802 827
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
828
+                    warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
803 829
 
804 830
                  }
805 831
                  this.recordInfo.recordData = warehouseOutInfoList
@@ -890,6 +916,7 @@ export default {
890 916
             this.recordInfo.recordData[i].stock_count = total_count
891 917
             this.recordInfo.recordData[i].license_number = val.number
892 918
             this.recordInfo.recordData[i].register_number = val.register_number
919
+            this.recordInfo.recordData[i].patient_id = 0
893 920
              
894 921
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
895 922
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
@@ -1057,6 +1084,7 @@ export default {
1057 1084
     tempObj["stock_count"] = ""
1058 1085
     tempObj["id"] = 0
1059 1086
     tempObj['register_number'] = ''
1087
+    tempObj['patient_id'] = 0
1060 1088
     this.recordInfo.recordData.push(tempObj);
1061 1089
     this.GetConfigInfo();
1062 1090
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 25 - 0
src/xt_pages/stock/stockOutOrderEdit.vue Zobrazit soubor

@@ -207,6 +207,20 @@
207 207
             </template>
208 208
           </el-table-column>
209 209
 
210
+          
211
+          <el-table-column label="使用患者"  width="150" align="center">
212
+            <template slot-scope="scope">
213
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择使用患者">
214
+                <el-option
215
+                  v-for="(option, index) in patients"
216
+                  :key="index"
217
+                  :label="option.name"
218
+                  :value="option.id">
219
+                </el-option>
220
+               </el-select>
221
+            </template>
222
+          </el-table-column>
223
+
210 224
           <el-table-column label="总价" width="150" align="center">
211 225
             <template slot-scope="scope">
212 226
               {{calculate(scope.row.price*scope.row.count)}}
@@ -402,6 +416,7 @@
402 416
         showCheck:false,
403 417
         showReturnCheck:false,
404 418
         loading:false,
419
+        patients:[],
405 420
       }
406 421
     },
407 422
     methods: {
@@ -517,6 +532,7 @@
517 532
         tempObj["buy_price"]= ""
518 533
         tempObj["stock_count"] = ""
519 534
         tempObj['register_number'] = ''
535
+        tempObj['patient_id'] =0
520 536
         this.recordInfo.recordData.push(tempObj)
521 537
       },
522 538
       handleDelete: function(index, row) {
@@ -903,11 +919,20 @@
903 919
             if(response.data.data.list[i].manufacturer ==0 ){
904 920
                response.data.data.list[i].manufacturer = ""
905 921
             }
922
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
906 923
             this.recordInfo.recordData.push(response.data.data.list[i])
907 924
           }
908 925
           this.storelist = response.data.data.storelist
909 926
           this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
910 927
           this.storehouse_id = response.data.data.out.storehouse_id
928
+          var obj ={id:0,name:"系统"}
929
+          this.patients =[]
930
+          this.patients.push(obj)
931
+          if(response.data.data.patients!=null){
932
+            for(let i=0;i<response.data.data.patients.length;i++){
933
+              this.patients.push(response.data.data.patients[i])
934
+            }
935
+          }
911 936
           loading.close();
912 937
         }
913 938
       })

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue Zobrazit soubor

@@ -274,7 +274,7 @@
274 274
           }}</span>
275 275
                     <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
276 276
             scope.row.dialysissolution.anticoagulant_zongliang
277
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
277
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
278 278
               : ''
279 279
           }}</span>
280 280
                     <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{

+ 1 - 1
src/xt_pages/workforce/remind_print_setting.vue Zobrazit soubor

@@ -128,7 +128,7 @@
128 128
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
129 129
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
130 130
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
131
-                <div v-if="org_id!=10278">用法:静脉注射</div>
131
+                <div v-if="org_id!=10278 && org_id!=10600">用法:静脉注射</div>
132 132
                 <!-- 透析器灌流器 -->
133 133
                
134 134
                  <div>