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,6 +528,24 @@ export function getPrivateExpensesOrder(params) {
 }
 
 
+//
+export function getMonthCharge(params) {
+  return request({
+    url: "/api/monthcharge/info",
+    method: "get",
+    params:params,
+  });
+}
+
+export function getMonthHisPateintInfo(params) {
+  return request({
+    url: "/api/monthhispatient/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
 
 
 

src/api/stock.js

@@ -922,3 +922,11 @@ export function getInventoryDetailPrintList(params) {
     params: params
   })
 }
+
+export function getGoodWarehouseList(params) {
+  return request({
+    url: '/api/stock/getgoodwarehouselist',
+    method: 'Get',
+    params: params
+  })
+}

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

@@ -440,6 +440,67 @@
            </template>
           </el-table-column>
 
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="累计血容量"
+            width="140"
+            v-if="isShow('累计血容量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.accumulated_blood_volume}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="血温监测"
+            width="140"
+            v-if="isShow('血温监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_temperature}}
+           </template>
+          </el-table-column>
+
+           <el-table-column
+            prop="heparin"
+            align="center"
+            label="尿素监测"
+            width="140"
+            v-if="isShow('尿素监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.urea_monitoring}}
+           </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血浓量"
+            width="140"
+            v-if="isShow('血浓量')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_thickness}}
+           </template>
+          </el-table-column>
+
+         <el-table-column
+            prop="heparin"
+            align="center"
+            label="血压监测"
+            width="140"
+            v-if="isShow('血压监测')"
+          >
+           <template slot-scope="scope">
+              {{scope.row.blood_monitor}}
+           </template>
+          </el-table-column>
+
+
 
            <el-table-column
             prop="heparin"
@@ -714,7 +775,35 @@
             </el-form-item>
          </el-col>
 
+          <el-col :span="8" v-if=" isShow('累计血容量')">
+            <el-form-item label="累计血容量：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血温监测')">
+            <el-form-item label="血温监测">
+              <el-input v-model="form.blood_temperature"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('尿素监测')">
+            <el-form-item label="尿素监测">
+              <el-input v-model="form.urea_monitoring"></el-input>
+            </el-form-item>
+          </el-col>
 
+          <el-col :span="8" v-if=" isShow('血浓量')">
+            <el-form-item label="血浓量">
+              <el-input v-model="form.blood_thickness"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if=" isShow('血压监测')">
+            <el-form-item label="血压监测">
+              <el-input v-model="form.blood_monitor"></el-input>
+            </el-form-item>
+          </el-col>
 
           <!-- </el-row>
 
@@ -907,7 +996,12 @@ export default {
         monitor_anticoagulant:'',
         monitor_anticoagulant_value:"",
         blood_pressure_monitoring_site:"",
-        complication:""
+        complication:"",
+        accumulated_blood_volume:"",
+        blood_temperature:"",
+        urea_monitoring:"",
+        blood_thickness:"",
+        blood_monitor:"",
       },
 
       table_current_row: null,
@@ -1126,7 +1220,11 @@ export default {
         this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:'';
         this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:"";
         this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:""
-
+        this.form.accumulated_blood_volume  = resp.monitor.accumulated_blood_volume?resp.monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = resp.monitor.blood_temperature?resp.monitor.blood_temperature:""
+        this.form.urea_monitoring = resp.monitor.urea_monitoring?resp.monitor.urea_monitoring:""
+        this.form.blood_thickness = resp.monitor.blood_thickness?resp.monitor.blood_thickness:""
+        this.form.blood_monitor = resp.monitor.blood_monitor?resp.monitor.blood_monitor:""
       })
     },
 
@@ -1152,6 +1250,7 @@ export default {
       // console.log("tableCurrentRowChange", currentRow)
     },
     setEditMonitor: function(monitor) {
+      console.log("monitor23223322332",monitor)
       if (monitor == null || monitor == undefined) {
         this.form.id = 0;
         // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
@@ -1190,6 +1289,11 @@ export default {
         this.form.blood_sugar = '';
         this.form.monitor_anticoagulant = '';
         this.form.monitor_anticoagulant_value = ''
+        this.form.accumulated_blood_volume  = ""
+        this.form.blood_temperature = ""
+        this.form.urea_monitoring = ""
+        this.form.blood_thickness = ""
+        this.form.blood_monitor = ""
       } else {
         (this.form.id = monitor.id),
         // this.form.operate_date = monitor.operate_date
@@ -1227,6 +1331,11 @@ export default {
         this.form.blood_sugar = monitor.blood_sugar?monitor.blood_sugar:'';
         this.form.monitor_anticoagulant = monitor.monitor_anticoagulant?monitor.monitor_anticoagulant:'';
         this.form.monitor_anticoagulant_value = monitor.monitor_anticoagulant_value?monitor.monitor_anticoagulant_value:"";
+        this.form.accumulated_blood_volume  = monitor.accumulated_blood_volume?monitor.accumulated_blood_volume:""
+        this.form.blood_temperature = monitor.blood_temperature?monitor.blood_temperature:""
+        this.form.urea_monitoring = monitor.urea_monitoring?monitor.urea_monitoring:""
+        this.form.blood_thickness = monitor.blood_thickness?monitor.blood_thickness:""
+        this.form.blood_monitor = monitor.blood_monitor?monitor.blood_monitor:""
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -1269,6 +1378,11 @@ export default {
       this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
       this.form.blood_pressure_monitoring_site = parseInt(this.form.blood_pressure_monitoring_site);
       this.form.complication = parseInt(this.form.complication);
+      this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+      this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+      this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+      this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+      this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
       let mode = '1';
       if (this.form.id > 0) {
         mode = '2';
@@ -1329,6 +1443,11 @@ export default {
             this.form.monitor_anticoagulant_value = this.form.monitor_anticoagulant_value;
             this.form.blood_pressure_monitoring_site = this.form.blood_pressure_monitoring_site;
             this.form.complication = this.form.complication;
+            this.form.blood_temperature = parseFloat(this.form.blood_temperature) == NaN ? 0 : parseFloat(this.form.blood_temperature);
+            this.form.accumulated_blood_volume = parseFloat(this.form.accumulated_blood_volume) == NaN ? 0 : parseFloat(this.form.accumulated_blood_volume);
+            this.form.urea_monitoring = parseFloat(this.form.urea_monitoring) == NaN ? 0 : parseFloat(this.form.urea_monitoring);
+            this.form.blood_thickness = parseFloat(this.form.blood_thickness) == NaN ? 0 : parseFloat(this.form.blood_thickness);
+            this.form.blood_monitor = parseFloat(this.form.blood_monitor) == NaN ? 0 : parseFloat(this.form.blood_monitor);
             this.$message.error(resp.msg)
           }
         }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -31,6 +31,11 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量</th>
+          <th v-if="isShow('血温监测')" width="92px">血温监测</th>
+          <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
+          <th v-if="isShow('血浓量')" width="92px">血浓量</th>
+          <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
           <th v-if="isShow('并发症')" width="92px">并发症</th> -->
           <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
@@ -74,6 +79,11 @@
           </td>
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>
           <th v-if="isShow('并发症')">{{getComplication(monitor.complication)}}</th> -->
+          <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
+          <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
+          <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
+          <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
           <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

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'
@@ -537,7 +538,7 @@
       prescriptionTable,
       additionalCharges,
       treatPrint,
-      statementPrint
+      statementPrint,
 
     },
     data() {
@@ -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

@@ -24,18 +24,18 @@
                         <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
                     </el-form-item>
                     <!--<el-form-item label="处方类型: " prop="name" label-position="right">-->
-                        <!--<el-select style="width:100%;" v-model="register_type" placeholder="">-->
-                            <!--<el-option-->
-                                    <!--v-for="(item,index) in register"-->
-                                    <!--:key="index"-->
-                                    <!--:label="item.label"-->
-                                    <!--:value="item.value">-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
+                    <!--<el-select style="width:100%;" v-model="register_type" placeholder="">-->
+                    <!--<el-option-->
+                    <!--v-for="(item,index) in register"-->
+                    <!--:key="index"-->
+                    <!--:label="item.label"-->
+                    <!--:value="item.value">-->
+                    <!--</el-option>-->
+                    <!--</el-select>-->
                     <!--</el-form-item>-->
                     <el-form-item label="疾病类型:" prop="name" label-position="right">
 
-                        <el-select  filterable style="width:100%;" v-model="state1" placeholder="">
+                        <el-select filterable style="width:100%;" v-model="state1" placeholder="">
                             <el-option
                                     v-for="(item,index) in sick"
                                     :key="index"
@@ -48,7 +48,7 @@
 
                     <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;">
 
-                        <el-select style="width:100%;"  v-model="diagnose" placeholder="" multiple filterable>
+                        <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple filterable>
                             <el-option
                                     v-for="(item,index) in diagnoses"
                                     :key="index"
@@ -128,7 +128,8 @@
                                 </el-date-picker>
 
 
-                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"   @change="changevalue" >
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                                           @change="changevalue">
                                     <el-option
                                             v-for="(item,index) in register"
                                             :key="index"
@@ -280,8 +281,8 @@
                                         </el-table-column>
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">
-                                              <!-- {{ scope.row.drug_spec }} -->
-                                              <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                                <!-- {{ scope.row.drug_spec }} -->
+                                                <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
@@ -519,25 +520,25 @@
           { value: 11, label: '普通门诊' },
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
-          { value: 14, label: '门诊特殊病' },
+          { value: 14, label: '门诊特殊病' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
 
         ],
-        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: "新冠肺炎门诊"},
-          {value: 1111, label: "精一"},
-          {value: 1112, label: "精二"},
+        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: '新冠肺炎门诊' },
+          { value: 1111, label: '精一' },
+          { value: 1112, label: '精二' }
 
         ],
 
@@ -546,7 +547,7 @@
         register_type: '',
         value: '0',
         search_project_keyword: '',
-        search_project_team_keyword:"",
+        search_project_team_keyword: '',
         form: {
           name: ''
         },
@@ -588,7 +589,7 @@
         showTwo: false,
         tableData: [],
         tabPrjectTeam: [],
-        allTabPrjectTeam:[],
+        allTabPrjectTeam: [],
         teamList: [],
         doctors: [],
         departMent: [],
@@ -746,7 +747,6 @@
               // obj['single_dose_unit'] = drug_month_prescriptions.advices[a].single_dose_unit
               obj['single_dose_unit'] = drug_month_prescriptions.advices[a].drug.dose_unit
 
-
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
               obj['drug'] = drug_month_prescriptions.advices[a].drug
@@ -1299,8 +1299,7 @@
             ':' + (min < 10 ? '0' + min : min)
           this.prescriptions[i]['pre_time'] = nowTime
 
-            this.prescriptions[i]['med_type'] = 14
-
+          this.prescriptions[i]['med_type'] = 14
 
           this.prescriptions[i].name = '处方' + (i + 1)
           if (i == 0) {
@@ -1324,7 +1323,7 @@
         this.$refs.call_prescription.close()
         this.$emit('setData', this.prescriptions)
 
-      },changevalue(val){
+      }, changevalue(val) {
 
         this.$forceUpdate()
 
@@ -1742,7 +1741,6 @@
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
-
           }
         })
 
@@ -1847,12 +1845,11 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data,last_info) {
+      setData(data, 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)
@@ -1865,12 +1862,9 @@
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         if (month_data && month_data.length > 0) {
-
           this.curMonthPrescriptions = month_data[0]
-
         } else {
           this.curMonthPrescriptions = {}
-
         }
 
         if (data && data.length > 0) {
@@ -1880,7 +1874,6 @@
           this.curPrescriptions = {}
         }
 
-
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -1897,7 +1890,6 @@
           this.showTwo = true
         }
 
-
         if (this.curPrescriptions.project.length == 0 && this.curPrescriptions.advices.length == 0) {
           this.curStatus = 1
           this.customTabIndex = 1
@@ -1906,9 +1898,6 @@
           this.showTwo = false
         }
 
-
-
-
         if (info.prescription_status == 0) {
           this.order_status = ''
         }
@@ -2002,7 +1991,7 @@
           }
         }
 
-        
+
           // getInitData().then(response => {
           //   if (response.data.state == 0) {
           //     this.$message.error(response.data.msg)
@@ -2109,6 +2098,103 @@
           // })
 
       },
+      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]))
+
+            }
+          }
+
+          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
@@ -2257,21 +2343,21 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-            console.log('this.prescriptionsthis.prescriptions',this.prescriptions)
+            console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
             this.prescriptions.map(item => {
-              if(item.advices.length > 0){
+              if (item.advices.length > 0) {
                 item.advices.map(it => {
-                  if(it.drug.total <= 0){
+                  if (it.drug.total <= 0) {
                     num++
-                    setTimeout(() =>{
+                    setTimeout(() => {
                       this.$message.error(it.drug.drug_name + '库存不足')
-                    },100)
+                    }, 100)
                   }
                 })
               }
             })
-            if(num == 0){
+            if (num == 0) {
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2308,7 +2394,7 @@
             if (index == 1) {
               let params = {
                 patient_id: this.patientInfo.id,
-                diagnose: this.diagnose.join(","),
+                diagnose: this.diagnose.join(','),
                 sick_type: this.state1,
                 sick_history: this.state2,
                 doctor: this.doctorValue,
@@ -2403,17 +2489,14 @@
           advices: [],
           project: [],
           addition: [],
-          pre_time: this.prescriptions[0].pre_time,
-
+          pre_time: this.prescriptions[0].pre_time
 
         }
 
-          obj.med_type = 14
-
+        obj.med_type = 14
 
         this.prescriptions.push(obj)
 
-
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
         this.curStatus = 0
@@ -2612,17 +2695,17 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection',selection)
-        console.log('row',row)
-        if(row.total <= 0){
+        console.log('selection', selection)
+        console.log('row', row)
+        if (row.total <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if(row.total <= 0){
-                this.$refs.multipleTable.toggleRowSelection(row);
+              if (row.total <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
               }
-            });
+            })
           } else {
-            this.$refs.multipleTable.clearSelection();
+            this.$refs.multipleTable.clearSelection()
           }
           this.$message.error(row.drug_name + '库存不足')
           return
@@ -2632,8 +2715,8 @@
 
       comfirm() {
 
-       if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
-          if(this.$store.getters.xt_user.org_id == 10138) {
+        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2644,9 +2727,8 @@
           }
         }
 
-
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
-          if(this.$store.getters.xt_user.org_id == 10138) {
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
+          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2657,7 +2739,6 @@
           }
         }
 
-
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []
@@ -2729,9 +2810,9 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-            console.log("hhhhhhhhhhhhhh",temp)
-            console.log("hhhh23",temp2)
-            console.log("hhhh23",temp3)
+            console.log('hhhhhhhhhhhhhh', temp)
+            console.log('hhhh23', temp2)
+            console.log('hhhh23', temp3)
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -2743,7 +2824,7 @@
                   execution_frequency: temp3[b].execution_frequency,
                   retail_price: temp3[b].drug.retail_price.toString(),
                   remark: '',
-                  day: "1",
+                  day: '1',
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.dose_unit,
                   prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
@@ -2761,7 +2842,7 @@
 
             let index = 0
 
-            if(this.curPrescriptions.advices.length > 0){
+            if (this.curPrescriptions.advices.length > 0) {
               index = this.curPrescriptions.advices.length
             }
 
@@ -2783,13 +2864,13 @@
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
-                  groupno:index+temp_index,
+                  groupno: index + temp_index
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
-                console.log('obj',obj)
+                console.log('obj', obj)
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -2818,7 +2899,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total:  temp2[b].cus_total,
+                  total: temp2[b].cus_total,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
@@ -2831,7 +2912,7 @@
                 if (obj.type == 3) {
                   obj.single_dose = 1
                 }
-                console.log('项目obj',temp2)
+                console.log('项目obj', temp2)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
@@ -2886,10 +2967,10 @@
                 number_days: project[i].number_days,
                 price: project[i].price,
                 medical_code: project[i].medical_code,
-                cus_total:1,
+                cus_total: 1,
                 unit: project[i].unit,
                 type: 2,
-                total:project[i].total
+                total: project[i].total
               }
 
               this.tabProject.push(obj)
@@ -2906,12 +2987,12 @@
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
-                cus_total:1,
+                cus_total: 1,
                 price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
-                total:good_info[i].total
+                total: good_info[i].total
               }
               this.tabProject.push(obj)
             }
@@ -2949,7 +3030,6 @@
             this.tabPrjectTeam = team
             this.allTabPrjectTeam = team
 
-
             this.projectList = team
           }
         })
@@ -3001,7 +3081,7 @@
                   delivery_way: project[i].project.delivery_way,
                   execution_frequency: project[i].project.execution_frequency,
                   number_days: project[i].project.number_days,
-                  cus_total:project[i].number,
+                  cus_total: project[i].number,
                   price: project[i].project.price,
                   remark: '',
                   medical_code: project[i].project.medical_code,
@@ -3061,11 +3141,16 @@
       },
       changeDayOrMonth(tab) {
         if (this.dayorMonth == 'day') {
-
+          this.$emit('day')
         } else if (this.dayorMonth == 'month') {
-
+          console.log('~~~~~~')
+          let form = {
+            id: this.patientInfo.id,
+            his_patient_id: this.hisPatientInfo.id
+          }
+          console.log(form)
+          this.$emit('month', form)
         }
-
       },
       getAllProjectList() {
         getAllProjectList().then(response => {

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

src/xt_pages/stock/stockDamaged.vue

@@ -130,6 +130,16 @@
             <el-form-item label="规格">
                 <el-input v-model="form.specification_name"></el-input>
             </el-form-item>
+            <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="单位">
                 <el-input v-model="form.warehousing_unit"></el-input>
             </el-form-item>
@@ -165,37 +175,37 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="耗材ID" width="100">
+            <el-table-column prop="date" label="耗材ID" width="100" align="center">
                <template  slot-scope="scope">
                  {{scope.row.good_id}}
                </template>
             </el-table-column>
-            <el-table-column prop="date" label="耗材名称" width="100">
+            <el-table-column prop="date" label="耗材名称" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_name}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="规格" width="100">
+            <el-table-column  prop="name" label="规格" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="报损数量" width="100">
+            <el-table-column prop="name" label="报损数量" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.count}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原进货价" width="100">
+            <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.buy_price}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="原零售价" width="100">
+            <el-table-column prop="name" label="原零售价" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.packing_price}}
                </template>
@@ -205,22 +215,22 @@
                 {{scope.row.new_price}}
                </template>
             </el-table-column> -->
-            <el-table-column prop="name" label="生产厂商" width="100">
+            <el-table-column prop="name" label="生产厂商" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.manufacturer}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="产地" width="100">
+            <el-table-column prop="name" label="产地" width="100" align="center">
                <template  slot-scope="scope">
                 {{scope.row.good_origin_place}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="批准文号" width="100">
+            <el-table-column prop="name" label="批准文号" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.license_number}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="备注" width="100">
+            <el-table-column  prop="name" label="备注" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.remark}}
                </template>
@@ -364,7 +374,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -401,6 +411,9 @@ export default {
                 good_origin_place:"",
                 report_count:"",
                 total:"",
+                number:"",
+                expiry_date:"",
+                product_date:"",
             },
             currentIndex: 0,
             manufacturerList:[],
@@ -420,6 +433,7 @@ export default {
             editPriceDialogVisible:false,
             modifyPriceDialogVisible:false,
             id:0,
+            numberList:[]
         }
     },
     methods:{
@@ -484,7 +498,9 @@ export default {
          })
         },
         handleSelect(val){
-          console.log("val23232323",val)
+          //获取当前耗材的批号
+          this.getStockBatchNumber(val.good_id)
+          this.getGoodWarehouseList(val.good_id)
           this.form.id = val.id
           this.form.good_id = val.good_id,
           this.form.good_name = val.good_name
@@ -499,6 +515,8 @@ export default {
           this.form.warehousing_unit = val.packing_unit  
           this.form.total = val.total
           this.form.new_price = val.new_price
+          this.form.expiry_date = val.expiry_date
+          this.form.product_date = val.product_date
       },
       addStock(){
         var obj = {
@@ -506,19 +524,37 @@ export default {
           good_name:this.form.good_name,
           specification_name:this.form.specification_name,
           warehousing_unit:this.form.warehousing_unit,
-          count:parseInt(this.form.count),
+          count:this.form.count,
           buy_price:this.form.buy_price.toString(),
           packing_price:this.form.packing_price.toString(),
           manufacturer:this.form.manufacturer,
           good_origin_place:this.form.good_origin_place,
           license_number:this.form.license_number,
           remark:this.form.remark,
-          // new_price:this.form.new_price.toString(),
           warehousing_order:this.form.warehousing_order,
           dealer:this.form.dealer,
           start_time:this.getTime(new Date()),
+          number:this.form.number,
+          warehousing_info_id:0,
+          product_date:val.product_date,
+          expiry_date:val.expiry_date,
         } 
         this.tableData.push(obj)
+        this.form.good_id = 0
+        this.form.good_name = ""
+        this.form.specification_name = ""
+        this.form.warehousing_unit = ""
+        this.form.count = ""
+        this.form.buy_price = ""
+        this.form.packing_price = ""
+        this.form.manufacturer = ""
+        this.form.good_origin_place = ""
+        this.form.license_number = ""
+        this.form.remark  = ""
+        this.form.warehousing_order = ""
+        this.form.dealer = ""
+        this.form.number = ""
+        this.form.good_id = ""
       },
       saveReportStock(){
          for(let i = 0;i<this.tableData.length;i++){
@@ -528,6 +564,19 @@ export default {
            if(this.tableData[i].dealer == 0){
               this.tableData[i].dealer = ""   
            }
+         }
+         console.log("比阿哥",this.tableData)
+         console.log("numberlist",this.numberList)
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].count =  parseInt(this.tableData[i].count)
+           this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
+           this.tableData[i].product_date = parseInt(this.tableData[i].product_date)
+           this.tableData[i].total = parseInt(this.tableData[i].total)
+           for(let j=0;j<this.numberList.length;j++){
+              if(this.tableData[i].number == this.numberList[j].number){
+                this.tableData[i].warehousing_info_id = this.numberList[j].id
+              }
+           }
          }
           var params = {
             tableData:this.tableData,
@@ -550,6 +599,7 @@ export default {
             this.form.buy_price = ""
             this.form.warehousing_unit = ""
             this.form.total = ""
+            this.form.number = ""
            
            }
         })
@@ -593,18 +643,12 @@ export default {
        }
      },
     changePrice(val){
-       console.log("val23232322323",val)
-      
        var arr = []
-      
        for(let i=0;i<val.length;i++){
          arr.push(val[i].id)
        }
       var str = arr.join(",")
-    
-      console.log("str",str)
-      this.ids = str
-     
+      this.ids = str 
      },
      SaveCheckedDamage(){
          var params = {
@@ -681,7 +725,6 @@ export default {
        modifyPrice(params).then(response=>{
          if(response.data.state ==1){
            var adjust = response.data.data.adjust
-
            this.modifyPriceDialogVisible = false
            this.$message.success("保存成功")
            this.getlist()
@@ -742,6 +785,30 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("批号列表",list)
+          this.numberList = list
+        }
+      })
+     },
+     getGoodWarehouseList(id){
+       var params = {
+          id:id,
+       }
+      getGoodWarehouseList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.form.total =  list.stock_count
+           console.log("list23232",list)
+         }
+      })
+     }
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/stock/stockModifyPrice.vue

@@ -39,8 +39,8 @@
         <div>
             <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
             <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-            <el-button size="small" type="primary" @click="print">打印</el-button>
-            <el-button size="small" type="primary" @click="toExport">导出</el-button>
+            <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
         </div>
       </div>
       <div>
@@ -67,11 +67,11 @@
                          {{scope.row.packing_unit}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="调价数量" width="100" align="center">
+                    <!-- <el-table-column label="调价数量" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.count}}
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="原进货价" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.buy_price}}
@@ -142,80 +142,6 @@
                   :total="total">
                </el-pagination>
             </div>
-                <!-- <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                    <el-table-column
-                    fixed="left"
-                    prop="date"
-                    label="药品ID"
-                    width="80">
-                    </el-table-column>
-                    <el-table-column
-                    prop="date"
-                    label="药品名称"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="规格"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产厂家"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批准文书"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="经销商"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="数量"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="原零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="现零价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="进货价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="零售总价"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="批号"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="生产日期"
-                    width="100">
-                    </el-table-column>
-                    <el-table-column
-                    prop="name"
-                    label="有效日期"
-                    width="100">
-                    </el-table-column>
-                </el-table> -->
-         
         </div>
     </div>
     <el-dialog
@@ -248,9 +174,9 @@
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <el-form-item label="调价数量">
-                <el-input v-model="form.count"></el-input>
-            </el-form-item>
+            <!-- <el-form-item label="调价数量">
+                <el-input v-model="form.count" type="number"></el-input>
+            </el-form-item> -->
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -279,11 +205,11 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="调价数量" width="100" align="center">
+            <!-- <el-table-column prop="name" label="调价数量" width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.count}}
               </template> 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -370,7 +296,7 @@
                 </el-form-item>
              </el-col> 
             </el-row>
-            <el-row>
+            <!-- <el-row>
              <el-col>
                <el-form-item label="调价数量：">
                     <el-input v-model="form.count"  style="width:200px"></el-input>
@@ -381,7 +307,7 @@
                     </div>
                 </el-form-item>
               </el-col>  
-            </el-row>
+            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -435,19 +361,44 @@
 
 
     <el-dialog
-        title="耗材调价核对"
+        title="耗材调价编辑"
         :visible.sync="modifyDialogVisible"
         width="30%"
         >
         <span>
           <el-form :model="form">
-            <el-row>
-              <el-col>
-                <el-form-item label="现价格">
-                  <el-input v-model="form.new_price" style="width:100px"></el-input>
-                </el-form-item>  
-              </el-col>
-            </el-row>  
+         <el-row>
+               <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        :disabled="true"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <el-input v-model="form.remark" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
           </el-form>  
         </span>
         <span slot="footer" class="dialog-footer">
@@ -578,8 +529,16 @@ export default {
           this.form.packing_price = val.packing_price
           this.form.warehousing_order = val.warehousing_order
           this.form.license_number = val.license_number
-          this.form.dealer = val.dealer
-          this.form.manufacturer = val.manufacturer
+          if(val.dealer == 0){
+            this.form.dealer = ""
+          }else{
+            this.form.dealer = val.dealer
+          }
+          if(this.form.manufacturer == 0){
+            this.form.manufacturer = ""
+          }else{
+            this.form.manufacturer = val.manufacturer
+          }
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -666,7 +625,8 @@ export default {
            this.tableData[i].buy_price = this.tableData[i].buy_price.toString()
            this.tableData[i].packing_price = this.tableData[i].packing_price.toString()
            this.tableData[i].new_price = this.tableData[i].new_price.toString()
-           this.tableData[i].count =  parseInt(this.tableData[i].count)
+          //  this.tableData[i].count =  parseInt(this.tableData[i].count)
+            this.tableData[i].count = 0
            if(this.tableData[i].dealer == 0){
              this.tableData[i].dealer = ""
            }
@@ -677,6 +637,7 @@ export default {
          var params= {
            tableData:this.tableData,
          }
+      
       console.log("parasm222",params)
       saveAdjustPrice(params).then(response=>{
         if(response.data.state == 1){
@@ -684,6 +645,7 @@ export default {
           console.log("msg",msg)
           this.$message.success("保存成功!")
           this.dialogVisible = false
+          this.tableData = []
           this.getAllStockPrice()
         }
       })  
@@ -800,7 +762,16 @@ export default {
            var info =  response.data.data.detail
            console.log("info",info)
            this.id = info.id
-           this.form.new_price = info.new_price
+           this.good_id = info.good_id,
+           this.form.good_name = info.good_name
+           if(info.new_price == 0){
+            this.form.new_price = ""
+           }else{
+             this.form.new_price = info.new_price
+           }
+          
+           this.form.packing_price = info.packing_price
+           this.form.remark = info.remark
            this.modifyDialogVisible = true
          }
        })
@@ -808,7 +779,11 @@ export default {
      updateStockPrice(){
          var params = {
            new_price:this.form.new_price.toString(),
-           id:this.id
+           id:this.id,
+           packing_price:this.form.packing_price.toString(),
+           remark:this.form.remark,
+           good_id:this.form.good_id,
+           good_name:this.form.good_name,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{