提交代码

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -985,12 +985,16 @@ export default {
               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+              obj['project'] = project_month_prescriptions.project[a].project
+
               obj['type'] = 2
 
             } else if (project_month_prescriptions.project[a].type == 3) {
               obj['statistical_classification'] = ''
               obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
               obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['good_info'] = project_month_prescriptions.project[a].good_info
+
               obj['type'] = 3
 
             }
@@ -1308,6 +1312,8 @@ export default {
                 obj['statistical_classification'] = prescription.project[b].team.project_team
                 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['spec'] = ''
                 obj['name_id'] = 0
 
@@ -1317,6 +1323,7 @@ export default {
                 obj['project_name'] = prescription.project[b].good_info.good_name
                 obj['spec'] = prescription.project[b].good_info.specification_name
                 obj['name_id'] = prescription.project[b].good_info.manufacturer
+                obj['good_info'] = prescription.project[b].good_info
 
               }
 

src/xt_pages/outpatientCharges/componenttwo/chargeMonthPrescriptionTable.vue

@@ -58,7 +58,12 @@
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+<!--        <template slot-scope="scope">{{ scope.row.project_name }}</template>-->
+        <template slot-scope="scope">
+          <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+          <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+          <span v-if="org_id == 10206&&scope.row.type==2">{{ scope.row.project_name }}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
@@ -127,6 +132,7 @@
     },
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         drugways: [],
         efs: []
       }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -143,7 +143,11 @@
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号" fixed></el-table-column>
             <el-table-column align="center" prop="project_name" label="名称" fixed>
-                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                <template slot-scope="scope">
+                  <span :title="scope.row.project_name" v-if="org_id != 10206">{{ scope.row.project_name }}</span>
+                  <span  v-if="org_id == 10206&&scope.row.type==3">{{ scope.row.project_name }}{{scope.row.good_info.specification_name}}{{scope.row.good_info.good_number}}</span>
+                  <span v-if="org_id == 1026&&scope.row.type==2">{{ scope.row.project_name }}</span>
+
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
@@ -266,6 +270,7 @@
 
     data() {
       return {
+        org_id:this.$store.getters.xt_user.org_id,
         advices: [],
         tableData: [],
         newoptions: [{