提交代码

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -433,7 +433,7 @@
                                             <span v-else> {{ scope.row.total }}</span> -->
                                             <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
 <!--                                            //针对坐标系统的库存数据-->
-                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.zuobiao_stock_num}}</span>
 
                                           </template>
                                       </el-table-column>
@@ -531,13 +531,13 @@ import { uParseTime } from '@/utils/tools'
 import NextOrLastPrescription from './nextOrLastPrescription'
 import CallPrescription from './callPrescription'
 import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
+import axios from 'axios'
 
 const moment = require('moment')
 
 export default {
   props: {
     zuobiao_drug:Array,
-    zuobiao_project:Array,
     drugs:Array,
     allDrugs:Array,
     advices_template:Array,
@@ -574,7 +574,9 @@ export default {
     additionalCharges
   },
   data() {
+
     return {
+      zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register10206: [
@@ -1622,9 +1624,6 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
-      console.log('~~~~',this.search_project_keyword)
-      console.log('5555',this.tabProject)
-      console.log('6666',this.allProject)
       // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
@@ -1632,7 +1631,6 @@ export default {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
 
-            // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
 
             if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
@@ -1640,7 +1638,6 @@ export default {
 
         }
         this.tabProject = arr
-        console.log('kkkk',this.tabProject);
       }
 
     }, searchProjectTeamAction() {
@@ -1889,7 +1886,6 @@ export default {
     },
 
     tabclickEvent(val) {
-      console.log("li3333333333333li")
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
           this.prescription_id = this.prescriptions[i].id
@@ -1957,7 +1953,6 @@ export default {
 
     },
     setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
-      console.log("诊断23333333333333",this.diagnose)
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
@@ -2073,7 +2068,6 @@ export default {
 
 
       this.diagnose = []
-      console.log("处方----------------------------------------------",info.id)
       if (info.id == 0) {
         if (last_info.diagnosis.length == 0) {
           this.diagnose = []
@@ -2125,8 +2119,6 @@ export default {
 
       }
 
-      // console.log("info233333333333333333333",info.id)
-      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
       if(info.id == 0){
         if (last_info.patient_diagnosis.length == 0) {
@@ -2155,7 +2147,6 @@ export default {
           }
 
         }
-        console.log("hhahahahah",this.patient_diagnose)
       }
 
       this.state1 = info.sick_type
@@ -2287,7 +2278,6 @@ export default {
     },
 
     moreState(tab, event) {
-      console.log("li222222222")
       if (tab == 'more') {
         return false
       }
@@ -2395,7 +2385,6 @@ export default {
           //   }
           // }
           if (index == 1) {
-            console.log(this.prescriptions)
 
             if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2475,7 +2464,6 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
-                console.log("2o23o23o23o2o23",this.prescriptions[i].advices[b])
                 if(this.prescriptions[i].advices[b].day == NaN){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
                   this.$emit('editKeepLoad', false)
@@ -2549,8 +2537,6 @@ export default {
               'prescriptions': this.prescriptions
             }
             isLoading = true
-            console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
-            console.log('this.prescriptionsthis.prescriptions', params)
             let num = 0
             // this.prescriptions.map(item => {
             //   if (item.advices.length > 0) {
@@ -2569,7 +2555,6 @@ export default {
               var arr_one = []
               var arr_Two = []
 
-              console.log("ooo233323233232323232",this.prescriptions)
 
              //药品
               for(let i=0;i<this.prescriptions.length;i++){
@@ -2577,7 +2562,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) => {
@@ -2604,7 +2588,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++){
@@ -2620,7 +2603,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
@@ -2644,7 +2626,6 @@ export default {
 
 
 
-                    console.log("newArr",newArr )
                   }
                 }
 
@@ -2659,7 +2640,6 @@ export default {
                        arr_Two.push(this.prescriptions[i].advices[j])
                      }
                    }
-                   console.log("编辑处方",arr_one)
                    if(arr_one.length > 0){
 
                     let objInfo = {};
@@ -2678,7 +2658,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++){
@@ -2698,7 +2677,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){
@@ -2823,7 +2801,6 @@ export default {
 
                   }
              }
-             console.log("params23332232323232323------",data)
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2933,7 +2910,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('处方中包含已发药处方,无法新增')
@@ -3024,7 +3000,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
@@ -3035,7 +3010,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
@@ -3070,12 +3044,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 {
@@ -3087,8 +3058,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) {
@@ -3122,7 +3091,6 @@ export default {
 
               this.$parent.getInitData()
               this.$parent.getInitDataOne(this.prescriptions)
-              console.log("删除后的数据是",this.prescriptions)
             } else {
               this.$message.error(response.data.msg)
             }
@@ -3210,7 +3178,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) {
@@ -3402,7 +3369,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 = {
@@ -3514,7 +3480,6 @@ export default {
               if (obj.type == 3) {
                 obj.single_dose = 1
               }
-              console.log('项目obj', temp2)
               this.prescriptions[i].project.push(obj)
             }
             this.curStatus = 2
@@ -3535,7 +3500,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) {
@@ -3609,7 +3573,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,
@@ -3633,7 +3596,6 @@ export default {
               zuobiao_stock_num:0,
 
             }
-            // console.log('hhhhh',obj);
             this.tabProject.push(obj)
           }
 
@@ -3648,6 +3610,7 @@ export default {
               }
             }
 
+
             let obj = {
               id: good_info[i].id,
               project_name: good_info[i].good_name,
@@ -3672,8 +3635,10 @@ export default {
             }
             this.tabProject.push(obj)
           }
+
+
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
-          if(this.org_id == 10206 ) {
+          if(this.org_id == 10206) {
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
                 if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
@@ -3682,10 +3647,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);
         }
@@ -3831,12 +3793,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)
       }
     },
@@ -3850,12 +3810,45 @@ export default {
     },
     clearSelection() {
       this.$refs.tabProjectTeam.clearSelection()
-    }
+    },getstock(){
+      if(this.org_id == 10206){
+        var that = this
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingtwo = false
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+
+              } else {
+                that.zuobiao_project  = response.data.data.project
+              }
+            }
+          })
+          .catch(function(error) {
+          })
+      }
+
+
+    },
   }, mounted() {
     this.request_record_date = this.record_date
     // this.getInitData()
+    this.getstock()
     //获取所有项目
     this.getlist()
+
     //获取所以项目组套
     this.getAllProjectTeam()
 
@@ -3866,7 +3859,25 @@ export default {
 
   },
   watch: {
-
+    // tabProject:{//深度监听，可监听到对象、数组的变化
+    //   handler(val, oldVal) {
+    //     if(this.org_id == 10206 ) {
+    //       console.log("~~~~~~~")
+    //       console.log(this.zuobiao_project)
+    //       console.log(this.tabProject)
+    //       for (let i = 0; i < this.zuobiao_project.length; i++) {
+    //         for (let b = 0; b < this.tabProject.length; b++) {
+    //           if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
+    //             this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
+    //           }
+    //         }
+    //       }
+    //       console.log(this.tabProject)
+    //
+    //     }
+    //   },
+    //   deep: true
+    // },
     fullHeight(val) {
       if (!this.timer) {
         this.fullHeight = val

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-------")
                   }
                 }
               })