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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2931,14 +2931,7 @@ export default {
             this.$message.error("请选择需要记账的患者")
             return
           }
-          if (this.prescriptions.length == 0) {
-            this.$message.error("处方不能为空")
-            return
-          }
-          if (this.form.diagnosis.length == 0) {
-            this.$message.error("诊断不能为空")
-            return
-          }
+
           var that = this
           let obj = {
             patient_id: this.patientInfo.id,

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -137,9 +137,12 @@
                                                   highlight-current-row>
                                             <el-table-column type="selection" width="40"
                                                              align="center"></el-table-column>
-                                            <el-table-column label="名称">
-                                                <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                            <el-table-column label="名称" v-if="org_id == 10206  || org_id == 0">
+                                                <template slot-scope="scope">{{ scope.row.drug_name }}{{scope.row.number?"("+scope.row.number+")":""}}</template>
                                             </el-table-column>
+                                          <el-table-column label="名称" v-if="org_id != 10206 && org_id != 0">
+                                            <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                          </el-table-column>
                                           <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
                                             <template slot-scope="scope">
                                                    <span
@@ -196,9 +199,12 @@
                                                       highlight-current-row>
                                                 <el-table-column type="selection" width="40"
                                                                  align="center"></el-table-column>
-                                                <el-table-column prop="name" label="名称">
+                                                <el-table-column prop="name" label="名称" v-if="org_id != 10206 && org_id != 0">
                                                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                                 </el-table-column>
+                                              <el-table-column prop="name" label="名称" v-if="org_id == 10206 || org_id == 0">
+                                                <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number?"("+scope.row.number+")":""}}</template>
+                                              </el-table-column>
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                                 </el-table-column>
@@ -1783,7 +1789,8 @@
                 type: 2,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
-                first_letter:project[i].first_letter
+                first_letter:project[i].first_letter,
+                number: "",
               }
 
               this.tabProject.push(obj)
@@ -1806,7 +1813,9 @@
                 type: 3,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
-                first_letter:good_info[i].first_letter
+                first_letter:good_info[i].first_letter,
+                number: good_info[i].good_number,
+
               }
               this.tabProject.push(obj)
             }
@@ -2018,7 +2027,8 @@
                     groupno: prescription.advices[b].groupno,
                     frequency_type: prescription.advices[b].frequency_type,
                     day_count: prescription.advices[b].day_count,
-                    week_day: prescription.advices[b].week_day
+                    week_day: prescription.advices[b].week_day,
+
 
                   }
                   tempAdvice.push(obj)