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/components/addDrugs.vue

@@ -122,6 +122,16 @@
                     <el-form-item label="默认开药数量:" prop="prescribing_number">
                         <el-input v-model="form.prescribing_number" style="width:160px;" placeholder=""
                                   maxlength="30"></el-input>
+                    </el-form-item>
+                     <el-form-item label="开药数量单位:" prop="prescribing_number">
+                          <el-select v-model="form.prescribing_number_unit" style="width:160px;" placeholder="开药数量单位">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                          </el-select>
                     </el-form-item>
                     <el-form-item label="默认开药天数:" prop="prescribing_number">
                         <el-input v-model="form.drug_day" style="width:160px;" placeholder=""
@@ -534,6 +544,7 @@
           min_price:"",//拆零零售价
           dose_unit:"",//剂量
           dose:"",//剂量单位
+          prescribing_number_unit:"",
         },
 
         rules: {
@@ -725,6 +736,7 @@
         this.form.min_unit = ""
         this.form.max_unit = ""
         this.form.min_price = ""
+        this.form.prescribing_number_unit = ""
         this.visible = false
       },
       getValue: function() {
@@ -788,6 +800,7 @@
         form['dose'] = this.form.dose,
         form['dose_unit'] = this.form.dose_unit
         form['min_price'] = this.form.min_price
+        form['prescribing_number_unit'] = this.form.prescribing_number_unit
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

@@ -508,7 +508,7 @@
         } else if (val.id == 0) {
           //新增
           console.log("val2222222",val)
-        
+         
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);