mainqaq 2 anni fa
parent
commit
73a8ed2782

+ 23 - 2
src/xt_pages/data/druguseTemplate.vue Vedi File

@@ -889,13 +889,15 @@
889 889
                             v-for="item in unitsOption"
890 890
                             :key="item.id"
891 891
                             :label="item.name "
892
-                            :value="item.name"
892
+                            :value="item.id"
893 893
                           ></el-option>
894 894
                         </el-select>
895 895
                       </el-col>
896 896
                     </el-form-item>
897 897
                   </el-col>
898 898
                   <el-col :span="12">
899
+                    <!--bug619-->
900
+<!--                    <el-button @click="lili">调试</el-button>-->
899 901
                     <el-form-item label="给药途径 :" prop="delivery_way">
900 902
                       <el-select
901 903
                         v-model="templateForm.delivery_way"
@@ -1477,6 +1479,9 @@
1477 1479
       this.getSelfMedicalList()
1478 1480
     },
1479 1481
     methods: {
1482
+      lili(){
1483
+        console.log()
1484
+      },
1480 1485
       initAdvice(){
1481 1486
         this.$confirm('是否进行医嘱初始化操作?', '提示', {
1482 1487
           confirmButtonText: '确定',
@@ -1789,9 +1794,21 @@
1789 1794
        this.templateForm.way = 1
1790 1795
       },
1791 1796
       handleSelect(val){
1792
-        console.log("val23232",val)
1797
+        console.log("val23232li",val)
1793 1798
         this.templateForm.drug_id =  val.id
1794 1799
         this.templateForm.way = 1
1800
+        var tmp = val.drug_specs[0]
1801
+        console.log("tmp",tmp)
1802
+        console.log("unitsOption",this.unitsOption)
1803
+        this.templateForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
1804
+        this.templateForm.drug_spec_unit = tmp.max_unit
1805
+        this.templateForm.prescribing_number = tmp.prescribing_number//开药数量
1806
+        this.templateForm.prescribing_number_unit = tmp.prescribing_number_unit
1807
+        this.templateForm.single_dose = tmp.single_dose//单次用量
1808
+        this.templateForm.single_dose_unit = tmp.drug_dose_unit
1809
+        this.templateForm.delivery_way = tmp.delivery_way//给药途径
1810
+        this.templateForm.execution_frequency = tmp.execution_frequency//执行频率
1811
+        this.templateForm.drug_id = tmp.id
1795 1812
       },
1796 1813
       submitTemplate(formName) {
1797 1814
 
@@ -2917,6 +2934,9 @@
2917 2934
        return a.sort - b.sort
2918 2935
      },
2919 2936
      hangleSelectChange(val){
2937
+        console.log("==val==",val)
2938
+       var tmp = val.drug_specs[0]
2939
+       console.log("tmp",tmp)
2920 2940
        this.templateForm.advice_desc=this.drugSpec[0].drug_spec
2921 2941
        this.templateForm.drug_spec_unit=this.drugSpec[0].min_unit
2922 2942
        this.templateForm.prescribing_number=this.drugSpec[0].prescribing_number
@@ -2925,6 +2945,7 @@
2925 2945
        this.templateForm.single_dose_unit=this.drugSpec[0].min_unit
2926 2946
        this.templateForm.delivery_way=this.drugSpec[0].delivery_way
2927 2947
        this.templateForm.execution_frequency=this.drugSpec[0].execution_frequency
2948
+       this.templateForm.advice_desc=tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
2928 2949
        // console.log("templateForm2222222222",this.templateForm)
2929 2950
        // console.log("all_drug",this.all_drug)
2930 2951
        // console.log("drugSpec2222222",this.drugSpec)

+ 3 - 3
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue Vedi File

@@ -201,7 +201,7 @@
201 201
         >删除医嘱
202 202
         </el-button>
203 203
         <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
204
-        <el-button @click="lili">调试</el-button>
204
+<!--        <el-button @click="lili">调试</el-button>-->
205 205
 <!--        <el-button @click="lili" >调试</el-button>-->
206 206
 
207 207
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
@@ -627,8 +627,8 @@
627 627
       </el-form>
628 628
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
629 629
         <el-button @click="hideForm">取 消</el-button>
630
-        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存1</el-button><!--新增子药保存按钮(选择医嘱名称前)-->
631
-        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存2</el-button><!--新增子药保存按钮(选择医嘱名称后)-->
630
+        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称前)保 存1-->
631
+        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称后)保 存2-->
632 632
       </div>
633 633
       <!-- 医嘱表单 end -->
634 634
     </el-dialog>

+ 2 - 2
src/xt_pages/hospitalStation/components/chargeDialog.vue Vedi File

@@ -288,7 +288,7 @@
288 288
           }
289 289
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
290 290
 
291
-          this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
291
+          this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
292 292
         },
293 293
         changedecimal() {
294 294
           // console.log("this.isshow前",this.isshow)
@@ -310,7 +310,7 @@
310 310
             }
311 311
             // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
312 312
             this.tmp_pay = this.form.pay_price
313
-            this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
313
+            this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
314 314
           }
315 315
         },
316 316
         //查询用户当前的余额

+ 2 - 2
src/xt_pages/outpatientCharges/components/chargeDialog.vue Vedi File

@@ -220,7 +220,7 @@
220 220
         }
221 221
         // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
222 222
 
223
-        this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
223
+        this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
224 224
       },
225 225
       changedecimal(){
226 226
         console.log("this.form.dec_way前",this.form.dec_way)
@@ -242,7 +242,7 @@
242 242
           }
243 243
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
244 244
           this.tmp_pay = this.form.pay_price
245
-          this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
245
+          this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
246 246
         }
247 247
       },
248 248
       //查询用户当前的余额