1

src/xt_pages/data/components/addDrugs.vue

@@ -31,11 +31,11 @@
                             </el-select>
                         </el-form-item>
                         <div style="width:100%;">
-                          <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                          <div><span style="width:120px;text-align:right;display:inline-block"><span style="color:red;">*</span>单位&规格：</span><span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
                         </div>
-                        <div style="width:100%;display:flex;align-items:center;">
+                        <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
                             <el-form-item prop="dose" class="noMargin">
-                              <el-input v-model="form.dose" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" :disabled="dosageShow"></el-input>  
                             </el-form-item>
                             <el-form-item prop="dose_unit" class="noMargin">
                               <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
@@ -45,11 +45,11 @@
                                   :label="item.name"
                                   :value="item.name">
                                 </el-option>
-                            </el-select>
-                          </el-form-item>
-                            *
+                              </el-select>
+                            </el-form-item>
+                            <span style="margin-bottom:20px;font-size:20px;">*</span>
                             <el-form-item prop="min_number" class="noMargin">
-                              <el-input v-model="form.min_number" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;" :disabled="dosageShow" type="number" placeholder="拆零"> </el-input>
                             </el-form-item>
                             <el-form-item prop="min_unit" class="noMargin">
                               <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
@@ -60,8 +60,8 @@
                                   :value="item.name">
                                 </el-option>
                               </el-select>
-                          </el-form-item>
-                          /
+                            </el-form-item>
+                          <span style="margin-bottom:20px;font-size:20px;">/</span>
                           <el-form-item prop="max_unit" class="noMargin">
                             <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
                               <el-option
@@ -295,13 +295,14 @@
                         </el-form-item>
 
                         <el-form-item label="社保目录编码">
-                            <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
+                            <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
 
 
                         <el-form-item label="备案日期:">
                             <el-date-picker
+                                    style="width:160px"
                                     value-format="yyyy-MM-dd"
                                     v-model="form.record_date"
                                     type="date"
@@ -310,7 +311,7 @@
                         </el-form-item>
 
                         <el-form-item label="药品备注:">
-                            <el-input v-model="form.drug_remark" style="width:180px"></el-input>
+                            <el-input v-model="form.drug_remark" style="width:160px"></el-input>
                         </el-form-item>
                       
                         <el-form-item label="经销商: " style="width:100%">
@@ -652,6 +653,7 @@
               this.unitList.push(arr[i])
             }
         }
+        console.log('this.unitList',this.unitList)
         this.getInitializtion()
         this.getlist()
         this.GetAllConfig()
@@ -838,38 +840,82 @@
       changeMaxUnit(val){
         if(val == this.form.min_unit){
           this.form.dose = 1
+          this.form.min_number = this.form.dose
           this.dosageShow = true
         }
         if(val !=this.form.min_unit){
           this.dosageShow = false 
         } 
-       var arr =  getDataConfig('hemodialysis','units')
-      
-       for(let i=0;i<arr.length;i++){
+        var arr =  getDataConfig('hemodialysis','units')
+        this.unitList = []
+        for(let i=0;i<arr.length;i++){
+            
+          if(this.form.min_unit == arr[i].name){
+            this.unitList.push(arr[i])
+          }
           if(val == arr[i].name){
-             this.unitList.push(arr[i])
+            this.unitList.push(arr[i])
           }
-       }
+          let idArr = []
+          this.unitList.map(item => {
+            idArr.push(item.id)
+          })
+          if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+          }
+          
+        }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+            //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+            ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+            return prevArr
+        }, [])
                
       },
       changeMinUnit(val){
         if(val == this.form.max_unit){
           this.form.dose = 1
+          this.form.min_number = this.form.dose
           this.dosageShow = true
         }
         if(val != this.form.max_unit){
           this.dosageShow = false
         }
         
-        if(this.form.dosage == "" || this.form.max_unit == ""){
-           this.form.min_number = 1
-        } 
-        var arr =  getDataConfig('hemodialysis','units')
+        // if(this.form.dosage == "" || this.form.max_unit == ""){
+        //    this.form.min_number = 1
+        // } 
+        var arr = getDataConfig('hemodialysis','units')
+        this.unitList = []
         for(let i=0;i<arr.length;i++){
             if(val == arr[i].name){
               this.unitList.push(arr[i])
             }
+            if(this.form.max_unit == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+            let idArr = []
+            this.unitList.map(item => {
+              idArr.push(item.id)
+            })
+            if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+              if(this.form.drug_dose_unit == arr[i].id){
+                this.unitList.push(arr[i])
+              }
+            }
         }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
        
       }
     }, watch: {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -90,6 +90,7 @@
       :schedual="temp_schedual"
       :stockType="stockType"
       :lastAssessment="lastAssessment"
+      :mode_id="mode_id"
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
@@ -209,12 +210,16 @@ export default {
 
   data() {
     return {
-      temp_schedual: {}
+      temp_schedual: {},
+      mode_id:1
     };
   },
   mounted() {},
 
   props: {
+    mode_id:{
+      type:Number
+    },
     longAdvices: {
       // 临时医嘱
       type: Array,

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

@@ -804,6 +804,9 @@
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip,multiSelectBox },
     props: {
+      mode_id:{
+        type:Number
+      },
       schedual: {
         type: Object
       },
@@ -1815,7 +1818,8 @@
 
         // 入口
         var pre = pre
-        this.dialysisPrescription.mode_id = this.$route.query.mode_id
+        this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
+        console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,7 +15,7 @@
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id == 40 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -61,6 +61,7 @@
           :his_is_open="his_is_open"
           :lastAssessment="lastAssessment"
           :stockType="stockType"
+          :mode_id="mode_id"
         >
         </nav-igation>
 
@@ -309,7 +310,8 @@ export default {
       queueConfig:{},
       stockType:[],
       preparestock:[],
-      dialysisShow:false
+      dialysisShow:false,
+      mode_id:1
     }
   },
   created() {
@@ -326,6 +328,8 @@ export default {
         schedules.map(item => {
           if(item.patient_id == this.patient_id){
             arr.push(item.patient_id)
+            console.log('item',item)
+            this.mode_id = item.mode_id
           }
         })
         if(arr.length > 0){
@@ -362,6 +366,7 @@ export default {
                   schedules.map(item => {
                     if(item.patient_id == this.patient_id){
                       arr.push(item.patient_id)
+                      this.mode_id = item.mode_id
                     }
                   })
                   if(arr.length > 0){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -411,7 +411,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_price * scope.row.prescribing_number
           if(scope.row.prescribing_number > scope.row.drug.total){
             this.$message.error(scope.row.drug_name + '库存不足')
           }
@@ -419,7 +419,7 @@
           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
+          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
         
       },