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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2576,7 +2576,6 @@ export default {
                   for(let j=0;j<this.prescriptions[i].advices.length;j++){
                      arr.push(this.prescriptions[i].advices[j])
                   }
-                  console.log("arr99999999999999",arr)
                   if(arr.length > 0){
                     let objInfo = {};
                     arr.forEach((item, index) => {
@@ -2603,7 +2602,6 @@ export default {
                         }
                       }
                     }
-                    console.log("河滨232332newArr",newArr)
                     if(newArr.length >0){
                       for(let i=0;i<newArr.length;i++){
                         for(let j=0;j<newArr[i].child.length;j++){
@@ -2619,7 +2617,6 @@ export default {
                            }
                         }
                       }
-                       console.log("wodeshju",newArr)
                        for(let i=0;i<newArr.length;i++){
                         for(let j=0;j<newArr[i].child.length;j++){
                            newArr[i].out_count +=  newArr[i].child[j].prescribing_number_total
@@ -2643,7 +2640,6 @@ export default {
 
 
 
-                    console.log("newArr",newArr )
                   }
                 }
 
@@ -2658,7 +2654,6 @@ export default {
                        arr_Two.push(this.prescriptions[i].advices[j])
                      }
                    }
-                   console.log("编辑处方",arr_one)
                    if(arr_one.length > 0){
 
                     let objInfo = {};
@@ -2677,7 +2672,6 @@ export default {
                       }
                     });
                     let newArr = Object.values(objInfo);
-                    console.log("newArr",newArr)
 
                     for(let i=0;i<arr_one.length;i++){
                       for(let j=0;j<newArr.length;j++){
@@ -2697,7 +2691,6 @@ export default {
                         }
                       }
                     }
-                    console.log("new233223322323",newArr)
                     if(newArr.length > 0 &&  this.org_id != 10206 && this.org_id != 0){
                       for(let i=0;i<newArr.length;i++){
                         if(newArr[i].is_user!=1){
@@ -2822,7 +2815,6 @@ export default {
 
                   }
              }
-             console.log("params23332232323232323------",data)
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2932,7 +2924,6 @@ export default {
     },
     addTab(targetName) {
 
-      console.log("this.prescriptionsaaaaaa",this.prescriptions)
       for(let i = 0; i < this.prescriptions.length; i++){
         if (this.prescriptions[i].is_medicine_status) {
           this.$message.error('处方中包含已发药处方,无法新增')
@@ -3023,7 +3014,6 @@ export default {
 
     },
     removeTab(targetName) {
-      console.log("1111111111111111")
       if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5 || this.curPrescriptions.is_medicine_status) {
         this.$message.error('该处方已经结算或者记账或者已发药，无法删除')
         return
@@ -3034,7 +3024,6 @@ export default {
         type: 'warning'
       }).then(() => {
         let id = 0
-        console.log("this.prescriptions???",this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == targetName) {
             id = this.prescriptions[i].id
@@ -3069,12 +3058,9 @@ export default {
               }
             }
           }
-          console.log("oo233ooooosdada",this.prescriptions)
           if (this.prescriptions.length == 0) {
-            console.log("this.curPrescrip的tions前",this.curPrescriptions)
             this.curPrescriptions = []
             this.curStatus = 0
-            console.log("this.curPrescrip的tions后",this.curPrescriptions)
           }
           this.$parent.getInitDataOne(this.prescriptions)
         } else {
@@ -3086,8 +3072,6 @@ export default {
               this.$message.success('删除成功!')
               let tabs = this.prescriptions
               let activeName = this.editableTabsValue
-              console.log("targetName",targetName)
-              console.log("activeName",activeName)
               if (activeName === targetName) {
                 tabs.forEach((tab, index) => {
                   if (tab.name === targetName) {
@@ -3121,7 +3105,6 @@ export default {
 
               this.$parent.getInitData()
               this.$parent.getInitDataOne(this.prescriptions)
-              console.log("删除后的数据是",this.prescriptions)
             } else {
               this.$message.error(response.data.msg)
             }
@@ -3209,7 +3192,6 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      console.log("row233232233232",row)
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //     if (row.count <= 0) {
       //       if (selection) {
@@ -3401,7 +3383,6 @@ export default {
           var temp2 = this.deepClone(this.teamList)
 
           var temp3 = this.deepClone(templateDrugs)
-         console.log("我的23323232232323232323哈哈哈哈哈哈",temp)
           if (temp3.length > 0) {
             for (let b = 0; b < temp3.length; b++) {
               let obj = {
@@ -3513,7 +3494,6 @@ export default {
               if (obj.type == 3) {
                 obj.single_dose = 1
               }
-              console.log('项目obj', temp2)
               this.prescriptions[i].project.push(obj)
             }
             this.curStatus = 2
@@ -3534,7 +3514,6 @@ export default {
       this.teamList = row
     },
     selectChange(selection, row) {
-      console.log('row', selection)
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //    if (row.stock_count <= 0) {
       //     if (row.type == 3) {
@@ -3608,7 +3587,6 @@ export default {
       getHisProject().then(response => {
         if (response.data.state == 1) {
           var project = response.data.data.project
-          console.log("项目列表",project)
           for (let i = 0; i < project.length; i++) {
             let obj = {
               id: project[i].id,
@@ -3632,7 +3610,6 @@ export default {
               zuobiao_stock_num:0,
 
             }
-            // console.log('hhhhh',obj);
             this.tabProject.push(obj)
           }
 
@@ -3681,10 +3658,7 @@ export default {
               }
             }
           }
-          console.log("=========")
-          console.log(this.zuobiao_project)
-          console.log( this.tabProject)
-          console.log("=========")
+
           this.allProject = this.tabProject
           // console.log('cccc',this.allProject);
         }
@@ -3830,12 +3804,10 @@ export default {
       if (this.dayorMonth == 'day') {
         this.$emit('day')
       } else if (this.dayorMonth == 'month') {
-        console.log('~~~~~~')
         let form = {
           id: this.patientInfo.id,
           his_patient_id: this.hisPatientInfo.id
         }
-        console.log(form)
         this.$emit('month', form)
       }
     },

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -162,7 +162,7 @@
                            v-on:month="changeMonth"
                            v-on:day="changeDay"
                            :zuobiao_drug="zuobiao_drug"
-                           :zuobiao_project="zuobiao_project"
+
                            :month_prescriptions="month_prescriptions"
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
@@ -612,7 +612,7 @@ export default {
       anticoagulants_confit:null,
       patient_diagnoses:[],
       zuobiao_drug:[],
-      zuobiao_project:[],
+      // zuobiao_project:[],
     }
   },
 
@@ -1520,7 +1520,7 @@ export default {
 
                   } else {
                     that.zuobiao_drug  = response.data.data.drug
-                    that.zuobiao_project  = response.data.data.project
+                    // that.zuobiao_project  = response.data.data.project
                     //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
                       for (let i = 0; i < that.zuobiao_drug.length; i++) {
                         for (let b = 0; b < that.drugs.length; b++) {
@@ -1530,11 +1530,6 @@ export default {
                         }
                       }
 
-                    console.log("------~~00000-------")
-                    console.log(that.drugs)
-                    console.log(that.zuobiao_drug)
-                    console.log(that.zuobiao_project)
-                    console.log("------~~00000-------")
                   }
                 }
               })