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

@@ -333,7 +333,7 @@
                                       </el-table-column>
 
 <!--                                    //针对对接坐标系统的，使用坐标的库存数据-->
-                                    <el-table-column label="库存" width="60" v-else>
+                                    <el-table-column label="库存" width="60" v-if="org_id == 10206">
                                       <template slot-scope="scope">
                                         <span>{{scope.row.zuobiao_stock_num}}</span>
                                       </template>

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -138,7 +138,7 @@
                                             <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>
+                                                <template slot-scope="scope">{{ scope.row.drug_name + "(" +scope.row.number + ")"}}</template>
                                             </el-table-column>
                                           <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
                                             <template slot-scope="scope">
@@ -197,7 +197,7 @@
                                                 <el-table-column type="selection" width="40"
                                                                  align="center"></el-table-column>
                                                 <el-table-column prop="name" label="名称">
-                                                    <template slot-scope="scope">{{ scope.row.project_name }}</template>
+                                                    <template slot-scope="scope">{{ scope.row.project_name}}{{scope.row.good_number?"("+scope.row.good_number+")":""}}</template>
                                                 </el-table-column>
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
@@ -1162,7 +1162,7 @@
 
         }
 
-        obj.med_type = 14
+        obj.med_type = 12
 
         this.prescriptions.push(obj)
 
@@ -1522,7 +1522,7 @@
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.max_unit,
-                  medical_insurance_number: temp3[b].drug.medical_insurance_number
+                  medical_insurance_number: temp3[b].drug.medical_insurance_number,
 
                 }
 
@@ -1561,7 +1561,8 @@
                   groupno: index + temp_index,
                   frequency_type: 1,
                   day_count: 0,
-                  week_day: ''
+                  week_day: '',
+                  number: temp[b].number,
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -1590,11 +1591,13 @@
                   type: temp2[b].type,
                   frequency_type: 1,
                   day_count: 0,
-                  week_day: ''
+                  week_day: '',
+
                 }
                 if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
                   obj['unit'] = temp2[b].project.unit
+
                 } else if (temp2[b].type == 3) {
                   obj['good_info'] = temp2[b].good_info
                   obj['unit'] = temp2[b].good_info.packing_unit
@@ -1753,7 +1756,7 @@
                 order_status: 0,
                 med_type: ''
               }
-              obj.med_type = 14
+              obj.med_type = 12
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
@@ -1779,7 +1782,9 @@
                 unit: project[i].unit,
                 type: 2,
                 is_special_diseases: project[i].disease_directory,
-                project: project[i]
+                project: project[i],
+                good_number: "",
+
               }
 
               this.tabProject.push(obj)
@@ -1801,7 +1806,8 @@
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
                 is_special_diseases: good_info[i].is_special_diseases,
-                good_info: good_info[i]
+                good_info: good_info[i],
+                good_number: good_info[i].good_number
               }
               this.tabProject.push(obj)
             }
@@ -2095,7 +2101,7 @@
                 med_type: ''
               }
 
-              obj.med_type = 14
+              obj.med_type = 12
 
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]