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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -439,7 +439,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>
@@ -3696,9 +3696,15 @@ export default {
 
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
           if(this.org_id == 10206 ) {
+            console.log("-=======")
+            console.log(this.zuobiao_project)
+            console.log(this.tabProject)
+            console.log("-=======")
             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){
+                  console.log( this.zuobiao_project[i].lsqty)
+                  console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
                 }
               }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1170,8 +1170,13 @@
           // pre_time: nowTime
 
         }
+        if(this.org_id == 10206) {
+          obj.med_type = 12
+        }else{
+          obj.med_type = 14
+
 
-        obj.med_type = 14
+        }
 
         this.prescriptions.push(obj)
 
@@ -1686,42 +1691,85 @@
 
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
-                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false && prescription.project[b].project.medical_status!=1)){
+                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false )) {
+
+                    if (this.org_id == 10206 || this.org_id == 0) {
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        medical_code: prescription.project[b].project.medical_code,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day
+
+                      }
+
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                      }
+                      tempProject.push(obj)
+                    }
+                  }else{
+                    if( prescription.project[b].project.medical_status!=1){
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        medical_code: prescription.project[b].project.medical_code,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day
+
+                      }
+
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                      }
+                      tempProject.push(obj)
+
+                    }
 
-                  let obj = {
-                    id: prescription.project[b].id,
-                    project_id: prescription.project[b].project_id,
-                    project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
-                    single_dose: prescription.project[b].single_dose,
-                    delivery_way: prescription.project[b].delivery_way,
-                    execution_frequency: prescription.project[b].execution_frequency,
-                    number_days: prescription.project[b].day,
-                    total: prescription.project[b].count.toString(),
-                    price: prescription.project[b].price,
-                    remark: prescription.project[b].remark,
-                    medical_code: prescription.project[b].project.medical_code,
-                    type: prescription.project[b].type,
-                    frequency_type: prescription.project[b].frequency_type,
-                    day_count: prescription.project[b].day_count,
-                    week_day: prescription.project[b].week_day
 
-                  }
 
-                  if (prescription.project[b].type == 2) {
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                    obj['medical_code'] = prescription.project[b].project.medical_code
-                    obj['project_name'] = prescription.project[b].project.project_name
-                    obj['project'] = prescription.project[b].project
-                    obj['unit'] = prescription.project[b].unit
-                  } else if (prescription.project[b].type == 3) {
-                    obj['statistical_classification'] = ''
-                    obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                    obj['project_name'] = prescription.project[b].good_info.good_name
-                    obj['good_info'] = prescription.project[b].good_info
-                    obj['unit'] = prescription.project[b].good_info.packing_unit
-                  }
-                  tempProject.push(obj)
                   }
 
                 }
@@ -1749,6 +1797,10 @@
                 }
 
                 this.prescriptions.push(obj)
+                console.log("!!!!!")
+                console.log(this.prescriptions)
+                console.log("!!!!!")
+
               }
               this.curPrescriptions = this.prescriptions[0]
 
@@ -1762,8 +1814,18 @@
                 order_status: 0,
                 med_type: ''
               }
-              obj.med_type = 14
+              if(this.org_id == 10206) {
+                obj.med_type = 12
+              }else{
+                obj.med_type = 14
+
+
+              }
               this.prescriptions.push(obj)
+              console.log("this.prescriptions")
+              console.log(this.prescriptions)
+              console.log("this.prescriptions")
+
               this.curPrescriptions = this.prescriptions[0]
             }
           }
@@ -2110,7 +2172,13 @@
                 med_type: ''
               }
 
-              obj.med_type = 14
+              if(this.org_id == 10206) {
+                obj.med_type = 12
+              }else{
+                obj.med_type = 14
+
+
+              }
 
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]