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

src/xt_pages/data/druguseTemplate.vue

                             v-for="item in unitsOption"
                             :key="item.id"
                             :label="item.name "
-                            :value="item.name"
+                            :value="item.id"
                           ></el-option>
                         </el-select>
                       </el-col>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
+                    <!--bug619-->
+<!--                    <el-button @click="lili">调试</el-button>-->
                     <el-form-item label="给药途径 :" prop="delivery_way">
                       <el-select
                         v-model="templateForm.delivery_way"
       this.getSelfMedicalList()
     },
     methods: {
+      lili(){
+        console.log()
+      },
       initAdvice(){
         this.$confirm('是否进行医嘱初始化操作?', '提示', {
           confirmButtonText: '确定',
        this.templateForm.way = 1
       },
       handleSelect(val){
-        console.log("val23232",val)
+        console.log("val23232li",val)
         this.templateForm.drug_id =  val.id
         this.templateForm.way = 1
+        var tmp = val.drug_specs[0]
+        console.log("tmp",tmp)
+        console.log("unitsOption",this.unitsOption)
+        this.templateForm.advice_desc = tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
+        this.templateForm.drug_spec_unit = tmp.max_unit
+        this.templateForm.prescribing_number = tmp.prescribing_number//开药数量
+        this.templateForm.prescribing_number_unit = tmp.prescribing_number_unit
+        this.templateForm.single_dose = tmp.single_dose//单次用量
+        this.templateForm.single_dose_unit = tmp.drug_dose_unit
+        this.templateForm.delivery_way = tmp.delivery_way//给药途径
+        this.templateForm.execution_frequency = tmp.execution_frequency//执行频率
+        this.templateForm.drug_id = tmp.id
       },
       submitTemplate(formName) {
 
        return a.sort - b.sort
      },
      hangleSelectChange(val){
+        console.log("==val==",val)
+       var tmp = val.drug_specs[0]
+       console.log("tmp",tmp)
        this.templateForm.advice_desc=this.drugSpec[0].drug_spec
        this.templateForm.drug_spec_unit=this.drugSpec[0].min_unit
        this.templateForm.prescribing_number=this.drugSpec[0].prescribing_number
        this.templateForm.single_dose_unit=this.drugSpec[0].min_unit
        this.templateForm.delivery_way=this.drugSpec[0].delivery_way
        this.templateForm.execution_frequency=this.drugSpec[0].execution_frequency
+       this.templateForm.advice_desc=tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格
        // console.log("templateForm2222222222",this.templateForm)
        // console.log("all_drug",this.all_drug)
        // console.log("drugSpec2222222",this.drugSpec)

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

         >删除医嘱
         </el-button>
         <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
-        <el-button @click="lili">调试</el-button>
+<!--        <el-button @click="lili">调试</el-button>-->
 <!--        <el-button @click="lili" >调试</el-button>-->
 
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
       </el-form>
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
         <el-button @click="hideForm">取 消</el-button>
-        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存1</el-button><!--新增子药保存按钮(选择医嘱名称前)-->
-        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存2</el-button><!--新增子药保存按钮(选择医嘱名称后)-->
+        <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称前)保 存1-->
+        <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button><!--新增子药保存按钮(选择医嘱名称后)保 存2-->
       </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
       },
       submitEditAdvice() {
         // console.log()
-        console.log("==this.form==",this.form)
+        console.log("保存22222222222222")
         console.log("==this.src_type==",this.src_type)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
       }
       ,
       submitAdvice() {
+        console.log("保存111111111111111111111")
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
           this.form.advice_name = arr[0]
        }
 
-
         CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
-          console("保存!!!!!!!!!!!!!!!this.form",this.form)
+          console("保存!!!!!!!!!!!!!!!this.form")
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
                  this.doctor_advices.push(his_advices[i])
               }
             }
+
+            this.$notify({
+              title: '成功',
+              message: '新增医嘱成功',
+              type: 'success',
+              duration: 2000
+            })
+
+            this.currentIndex = -1
+            this.currentRow = null
+            this.setCurrent()
+            this.hideForm()
+
           }
         })
       }

src/xt_pages/hospitalStation/components/chargeDialog.vue

           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
-          this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
+          this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
         },
         changedecimal() {
           // console.log("this.isshow前",this.isshow)
             }
             // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
             this.tmp_pay = this.form.pay_price
-            this.form.pay_price = (parseFloat(this.form.private_price) * 100 - parseFloat(this.form.tmp_decimal) * 100) / 100
+            this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
           }
         },
         //查询用户当前的余额

src/xt_pages/outpatientCharges/components/chargeDialog.vue

         }
         // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
-        this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
+        this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
       },
       changedecimal(){
         console.log("this.form.dec_way前",this.form.dec_way)
           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
           this.tmp_pay = this.form.pay_price
-          this.form.pay_price = (parseFloat(this.form.private_price)*100 - parseFloat(this.form.tmp_decimal)*100)/100
+          this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
         }
       },
       //查询用户当前的余额