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

src/api/his/his.js

@@ -528,7 +528,7 @@ export function getPrivateExpensesOrder(params) {
 }
 
 
-
+//
 export function getMonthCharge(params) {
   return request({
     url: "/api/monthcharge/info",

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -510,7 +510,8 @@
     refunddetail,
     refundNumber,
     register,
-    upload
+    upload,
+    getMonthCharge
   } from '@/api/his/his'
   import RegisterDialog from './components/registerDialog'
   import treatPrint from './treatPrint'
@@ -1637,7 +1638,79 @@
         if (this.activeName == 'first') {
           this.getPatientList()
         } else if (this.activeName == 'second') {
-          this.getMonthPatientList()
+          // this.getMonthPatientList()
+          const params = {
+            'record_date': this.record_date,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'start_time': this.other_start_time,
+            'end_time': this.other_end_time,
+            'type': this.radio,
+            'p_type': 2,
+            'order_id': this.order.id
+          }
+
+          getMonthCharge(params).then(response => {
+            if (response.data.state == 0) {
+              this.loading = false
+
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.prescriptions = []
+              this.month_prescriptions = []
+              this.big_month_prescriptions = []
+              this.big_prescriptions = []
+              this.curPrescriptions = {}
+              this.curMonthPrescriptions = {}
+              this.loading = false
+              this.patientInfo = response.data.data.xt_info
+              this.hisPatientInfo = response.data.data.his_info
+              this.info = response.data.data.info
+              this.order = response.data.data.order
+              this.p_type = ''
+              this.sick_type = ''
+              this.diagnosis = []
+              this.sick_history = ''
+              this.form.diagnosis = []
+              if (this.info.id > 0) {
+                this.form.p_type = response.data.data.info.register_type
+                this.form.sick_type = response.data.data.info.sick_type
+                if (response.data.data.info.diagnosis.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
+                }
+                this.sick_history = this.info.sick_history
+                if (this.info.register_type == 0) {
+                  this.form.p_type = ''
+                }
+
+                if (this.info.sick_type == 0) {
+                  this.form.sick_type = ''
+                }
+              } else {
+                this.form.p_type = 14
+                this.form.sick_type = this.sick[0].id
+                if (response.data.data.last_info.diagnoses.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
+                  }
+                }
+
+                this.sick_history = ''
+              }
+              this.addtions_charge = response.data.data.addtions_charge
+              this.setMonthPrescription(response.data.data.month_prescriptions)
+
+            }
+          })
+
+
         }
       },
       searchAction() {
@@ -3258,237 +3331,290 @@
 
         }
         this.loading = true
-        getChargeHisPatientInfo(params).then(response => {
-          if (response.data.state == 0) {
-            this.loading = false
+        if(this.activeName == 'first'){
 
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.prescriptions = []
-            this.month_prescriptions = []
-            this.big_month_prescriptions = []
-            this.big_prescriptions = []
-            this.curPrescriptions = {}
-            this.curMonthPrescriptions = {}
-            this.loading = false
-            this.patientInfo = response.data.data.xt_info
-            this.hisPatientInfo = response.data.data.his_info
-            this.info = response.data.data.info
-            this.order = response.data.data.order
-            this.p_type = ''
-            this.sick_type = ''
-            this.diagnosis = []
-            this.sick_history = ''
-            this.form.diagnosis = []
-            if (this.info.id > 0) {
-              this.form.p_type = response.data.data.info.register_type
-              this.form.sick_type = response.data.data.info.sick_type
-              if (response.data.data.info.diagnosis.length == 0) {
-                this.form.diagnosis = []
+          getChargeHisPatientInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.loading = false
+
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.prescriptions = []
+              this.month_prescriptions = []
+              this.big_month_prescriptions = []
+              this.big_prescriptions = []
+              this.curPrescriptions = {}
+              this.curMonthPrescriptions = {}
+              this.loading = false
+              this.patientInfo = response.data.data.xt_info
+              this.hisPatientInfo = response.data.data.his_info
+              this.info = response.data.data.info
+              this.order = response.data.data.order
+              this.p_type = ''
+              this.sick_type = ''
+              this.diagnosis = []
+              this.sick_history = ''
+              this.form.diagnosis = []
+              if (this.info.id > 0) {
+                this.form.p_type = response.data.data.info.register_type
+                this.form.sick_type = response.data.data.info.sick_type
+                if (response.data.data.info.diagnosis.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
+                }
+                this.sick_history = this.info.sick_history
+                if (this.info.register_type == 0) {
+                  this.form.p_type = ''
+                }
+
+                if (this.info.sick_type == 0) {
+                  this.form.sick_type = ''
+                }
               } else {
-                for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                this.form.p_type = 14
+                this.form.sick_type = this.sick[0].id
+                if (response.data.data.last_info.diagnoses.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
+                  }
                 }
-              }
-              this.sick_history = this.info.sick_history
-              if (this.info.register_type == 0) {
-                this.form.p_type = ''
-              }
 
-              if (this.info.sick_type == 0) {
-                this.form.sick_type = ''
+                this.sick_history = ''
               }
-            } else {
-              this.form.p_type = 14
-              this.form.sick_type = this.sick[0].id
-              if (response.data.data.last_info.diagnoses.length == 0) {
-                this.form.diagnosis = []
+              this.addtions_charge = response.data.data.addtions_charge
+              // this.setMonthPrescription(response.data.data.month_prescriptions)
+
+              if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {
+                this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
               } else {
-                for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
+                this.prescription_id = 0
+              }
+
+              const big_prescriptions = []
+
+              for (let i = 0; i < this.unique_three(response.data.data.prescription).length; i++) {
+                const obj = {
+                  med_type: this.unique_three(response.data.data.prescription)[i].med_type,
+                  prescriptions: []
                 }
+                big_prescriptions.push(obj)
               }
 
-              this.sick_history = ''
-            }
-            this.addtions_charge = response.data.data.addtions_charge
-            this.setMonthPrescription(response.data.data.month_prescriptions)
+              for (let c = 0; c < big_prescriptions.length; c++) {
+                const inner_prescription = []
+                for (let i = 0; i < response.data.data.prescription.length; i++) {
+                  var prescription = response.data.data.prescription[i]
+
+                  if (big_prescriptions[c].med_type == prescription.med_type) {
+                    const tempAdvice = []
+                    const tempProject = []
+                    const tempAddition = []
+                    for (let b = 0; b < prescription.advices.length; b++) {
+                      const obj = {
+                        advice_id: prescription.advices[b].id,
+                        drug_name: prescription.advices[b].advice_name,
+                        single_dose: prescription.advices[b].single_dose,
+                        delivery_way: prescription.advices[b].delivery_way,
+                        execution_frequency: prescription.advices[b].execution_frequency,
+                        retail_price: prescription.advices[b].price.toString(),
+                        remark: prescription.advices[b].remark,
+                        day: prescription.advices[b].day,
+                        prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                        single_dose_unit: prescription.advices[b].single_dose_unit,
+                        prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                        medical_insurance_number: prescription.advices[b].med_list_codg
 
-            if (response.data.data.prescription.length > 0 && response.data.data.prescription[0].advices.length > 0) {
-              this.prescription_id = response.data.data.prescription[0].advices[0].prescription_id
-            } else {
-              this.prescription_id = 0
-            }
+                      }
+                      tempAdvice.push(obj)
+                    }
 
-            const big_prescriptions = []
+                    for (let b = 0; b < prescription.project.length; b++) {
+                      const obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project.id,
+                        // project_name: prescription.project[b].project.project_name,
+                        // statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        // medical_code: prescription.project[b].project.medical_code,
+                        unit: prescription.project[b].unit,
+                        type: prescription.project[b].type
+                      }
 
-            for (let i = 0; i < this.unique_three(response.data.data.prescription).length; i++) {
-              const obj = {
-                med_type: this.unique_three(response.data.data.prescription)[i].med_type,
-                prescriptions: []
-              }
-              big_prescriptions.push(obj)
-            }
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
 
-            for (let c = 0; c < big_prescriptions.length; c++) {
-              const inner_prescription = []
-              for (let i = 0; i < response.data.data.prescription.length; i++) {
-                var prescription = response.data.data.prescription[i]
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                      }
 
-                if (big_prescriptions[c].med_type == prescription.med_type) {
-                  const tempAdvice = []
-                  const tempProject = []
-                  const tempAddition = []
-                  for (let b = 0; b < prescription.advices.length; b++) {
-                    const obj = {
-                      advice_id: prescription.advices[b].id,
-                      drug_name: prescription.advices[b].advice_name,
-                      single_dose: prescription.advices[b].single_dose,
-                      delivery_way: prescription.advices[b].delivery_way,
-                      execution_frequency: prescription.advices[b].execution_frequency,
-                      retail_price: prescription.advices[b].price.toString(),
-                      remark: prescription.advices[b].remark,
-                      day: prescription.advices[b].day,
-                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                      single_dose_unit: prescription.advices[b].single_dose_unit,
-                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                      medical_insurance_number: prescription.advices[b].med_list_codg
+                      tempProject.push(obj)
+                    }
 
+                    for (let b = 0; b < prescription.addition.length; b++) {
+                      const obj = {
+                        id: prescription.addition[b].id,
+                        item_name: prescription.addition[b].item_name,
+                        price: prescription.addition[b].price,
+                        count: prescription.addition[b].count,
+                        item_id: prescription.addition[b].item_id
+                      }
+                      tempAddition.push(obj)
                     }
-                    tempAdvice.push(obj)
-                  }
+                    const index = i + 1
+                    console.log('~~~~~~~~')
+                    console.log(prescription.order)
+                    prescription.order.order_status = prescription.order.order_status.toString()
+                    prescription.order.order_status = parseInt(prescription.order.order_status)
 
-                  for (let b = 0; b < prescription.project.length; b++) {
                     const obj = {
-                      id: prescription.project[b].id,
-                      project_id: prescription.project[b].project.id,
-                      // project_name: prescription.project[b].project.project_name,
-                      // statistical_classification: prescription.project[b].project.statistical_classification,
-                      single_dose: prescription.project[b].single_dose,
-                      delivery_way: prescription.project[b].delivery_way,
-                      execution_frequency: prescription.project[b].execution_frequency,
-                      number_days: prescription.project[b].day,
-                      total: prescription.project[b].count.toString(),
-                      price: prescription.project[b].price,
-                      remark: prescription.project[b].remark,
-                      // medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].unit,
-                      type: prescription.project[b].type
+                      id: prescription.id,
+                      name: this.getPName(prescription.med_type, index),
+                      advices: tempAdvice,
+                      project: tempProject,
+                      addition: tempAddition,
+                      order_status: prescription.order_status,
+                      type: prescription.type,
+                      med_type: prescription.med_type,
+                      order: prescription.order
                     }
+                    // inner_prescription.push(obj)
+                    big_prescriptions[c].prescriptions.push(obj)
 
-                    if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                      obj['medical_code'] = prescription.project[b].project.medical_code
-                      obj['project_name'] = prescription.project[b].project.project_name
+                    this.prescriptions.push(obj)
+                  }
+                }
+              }
 
-                    } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
-                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                      obj['project_name'] = prescription.project[b].good_info.good_name
-                    }
+              this.big_prescriptions = JSON.parse(JSON.stringify(big_prescriptions))
 
-                    tempProject.push(obj)
-                  }
+              for (let i = 0; i < this.big_prescriptions.length; i++) {
+                if (this.big_prescriptions[i].med_type == '11') {
+                  this.big_prescriptions[i]['is_true'] = 1
+                }
+              }
 
-                  for (let b = 0; b < prescription.addition.length; b++) {
+              for (let i = 0; i < this.big_prescriptions.length; i++) {
+                if (this.big_prescriptions[i].is_true == 1) {
+                  for (let b = 0; b < this.big_prescriptions[i].prescriptions.length; b++) {
                     const obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
+                      med_type: '11',
+                      prescriptions: []
                     }
-                    tempAddition.push(obj)
+                    const arr = []
+                    arr.push(this.big_prescriptions[i].prescriptions[b])
+                    obj.prescriptions = arr
+                    this.big_prescriptions.push(obj)
                   }
-                  const index = i + 1
-                  console.log('~~~~~~~~')
-                  console.log(prescription.order)
-                  prescription.order.order_status = prescription.order.order_status.toString()
-                  prescription.order.order_status = parseInt(prescription.order.order_status)
-
-                  const obj = {
-                    id: prescription.id,
-                    name: this.getPName(prescription.med_type, index),
-                    advices: tempAdvice,
-                    project: tempProject,
-                    addition: tempAddition,
-                    order_status: prescription.order_status,
-                    type: prescription.type,
-                    med_type: prescription.med_type,
-                    order: prescription.order
-                  }
-                  // inner_prescription.push(obj)
-                  big_prescriptions[c].prescriptions.push(obj)
-
-                  this.prescriptions.push(obj)
                 }
               }
-            }
-
-            this.big_prescriptions = JSON.parse(JSON.stringify(big_prescriptions))
 
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].med_type == '11') {
-                this.big_prescriptions[i]['is_true'] = 1
+              console.log(this.big_prescriptions)
+              //
+              for (let i = 0; i < this.big_prescriptions.length; i++) {
+                if (this.big_prescriptions[i].is_true == 1) {
+                  this.big_prescriptions.splice(i, 1)
+                }
               }
-            }
+              // console.log(this.big_prescriptions)
 
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].is_true == 1) {
-                for (let b = 0; b < this.big_prescriptions[i].prescriptions.length; b++) {
-                  const obj = {
-                    med_type: '11',
-                    prescriptions: []
-                  }
-                  const arr = []
-                  arr.push(this.big_prescriptions[i].prescriptions[b])
-                  obj.prescriptions = arr
-                  this.big_prescriptions.push(obj)
+              for (let i = 0; i < this.big_prescriptions.length; i++) {
+                if (this.big_prescriptions[i].prescriptions.length > 0) {
+                  this.big_prescriptions[i]['curPrescriptions'] = JSON.parse(JSON.stringify(this.big_prescriptions[i].prescriptions[0]))
+                } else {
+                  this.big_prescriptions[i]['curPrescriptions'] = {}
                 }
+                this.big_prescriptions[i]['total'] = this.getTotalThree(this.big_prescriptions[i])
               }
-            }
 
-            console.log(this.big_prescriptions)
-            //
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].is_true == 1) {
-                this.big_prescriptions.splice(i, 1)
+              if (this.big_prescriptions.length > 0) {
+                this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
               }
+
+
             }
-            // console.log(this.big_prescriptions)
+          })
+
 
-            for (let i = 0; i < this.big_prescriptions.length; i++) {
-              if (this.big_prescriptions[i].prescriptions.length > 0) {
-                this.big_prescriptions[i]['curPrescriptions'] = JSON.parse(JSON.stringify(this.big_prescriptions[i].prescriptions[0]))
+        }else{
+
+          getMonthCharge(params).then(response => {
+            if (response.data.state == 0) {
+              this.loading = false
+
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.prescriptions = []
+              this.month_prescriptions = []
+              this.big_month_prescriptions = []
+              this.big_prescriptions = []
+              this.curPrescriptions = {}
+              this.curMonthPrescriptions = {}
+              this.loading = false
+              this.patientInfo = response.data.data.xt_info
+              this.hisPatientInfo = response.data.data.his_info
+              this.info = response.data.data.info
+              this.order = response.data.data.order
+              this.p_type = ''
+              this.sick_type = ''
+              this.diagnosis = []
+              this.sick_history = ''
+              this.form.diagnosis = []
+              if (this.info.id > 0) {
+                this.form.p_type = response.data.data.info.register_type
+                this.form.sick_type = response.data.data.info.sick_type
+                if (response.data.data.info.diagnosis.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
+                }
+                this.sick_history = this.info.sick_history
+                if (this.info.register_type == 0) {
+                  this.form.p_type = ''
+                }
+
+                if (this.info.sick_type == 0) {
+                  this.form.sick_type = ''
+                }
               } else {
-                this.big_prescriptions[i]['curPrescriptions'] = {}
+                this.form.p_type = 14
+                this.form.sick_type = this.sick[0].id
+                if (response.data.data.last_info.diagnoses.length == 0) {
+                  this.form.diagnosis = []
+                } else {
+                  for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
+                    this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
+                  }
+                }
+
+                this.sick_history = ''
               }
-              this.big_prescriptions[i]['total'] = this.getTotalThree(this.big_prescriptions[i])
-            }
+              this.addtions_charge = response.data.data.addtions_charge
+              this.setMonthPrescription(response.data.data.month_prescriptions)
 
-            if (this.big_prescriptions.length > 0) {
-              this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
             }
+          })
 
-            console.log(this.big_prescriptions)
-            console.log(this.big_prescriptions[0].curPrescriptions.order_status)
-
-            //
-            // if (this.prescriptions.length > 0) {
-            //   this.curPrescriptions = this.prescriptions[0]
-            // } else {
-            //   this.curPrescriptions = {}
-            // }
-            // if (this.month_prescriptions.length > 0) {
-            //   this.curMonthPrescriptions = this.month_prescriptions[0]
-            // } else {
-            //   this.curMonthPrescriptions = {}
-            // }
-
-            // this.month_total = this.getMonthTotalOne()
-          }
-        })
+
+        }
       }
       // sz_open(index, med_type, order, prescriptions) {
       //   switch (index) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1358,7 +1358,10 @@
           this.prescriptions[i].name = '处方' + (i + 1)
           this.prescriptions[i]['pre_time'] = nowTime
 
-          this.prescriptions[i]['med_type'] = 14
+
+
+            this.prescriptions[i]['med_type'] = 14
+
 
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -1522,7 +1525,7 @@
         this.$refs.additionalCharges.hide()
 
       }, searchProjectAction() {
-        console.log('~~~~')
+        console.log("~~~~")
         console.log(this.allProject)
 
         if (this.search_project_keyword.length == 0) {
@@ -1539,7 +1542,7 @@
 
         }
 
-      }, searchProjectTeamAction() {
+      },searchProjectTeamAction(){
         if (this.search_project_team_keyword.length == 0) {
           this.tabPrjectTeam = this.allTabPrjectTeam
 
@@ -1910,103 +1913,288 @@
           this.order_status = '已退费'
         }
 
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
+        if (info.id > 0) {
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.departments
+        } else {
+          if(admin_info.id > 0 && admin_info.user_type == 2){
+            this.doctorValue = admin_info.admin_user_id
+            this.departmentValue = this.department[0].id
 
-            if (info.id > 0) {
-              this.doctorValue = info.doctor_id
-              this.departmentValue = info.departments
-            } else {
-              if (admin_info.id > 0 && admin_info.user_type == 2) {
-                this.doctorValue = admin_info.admin_user_id
-                this.departmentValue = this.department[0].id
+          }else{
 
-              } else {
+            this.doctorValue = this.doctors[0].admin_user_id
+            this.departmentValue = this.department[0].id
 
-                this.doctorValue = this.doctors[0].admin_user_id
-                this.departmentValue = this.department[0].id
+          }
 
-              }
 
-            }
+        }
+
+        if (info.register_type == 0) {
+          for (let i = 0; i < this.register.length; i++) {
+            this.register_type = this.register[0].value
+          }
+        } else {
+          this.register_type = info.register_type
+        }
+        this.diagnose = []
+
+        if(info.id == 0){
+          if(last_info.diagnosis.length == 0){
+            this.diagnose = []
+          }else{
+            for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
+              this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
 
-            if (info.register_type == 0) {
-              for (let i = 0; i < this.register.length; i++) {
-                this.register_type = this.register[0].value
-              }
-            } else {
-              this.register_type = info.register_type
             }
+          }
+
+          if(last_info.sick_history == 0){
+            this.state2 = ''
+          }else{
+            this.state2 = last_info.sick_history
+          }
+
+
+        }else{
+          this.state2 = info.sick_history
+          if (this.state2 == 0) {
+            this.state2 = ''
+          }
+          if(info.diagnosis.length == 0){
             this.diagnose = []
+          }else{
+            for(let i = 0; i < info.diagnosis.split(",").length;i++){
+              this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
 
-            if (info.id == 0) {
-              if (last_info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
+            }
 
-                }
-              }
+          }
 
-              if (last_info.sick_history == 0) {
-                this.state2 = ''
-              } else {
-                this.state2 = last_info.sick_history
-              }
+        }
 
-            } else {
-              this.state2 = info.sick_history
-              if (this.state2 == 0) {
-                this.state2 = ''
-              }
-              if (info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
 
-                }
 
-              }
+        this.state1 = info.sick_type
+        if (this.state1 == 0 || this.state1 == "") {
+          this.state1 = ''
+          for (let i = 0; i < this.sick.length; i++) {
+            this.state1 = this.sick[0].id
+          }
+        }
 
-            }
+        if(this.departmentValue == "" || this.departmentValue == 0){
+          if(this.department.length > 0){
+            this.departmentValue = this.department[0].id
+
+          }
+        }
+
+
+          // getInitData().then(response => {
+          //   if (response.data.state == 0) {
+          //     this.$message.error(response.data.msg)
+          //     return false
+          //   } else {
+          //     this.onceTime = false
+          //     this.drugs = response.data.data.drugs
+          //     this.allDrugs = response.data.data.drugs
+          //     this.advices_template = response.data.data.advices_template
+          //     this.doctors = response.data.data.doctors
+          //     for (let i = 0; i < this.doctors.length; i++) {
+          //       if (this.doctors[i].user_type == 1) {
+          //         this.doctors.splice(i, 1)
+          //       }
+          //     }
+          //     this.department = response.data.data.department
+          //     this.sick = response.data.data.sick
+          //     this.diagnoses = response.data.data.diagnose
+          //     this.additions = response.data.data.additions
+
+
+
+
+
+          //     if (info.id > 0) {
+          //       this.doctorValue = info.doctor_id
+          //       this.departmentValue = info.departments
+          //     } else {
+          //       if(admin_info.id > 0 && admin_info.user_type == 2){
+          //         this.doctorValue = admin_info.admin_user_id
+          //         this.departmentValue = this.department[0].id
+
+          //       }else{
+
+          //         this.doctorValue = this.doctors[0].admin_user_id
+          //         this.departmentValue = this.department[0].id
+
+          //       }
+
+
+          //     }
+
+          //     if (info.register_type == 0) {
+          //       for (let i = 0; i < this.register.length; i++) {
+          //         this.register_type = this.register[0].value
+          //       }
+          //     } else {
+          //       this.register_type = info.register_type
+          //     }
+          //     this.diagnose = []
+
+          //     if(info.id == 0){
+          //       if(last_info.diagnosis.length == 0){
+          //         this.diagnose = []
+          //       }else{
+          //         for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
+          //           this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
+
+          //         }
+          //       }
+
+          //       if(last_info.sick_history == 0){
+          //         this.state2 = ''
+          //       }else{
+          //         this.state2 = last_info.sick_history
+          //       }
+
+
+          //     }else{
+          //       this.state2 = info.sick_history
+          //       if (this.state2 == 0) {
+          //         this.state2 = ''
+          //       }
+          //       if(info.diagnosis.length == 0){
+          //         this.diagnose = []
+          //       }else{
+          //         for(let i = 0; i < info.diagnosis.split(",").length;i++){
+          //           this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
+
+          //         }
+
+          //       }
+
+          //     }
+
+
+
+          //     this.state1 = info.sick_type
+          //     if (this.state1 == 0 || this.state1 == "") {
+          //       this.state1 = ''
+          //       for (let i = 0; i < this.sick.length; i++) {
+          //         this.state1 = this.sick[0].id
+          //       }
+          //     }
+
+          //     if(this.departmentValue == "" || this.departmentValue == 0){
+          //       if(this.department.length > 0){
+          //         this.departmentValue = this.department[0].id
+
+          //       }
+          //     }
+
+          //   }
+          // })
+
+      },
+      setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
+        this.curMonthPrescriptions = {}
+        this.curPrescriptions = {}
+        // this.$refs.tabProjectTeam.clearSelection()
+
+        for (let i = 0; i < doctors.length; i++) {
+          if (doctors[i].user_type == 1) {
+            doctors.splice(i, 1)
+          }
+        }
+
+        this.editableTabsValue = '处方1'
+        this.curStatus = 0
+        if (month_data && month_data.length > 0) {
+          this.curMonthPrescriptions = month_data[0]
+        } else {
+          this.curMonthPrescriptions = {}
+        }
+
+        if (info.prescription_status == 0) {
+          this.order_status = ''
+        }
+
+        if (info.id > 0) {
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.departments
+        } else {
+          if(admin_info.id > 0 && admin_info.user_type == 2){
+            this.doctorValue = admin_info.admin_user_id
+            this.departmentValue = this.department[0].id
+
+          }else{
+
+            this.doctorValue = this.doctors[0].admin_user_id
+            this.departmentValue = this.department[0].id
+
+          }
+
+
+        }
+
+        if (info.register_type == 0) {
+          for (let i = 0; i < this.register.length; i++) {
+            this.register_type = this.register[0].value
+          }
+        } else {
+          this.register_type = info.register_type
+        }
+        this.diagnose = []
+
+        if(info.id == 0){
+          if(last_info.diagnosis.length == 0){
+            this.diagnose = []
+          }else{
+            for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
+              this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
 
-            this.state1 = info.sick_type
-            if (this.state1 == 0 || this.state1 == '') {
-              this.state1 = ''
-              for (let i = 0; i < this.sick.length; i++) {
-                this.state1 = this.sick[0].id
-              }
             }
+          }
 
-            if (this.departmentValue == '' || this.departmentValue == 0) {
-              if (this.department.length > 0) {
-                this.departmentValue = this.department[0].id
+          if(last_info.sick_history == 0){
+            this.state2 = ''
+          }else{
+            this.state2 = last_info.sick_history
+          }
 
-              }
+
+        }else{
+          this.state2 = info.sick_history
+          if (this.state2 == 0) {
+            this.state2 = ''
+          }
+          if(info.diagnosis.length == 0){
+            this.diagnose = []
+          }else{
+            for(let i = 0; i < info.diagnosis.split(",").length;i++){
+              this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
             }
+          }
+        }
+        this.state1 = info.sick_type
+        if (this.state1 == 0 || this.state1 == "") {
+          this.state1 = ''
+          for (let i = 0; i < this.sick.length; i++) {
+            this.state1 = this.sick[0].id
+          }
+        }
+
+        if(this.departmentValue == "" || this.departmentValue == 0){
+          if(this.department.length > 0){
+            this.departmentValue = this.department[0].id
 
           }
-        })
+        }
 
       },
+
       moreState(tab, event) {
         if (tab == 'more') {
           return false
@@ -2099,16 +2287,16 @@
             }
           }
           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
-            }
+              if (this.prescriptions[i].med_type == 0 || this.prescriptions[i].med_type == '') {
+                this.$message.error('处方医疗类型不能为空')
+                return
+              }
           }
           if (index == 1) {
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
-              diagnose: this.diagnose.join(','),
+              diagnose: this.diagnose.join(","),
               sick_type: this.state1,
               sick_history: this.state2,
               doctor: this.doctorValue,
@@ -2133,6 +2321,7 @@
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
                 this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
 
+
               }
 
               for (let b = 0; b < this.prescriptions[i].project.length; b++) {
@@ -2744,18 +2933,21 @@
         this.teamList = row
       },
       selectChange(selection, row) {
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.tables.toggleRowSelection(row)
-              }
-            })
-          } else {
-            this.$refs.tables.clearSelection()
+        console.log('row',row)
+        if(row.total <= 0){
+          if(row.type == 3){
+            if (selection) {
+              selection.forEach(row => {
+                if(row.total <= 0){
+                  this.$refs.tables.toggleRowSelection(row);
+                }
+              });
+            } else {
+              this.$refs.tables.clearSelection();
+            }
+            this.$message.error(row.project_name + '库存不足')
+            return
           }
-          this.$message.error(row.project_name + '库存不足')
-          return
         }
         this.teamList.push(row)
       },
@@ -2877,6 +3069,7 @@
           if (response.data.state == 1) {
             this.teamList = []
             var project = response.data.data.project
+            let num = 0
             for (let i = 0; i < project.length; i++) {
               if (project[i].type == 2 && project[i].status == 1) {
 
@@ -2901,6 +3094,14 @@
 
                 this.teamList.push(obj)
               } else if (project[i].type == 3 && project[i].status == 1) {
+                if(project[i].good_info.total <= 0){
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row);
+                  this.$message.error(project[i].good_info.good_name + '库存不足')
+                }
+                if(num > 0){
+                  this.$refs.tabProjectTeam.clearSelection();
+                }
                 let obj = {
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -3507,7 +3507,7 @@
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
                 }
               })
             }
@@ -3908,7 +3908,7 @@
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
                 }
               })
 
@@ -4275,7 +4275,7 @@
               this.case_history.is_infect = false
             }
 
-            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+            this.$refs.prescriptions.setMonthData(this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
           }
         })
 

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -228,7 +228,7 @@
             <!--</el-dialog>-->
         <!--</div>-->
 
-        <div ]class="app-container">
+        <div class="app-container">
             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete