Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3632,8 +3632,11 @@ export default {
               }
             }
           }
+          console.log("=========")
+          console.log(this.zuobiao_project)
+          console.log( this.tabProject)
+          console.log("=========")
           this.allProject = this.tabProject
-
           // console.log('cccc',this.allProject);
         }
       })

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -110,6 +110,16 @@
                     <el-input   v-model="scope.row.drug.medical_insurance_number" placeholder=""></el-input>
                 </template>
             </el-table-column>
+
+          <el-table-column align="center" prop="is_self_drug" width="100" label="医嘱性质" v-if="this.$store.getters.xt_user.org_id == 10206 || this.$store.getters.xt_user.org_id == 0">
+            <template slot-scope="scope">
+              <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.is_self_drug" placeholder="请选择">
+                <el-option label="非自备药" value="0"></el-option>
+                <el-option label="自备药" value="1"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+
             <el-table-column align="center" prop="remark" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1533,6 +1533,9 @@ export default {
                       }
 
                     }
+                    console.log(that.drugs)
+                    console.log(that.zuobiao_project)
+
                   }
                 }
               })
@@ -1795,6 +1798,7 @@ export default {
                   hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
                   execution_state: prescription.advices[b].execution_state,
                   is_medicine: prescription.advices[b].is_medicine,
+                  is_self_drug:prescription.advices[b].is_self_drug.toString(),
 
                 }
                 tempAdvice.push(obj)
@@ -1950,6 +1954,7 @@ export default {
                     groupno: prescription.advices[b].groupno,
                     hosp_appr_flag: '1',
                     execution_state: 2,
+                    is_self_drug:"",
 
 
                   }
@@ -2278,6 +2283,8 @@ export default {
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
+                        is_self_drug:prescription.advices[b].is_self_drug.toString()
+
 
                       }
                       tempAdvice.push(obj)
@@ -2429,6 +2436,7 @@ export default {
                           groupno: prescription.advices[b].groupno,
 
                           hosp_appr_flag: '1',
+                          is_self_drug: "",
                           execution_state: 2,
 
 
@@ -2847,6 +2855,7 @@ export default {
                         groupno: prescription.advices[b].groupno,
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
                         execution_state: prescription.advices[b].execution_state,
+                        is_self_drug:prescription.advices[b].is_self_drug.toString()
 
                       }
                       tempAdvice.push(obj)
@@ -2974,6 +2983,8 @@ export default {
                           groupno: prescription.advices[b].groupno,
 
                           hosp_appr_flag: '1',
+                          is_self_drug:"",
+
                           execution_state: 2,
 
 
@@ -3359,6 +3370,8 @@ export default {
                       drug: prescription.advices[b].drug,
                       groupno: prescription.advices[b].groupno,
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                      is_self_drug:prescription.advices[b].is_self_drug.toString(),
+
                       execution_state: prescription.advices[b].execution_state
                     }
                     tempAdvice.push(obj)
@@ -3486,6 +3499,7 @@ export default {
                         groupno: prescription.advices[b].groupno,
 
                         hosp_appr_flag: '1',
+                        is_self_drug:"",
                         execution_state: 2
 
 
@@ -3944,6 +3958,7 @@ export default {
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        is_self_drug:prescription.advices[b].is_self_drug.toString(),
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
 
@@ -4104,6 +4119,7 @@ export default {
                           groupno: prescription.advices[b].groupno,
 
                           hosp_appr_flag: '1',
+                          is_self_drug:"",
                           execution_state: 2,
 
 
@@ -4597,6 +4613,7 @@ export default {
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        is_self_drug:prescription.advices[b].is_self_drug.toString(),
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
 
@@ -4755,6 +4772,7 @@ export default {
                           groupno: prescription.advices[b].groupno,
 
                           hosp_appr_flag: '1',
+                          is_self_drug:"",
                           execution_state: 2