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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2511,7 +2511,7 @@
                   execution_frequency: temp[b].execution_frequency,
                   retail_price: temp[b].retail_price.toString(),
                   remark: '',
-                  day: 1,
+                  day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -58,7 +58,7 @@
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)" style="width:50%" placeholder=""></el-input>
             <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
-            <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
+            <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @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" :value="scope.row.drug.max_unit"></el-option>
             </el-select>
@@ -417,7 +417,7 @@
           scope.row.prescribing_number = 1
         }
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
           if(scope.row.prescribing_number > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
@@ -429,6 +429,35 @@
         }
         
       },
+      getPrescribingNumberUnit(scope){
+        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+          }else{
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+          }
+        }else{
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+          }else{
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if(scope.row.prescribing_number == 0){
+          scope.row.prescribing_number = 1
+        }
+        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+          scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          if(scope.row.prescribing_number > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }else{
+          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+      },
       changePrescribingNumber(scope){
         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
           if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){