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

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -843,21 +843,26 @@ export default {
                tableAdvice.push(doctorAdevieInfo[i])
              }
           }
-          console.log("医嘱天天吞吞吐吐",this.tableAdvice)
-          if(this.tableAdvice!=null && this.tableAdvice.length >0){
-            if (tableAdvice.length <= 8) {
-              const length = 8 - tableAdvice.length
-              var obj = { advice_name: '', start_time: '' }
-              for (i = 0; i < length; i++) {
-                console.log(1)
-                tableAdvice.push(obj)
-              }
-
-             this.tableAdvice = tableAdvice
-            }else{
-              this.tableAdvice = tableAdvice
+        
+          if (tableAdvice!=null&&tableAdvice.length <= 8) {
+            console.log("hahhah1")
+            const length = 8 - tableAdvice.length
+            var obj = { advice_name: '', start_time: '' }
+            for (i = 0; i < length; i++) {
+              console.log(1)
+              tableAdvice.push(obj)
+            }
+            this.tableAdvice = tableAdvice
+          }else{
+            console.log("hahhah2")
+            const length = 8
+            var obj = { advice_name: '', start_time: '' }
+            for (i = 0; i < length; i++) {
+              console.log(1)
+              this.tableAdvice.push(obj)
             }
           }
+          
         
           console.log("tableAdvice", this.tableAdvice);
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3779,6 +3779,7 @@ export default {
                     retail_price: temp3[b].drug.retail_price.toString(),
                     remark: '',
                     day: '1',
+                    is_medicine:0,
                     prescribing_number: temp3[b].prescribing_number,
                     single_dose_unit: temp3[b].drug.drug_dose_unit,
                     prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -3844,6 +3845,7 @@ export default {
                     prescribing_number_unit: temp[b].prescribing_number_unit,
                     medical_insurance_number: temp[b].medical_insurance_number,
                     drug: temp[b],
+                    is_medicine:0,
                     groupno: index + temp_index,
                     hosp_appr_flag: '1',
                     execution_state: 2
@@ -3959,6 +3961,8 @@ export default {
                   retail_price: temp3[b].drug.retail_price.toString(),
                   remark: '',
                   day: '1',
+                  is_medicine:0,
+
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -4030,7 +4034,9 @@ export default {
                   drug: temp[b],
                   groupno: index + temp_index,
                   hosp_appr_flag: '1',
-                  execution_state: 2
+                  execution_state: 2,
+                  is_medicine:0,
+
 
                 }
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -82,7 +82,7 @@
                                   style="width:50%" placeholder=""></el-input>
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
                         <el-select :disabled="scope.row.is_medicine == 1" v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
-                                   @change="getPrescribingNumberUnit(scope.row)">
+                                   @change="getPrescribingNumberUnit(scope)">
                             <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
                             <el-option :label="scope.row.drug.max_unit"
                                        v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
@@ -372,8 +372,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        console.log(row)
-        if (row.is_medicine == 1){
+        if (row.hasOwnProperty('is_medicine')&&row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法删除')
           return
         }
@@ -526,11 +525,11 @@
 
       },
       getAllChangeTwo(scope) {
-        console.log("战国阿道夫阿道夫阿道夫",scope)
-        if (scope.row.is_medicine == 1){
-          this.$message.error('该处方包含已发药的药品，无法修改')
-          return
-        }
+        // console.log("战国阿道夫阿道夫阿道夫",scope)
+        // if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
+        //   this.$message.error('该处方包含已发药的药品，无法修改')
+        //   return
+        // }
         if(this.$store.getters.xt_user.org_id != 10206) {
           console.log('yyyyyyyy',scope);
           if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
@@ -575,7 +574,7 @@
       },
 
       getPrescribingNumberUnit(scope) {
-        if (scope.row.is_medicine == 1){
+        if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
@@ -609,10 +608,10 @@
         }
       },
       changePrescribingNumber(scope) {
-        if (scope.row.is_medicine == 1){
-          this.$message.error('该处方包含已发药的药品，无法修改')
-          return
-        }
+        // if (scope.row.hasOwnProperty('is_medicine')&&scope.row.is_medicine == 1){
+        //   this.$message.error('该处方包含已发药的药品，无法修改')
+        //   return
+        // }
         //  var max_number = 0
         //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
         //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number