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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -120,7 +120,7 @@
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191"
+                       v-if="org_id == 10191 || org_id == 10318"
                        type="primary">登陆
             </el-button>
 

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -952,7 +952,7 @@
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
               }
             }
-            
+
             let data = {
               'prescriptions': this.prescriptions
             }
@@ -1632,12 +1632,17 @@
                     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].project.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].project.unit
+                    obj['unit'] = prescription.project[b].good_info.packing_unit
+
 
                   }
                   tempProject.push(obj)
@@ -1894,7 +1899,7 @@
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
       }
-    }, 
+    },
     created() {
       for(let key in this.$store.getters.treatment_mode){
         this.modeOptions[key] = this.$store.getters.treatment_mode[key]

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1599,19 +1599,14 @@
             return false
           } else {
             this.prescriptions = []
-            // console.log(this.tempForm)
-
             if (response.data.data.template.id > 0) {
-
               this.tempForm.name = response.data.data.template.name
               this.tempForm.mode_id = response.data.data.template.mode
-
               for (let i = 0; i < response.data.data.prescriptions.length; i++) {
                 var prescription = response.data.data.prescriptions[i]
                 let tempAdvice = []
                 let tempProject = []
                 let tempAddition = []
-
                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
@@ -1653,7 +1648,6 @@
                     price: prescription.project[b].price,
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
                     frequency_type: prescription.project[b].frequency_type,
                     day_count: prescription.project[b].day_count,
@@ -1666,13 +1660,13 @@
                     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)
                 }
@@ -1713,17 +1707,12 @@
                 order_status: 0,
                 med_type: ''
               }
-
               obj.med_type = 14
-
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
-
           }
-
         })
-
       },
       getlist() {
         this.tabProject = []