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/doctorDesk.vue

@@ -1383,14 +1383,25 @@
                     addition: tempAddition,
                     order_status: 1,
                     pre_time: preTime,
-                    med_type: "",
+                    med_type:"",
+
                   };
-                  if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                    obj.med_type = 13
+                  if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                    obj.med_type = ""
 
                   }else{
-                    obj.med_type = 14
 
+                    obj.med_type = parseInt(prescription.med_type)
+                  }
+                  if(obj.med_type== 0 || obj.med_type == "") {
+                    if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                      obj.med_type = 13
+
+                    } else {
+                      obj.med_type = 14
+
+                    }
                   }
                   this.prescriptions.push(obj)
                 }
@@ -1795,6 +1806,9 @@
                         var preTime = nowTime
 
 
+
+
+
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -1804,13 +1818,27 @@
                           addition: tempAddition,
                           order_status: 1,
                           pre_time: preTime,
-                          med_type: "",
+                          med_type:"",
+
                         };
-                        if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                          obj.med_type = 13
+                        if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                          obj.med_type = ""
+
                         }else{
-                          obj.med_type = 14
 
+                          obj.med_type =  parseInt(prescription.med_type)
+                        }
+
+
+                        if(obj.med_type== 0 || obj.med_type == "") {
+                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                            obj.med_type = 13
+
+                          } else {
+                            obj.med_type = 14
+
+                          }
                         }
                         this.prescriptions.push(obj)
                       }
@@ -2203,7 +2231,6 @@
 
                         var preTime = nowTime
 
-
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -2213,13 +2240,27 @@
                           addition: tempAddition,
                           order_status: 1,
                           pre_time: preTime,
-                          med_type: "",
+                          med_type:"",
+
                         };
-                        if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                          obj.med_type = 13
+                        if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                          obj.med_type = ""
+
                         }else{
-                          obj.med_type = 14
 
+                          obj.med_type =  parseInt(prescription.med_type)
+                        }
+
+
+                        if(obj.med_type== 0 || obj.med_type == "") {
+                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                            obj.med_type = 13
+
+                          } else {
+                            obj.med_type = 14
+
+                          }
                         }
                         this.prescriptions.push(obj)
                       }
@@ -2621,12 +2662,24 @@
                           order_status: 1,
                           pre_time: preTime,
                           med_type:"",
+
                         };
-                        if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                          obj.med_type = 13
+                        if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                          obj.med_type = ""
+
                         }else{
-                          obj.med_type = 14
 
+                          obj.med_type = parseInt(prescription.med_type)
+                        }
+                        if(obj.med_type== 0 || obj.med_type == "") {
+                          if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                            obj.med_type = 13
+
+                          } else {
+                            obj.med_type = 14
+
+                          }
                         }
                         this.prescriptions.push(obj)
                       }
@@ -3073,7 +3126,6 @@
 
                       var preTime = nowTime
 
-
                       let index = i + 1;
                       let obj = {
                         id: 0,
@@ -3084,12 +3136,24 @@
                         order_status: 1,
                         pre_time: preTime,
                         med_type:"",
+
                       };
-                      if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                        obj.med_type = 13
+                      if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                        obj.med_type = ""
+
                       }else{
-                        obj.med_type = 14
 
+                        obj.med_type = parseInt(prescription.med_type)
+                      }
+                      if(obj.med_type== 0 || obj.med_type == "") {
+                        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                          obj.med_type = 13
+
+                        } else {
+                          obj.med_type = 14
+
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -3492,12 +3556,24 @@
                       order_status: 1,
                       pre_time: preTime,
                       med_type:"",
+
                     };
-                    if(this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138){
-                      obj.med_type = 13
+                    if(prescription.med_type == 0 || prescription.med_type == ""){
+
+                      obj.med_type = ""
+
                     }else{
-                      obj.med_type = 14
 
+                      obj.med_type =  parseInt(prescription.med_type)
+                    }
+                    if(obj.med_type== 0 || obj.med_type == "") {
+                      if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+                        obj.med_type = 13
+
+                      } else {
+                        obj.med_type = 14
+
+                      }
                     }
                     this.prescriptions.push(obj)
                   }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -37,6 +37,23 @@
                                     :label="item.name"
                                     :name="item.name"
                             >
+
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" @change="changevalue" >
+                                    <el-option
+                                            v-for="(item,index) in medical_care"
+                                            :key="index"
+                                            :label="item.label"
+                                            :value="item.value">
+                                    </el-option>
+                                </el-select>
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-else @change="changevalue" >
+                                    <el-option
+                                            v-for="(item,index) in register"
+                                            :key="index"
+                                            :label="item.label"
+                                            :value="item.value">
+                                    </el-option>
+                                </el-select>
                             </el-tab-pane>
 
                             <el-tab-pane name="more" closable><span slot="label"><i
@@ -247,6 +264,29 @@
     },
     data() {
       return {
+        medical_care: [
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '家庭通道' },
+          { value: 13, label: '门诊大病' },
+          { value: 14, label: '重疾特药' },
+          { value: 15, label: '门诊慢病' },
+          { value: 16, label: '门诊特检' },
+          { value: 17, label: '健康体检' },
+          { value: 18, label: '预防接种' },
+          { value: 19, label: '门诊输血' },
+          { value: 91, label: '新冠肺炎门诊' }
+        ],
+
+        register: [
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '门诊挂号' },
+          { value: 13, label: '急诊' },
+          { value: 14, label: '门诊特殊病' },
+          { value: 15, label: '门诊统筹' },
+          { value: 16, label: '门诊慢性病' },
+          { value: 21, label: '普通住院' }
+
+        ],
         crumbs: [
           { path: false, name: '门诊医生站' },
           { path: false, name: '处方模版' },
@@ -353,6 +393,13 @@
           return
         }
 
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
+            this.$message.error('处方医疗类型不能为空')
+            return
+          }
+        }
+
         let params = {
           name: this.tempForm.name,
           mode_id: this.tempForm.mode_id,
@@ -1509,9 +1556,20 @@
                   advices: tempAdvice,
                   project: tempProject,
                   addition: tempAddition,
-                  order_status: 1
+                  order_status: 1,
                   // pre_time: preTime
                 }
+
+                if(prescription.med_type == "" || prescription.med_type == 0){
+
+                  obj['med_type'] = ""
+                }else{
+
+                  obj['med_type'] = parseInt(prescription.med_type)
+
+                }
+
+
                 this.prescriptions.push(obj)
               }
               if (this.prescriptions.length > 0) {
@@ -1526,15 +1584,13 @@
                 advices: [],
                 project: [],
                 addition: [],
-                order_status: 0
+                order_status: 0,
+                med_type:'',
               }
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
 
-            console.log(this.prescriptions)
-            console.log(this.curPrescriptions)
-
           }
 
         })
@@ -1617,6 +1673,11 @@
           }
         })
       },
+      changevalue(val){
+
+        this.$forceUpdate()
+
+      },
       selectTeam(row) {
         console.log('row', row)
         var arr = []