Procházet zdrojové kódy

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

see999 před 3 roky
rodič
revize
eda4a95862

+ 1 - 3
src/api/his/his.js Zobrazit soubor

@@ -41,6 +41,7 @@ export function getDoctors() {
41 41
 }
42 42
 
43 43
 export function createHisPrescription(data, params) {
44
+  console.log('param2323232323233223233223332322323', params)
44 45
   return request({
45 46
     url: '/api/hisprescription/create',
46 47
     method: 'post',
@@ -516,7 +517,6 @@ export function GetSummarySettle(params) {
516 517
   })
517 518
 }
518 519
 
519
-
520 520
 export function GetLabelList(params) {
521 521
   return request({
522 522
     url: '/api/his/inspectionlist/get',
@@ -525,8 +525,6 @@ export function GetLabelList(params) {
525 525
   })
526 526
 }
527 527
 
528
-
529
-
530 528
 export function GetLabelInfo(params) {
531 529
   return request({
532 530
     url: '/api/his/inspectioninfo/get',

+ 12 - 12
src/xt_pages/hospitalStation/components/deskPrescription.vue Zobrazit soubor

@@ -2299,18 +2299,18 @@
2299 2299
             isLoading = true
2300 2300
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
2301 2301
             let num = 0
2302
-            this.prescriptions.map(item => {
2303
-              if (item.advices.length > 0) {
2304
-                item.advices.map(it => {
2305
-                  if (it.drug.total <= 0) {
2306
-                    num++
2307
-                    setTimeout(() => {
2308
-                      this.$message.error(it.drug.drug_name + '库存不足')
2309
-                    }, 100)
2310
-                  }
2311
-                })
2312
-              }
2313
-            })
2302
+            // this.prescriptions.map(item => {
2303
+            //   if (item.advices.length > 0) {
2304
+            //     item.advices.map(it => {
2305
+            //       if (it.drug.total <= 0) {
2306
+            //         num++
2307
+            //         setTimeout(() => {
2308
+            //           this.$message.error(it.drug.drug_name + '库存不足')
2309
+            //         }, 100)
2310
+            //       }
2311
+            //     })
2312
+            //   }
2313
+            // })
2314 2314
             if (num == 0) {
2315 2315
               createHisPrescription(data, params).then(response => {
2316 2316
                 if (response.data.state == 1) {

+ 13 - 12
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Zobrazit soubor

@@ -2297,19 +2297,20 @@
2297 2297
             isLoading = true
2298 2298
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
2299 2299
             let num = 0
2300
-            this.prescriptions.map(item => {
2301
-              if (item.advices.length > 0) {
2302
-                item.advices.map(it => {
2303
-                  if (it.drug.total <= 0) {
2304
-                    num++
2305
-                    setTimeout(() => {
2306
-                      this.$message.error(it.drug.drug_name + '库存不足')
2307
-                    }, 100)
2308
-                  }
2309
-                })
2310
-              }
2311
-            })
2300
+            // this.prescriptions.map(item => {
2301
+            //   if (item.advices.length > 0) {
2302
+            //     item.advices.map(it => {
2303
+            //       if (it.drug.total <= 0) {
2304
+            //         num++
2305
+            //         setTimeout(() => {
2306
+            //           this.$message.error(it.drug.drug_name + '库存不足')
2307
+            //         }, 100)
2308
+            //       }
2309
+            //     })
2310
+            //   }
2311
+            // })
2312 2312
             if (num == 0) {
2313
+             
2313 2314
               createHisPrescription(data, params).then(response => {
2314 2315
                 if (response.data.state == 1) {
2315 2316
                   this.$emit('change', this.patientInfo.id)

+ 4 - 3
src/xt_pages/stock/inventory.vue Zobrazit soubor

@@ -217,9 +217,9 @@ export default {
217 217
                 this.dealerList = dealer
218 218
                 for(let i=0;i<this.goodList.length;i++){
219 219
                     for(let j=0;j<this.manufacturerList.length;j++){
220
-                    if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
221
-                        this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
222
-                    }
220
+                      if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
221
+                          this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
222
+                      }
223 223
                     }
224 224
                 }
225 225
 
@@ -423,6 +423,7 @@ export default {
423 423
               list[i].type = 6
424 424
               list[i].good_name = list[i].GoodInfo.good_name
425 425
               list[i].specification_name = list[i].GoodInfo.specification_name
426
+              list[i].manufacturer_name = ""
426 427
               for(let j=0;j<this.manufacturerList.length;j++){
427 428
                 if(list[i].manufacturer == this.manufacturerList[j].id){
428 429
                   list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

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

@@ -59,7 +59,7 @@
59 59
                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
60 60
                   </span>
61 61
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">
62
-                    {main_collection.dialysissolution.anticoagulant_zongliang}}iu
62
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
63 63
                    </span>
64 64
                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">
65 65
                      {{main_collection.dialysissolution.anticoagulant_zongliang}}iu