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

src/xt_pages/data/components/drugs.vue

@@ -372,10 +372,9 @@
         // this.$refs.maintain.show();
       },
       openForm(id) {
-
+        this.current_id = id
         this.getAllManufacturer()
         if (id > 0) {
-          this.current_id = id
           let params = {
             id: this.current_id
           }
@@ -462,7 +461,7 @@
           }
           this.$refs.addDrugs.show(0, this.formValue)
         }
-      }, 
+      },
 
        deleteDurg(id,index){
          console.log("id",id)

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -455,6 +455,7 @@
         return getDictionaryDataConfig(module, filed_name)
       },
       show: function () {
+        this.form = Object.assign({}, this.resetForm)
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -472,6 +473,7 @@
 
       }, hide: function () {
         this.visibility = false
+        this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
@@ -482,7 +484,6 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.form = Object.assign({}, this.resetForm)
           }
         })
       },

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -0,0 +1,415 @@
+<template>
+  <div>
+    <template>
+      <el-button
+        style="position:fixed;right:25px;z-index:999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印</el-button
+      >
+    </template>
+
+    <div class='dialysisPage' style="padding-top:40px;">
+      <printOne :info="info"></printOne>
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+  import { parseTime } from "@/utils";
+  import { getDialysisRecord } from "@/api/dialysis";
+  import { getDataConfig } from "@/utils/data";
+  import { jsGetAge, uParseTime } from "@/utils/tools";
+  import axios from 'axios'
+
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import print from "print-js";
+  import printOne from "./statementTemplate/printOne"
+  import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+  export default {
+    name: "newStatementPrint",
+    components: {
+      BreadCrumb,
+      printOne
+    },
+    props:{
+      paramsObj:Object
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '打印' }
+        ],
+        record_date:"",
+        patientTableData:[],
+        advicePrint:[],
+        hisPatient:{},
+        patient:{},
+        search_input:"",
+        loading:false,
+        patient_id:0,
+        prescription_id:0,
+        ids:'',
+        info:null,
+      };
+    },
+    methods:{
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+        const style =
+          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+        printJS({
+          printable: "statement-print",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+
+        // if (this.org_template_info.template_id == 1) {
+        //   printJS({
+        //     printable: "dialysis-print-box",
+        //     type: "html",
+        //     style: style,
+        //     scanStyles: false
+        //   });
+        // }
+      },
+      getAllDoctorList(){
+        getAllDoctorList().then(response=>{
+          if(response.data.state == 1){
+            var doctor =  response.data.data.doctor
+
+            this.doctorList = doctor
+          }
+        })
+      },
+      getAllHisPatientList(){
+        const params = {
+          record_date:this.record_date
+        }
+        getAllHisPatientList(params).then(response=>{
+          if(response.data.state == 1){
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+
+            console.log('222', this.patientTableData)
+            let cal_one = 0
+            let cal_two = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
+                cal_one = cal_one + 1
+              }
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                cal_two = cal_two + 1
+              }
+            }
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
+            this.cal_one = cal_one
+            this.cal_two = cal_two
+          }
+        })
+      },
+
+      changePatient(row){
+        console.log("row",row)
+        this.patient_id = row.patient_id
+        this.record_date = this.record_date
+        this.prescription_id = this.prescription_id
+        //   var params = {
+        //     patient_id:row.patient_id,
+        //     record_date:this.record_date,
+        //     prescription_id:this.prescription_id,
+        //   }
+        // getPrescriptionPrint(params).then(response=>{
+        //     if(response.data.state == 1){
+        //       var advicePrint =  response.data.data.advicePrint
+        //       console.log("adviceprint",advicePrint)
+        //       this.advicePrint = advicePrint
+        //       // var hisPatient =  response.data.data.hisPatient
+        //       // console.log("hispatient",hisPatient)
+        //       // this.hisPatient = hisPatient
+        //       var patient =  response.data.data.patient
+        //       console.log("patient",patient)
+        //       this.patient = patient
+        //       var doctorPorject = response.data.data.doctorPorject
+        //       console.log("doctorporject",doctorPorject)
+        //     }
+        // })
+      },
+      searchAction(){
+
+      },
+      getInfo(order_id) {
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+
+          var that = this
+
+          axios.get('http://127.0.0.1:9532/api/settle/query', {
+            params: {
+              order_id: order_id,
+            }
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                console.log("logloglog")
+
+                console.log(response.data.data.info)
+                that.info = response.data.data.info
+                console.log(that.info)
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] = response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+
+
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+                console.log(this.info)
+              }
+            })
+            .catch(function (error) {
+
+            });
+        }
+      }
+
+    },
+
+    created() {
+      this.getInfo(this.paramsObj.order_id)
+    },
+    watch:{
+      paramsObj:{//深度监听，可监听到对象、数组的变化
+        handler(val, oldVal){
+          this.paramsObj = val
+          this.getInfo(this.paramsObj.order_id)
+
+        },
+        deep:true
+      }
+    }
+
+  };
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto;
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
+
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 30px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+  .print-template-two tr {
+    line-height: 30px;
+  }
+
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
+</style>
+
+<style lang="scss">
+
+  .newContainer{
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+
+  .el-date-editor{
+  .el-input__inner{
+    padding-right:0px;
+  }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+  }
+  .newContainer::-webkit-scrollbar{
+    height: 15px !important;
+  }
+</style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -73,9 +73,13 @@
                      @click="open(4)"
                      type="primary">收费
           </el-button>
+
           <el-button size="small" @click="open(5)" type="primary"
-                    >退费
+               v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2" >退费
           </el-button>
+          <!-- <el-button size="small" @click="open(5)" type="primary"
+                    >退费
+          </el-button> -->
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->

src/xt_pages/outpatientCharges/summary.vue

@@ -85,6 +85,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="$store.getters.xt_user.org_id == 9919 && scope.row.order_status == 2">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -102,6 +103,15 @@
       </el-pagination>
     </div>
 
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="statementVisible">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+    <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -111,13 +121,19 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import statementPrint from './statementPrint'
+  import NewStatementPrint from './newStatementPrint'
+
 
   export default {
     components: {
+      NewStatementPrint,
       BreadCrumb
     },
     data() {
       return {
+        orderObj: {},
+        statementVisible: false,
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
@@ -135,6 +151,14 @@
       }
     },
     methods: {
+      toPrint(row){
+        this.statementVisible = true
+        let obj = {
+          order_id: row.id
+        }
+        this.orderObj = obj
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -78,7 +78,7 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt }}元</span></span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
                       <span v-if="order.order_status == 1">待结算</span>
                       <span v-if="order.order_status == 2">已结算</span>
                       <span v-if="order.order_status == 3">已退费</span>
@@ -165,6 +165,33 @@ export default {
     },created(){
       this.GetOrderDetail()
   },methods:{
+    // getTotal() {
+    //   var total = 0
+    //   for (let i = 0; i < this.prescriptions.length; i++) {
+    //     if (this.prescriptions[i].advices != null) {
+    //       for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+    //         console.log(this.prescriptions[i].advices[a].price )
+    //         console.log(this.prescriptions[i].advices[a].prescribing_number)
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number)
+    //       }
+    //     }
+    //     if (this.prescriptions[i].project != null) {
+    //       for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count)
+    //       }
+    //     }
+    //
+    //     if (this.prescriptions[i].addition != null) {
+    //       for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].addition[a].price * this.prescriptions[i].addition[b].count)
+    //       }
+    //     }
+    //   }
+    //   return total.toFixed(2)
+    //
+    // },
     getDictionaryDataConfig(module, filed_name) {
       return getDictionaryDataConfig(module, filed_name)
     },
@@ -221,7 +248,155 @@ export default {
       if (tab == 'more') {
         return false
       }
+    },   setMonthPrescription(month_prescriptions) {
+      console.log(month_prescriptions)
+      let drug_month_prescriptions = {
+        advices: []
+      }
+      let drug_ids = []
+      let project_month_prescriptions = {
+        project: []
+
+      }
+      let project_ids = []
+
+      let addition_month_prescriptions = {
+        addition: []
+
+      }
+      let additions_ids = []
+
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        if (month_prescriptions[i].type == 1) { //药品
+          for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].advices[a].drug_id,
+              price: month_prescriptions[i].advices[a].price
+
+            }
+            drug_ids.push(obj)
+            drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+          }
+
+        } else if (month_prescriptions[i].type == 2) { //项目
+          for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].project[a].project_id,
+              price: month_prescriptions[i].project[a].price
+
+            }
+            project_ids.push(obj)
+            project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+          }
+        }
+        //附加收费
+        for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          let obj = {
+            id: month_prescriptions[i].addition[a].item_id,
+            price: month_prescriptions[i].addition[a].price
+
+          }
+          additions_ids.push(obj)
+          addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+
+        }
+
+      }
+      console.log(drug_ids)
+      console.log(project_ids)
+      console.log(additions_ids)
+
+
+
+      const obj = {}
+      const obj1 = {}
+      const obj2 = {}
+
+      drug_ids = drug_ids.reduce((cur, next) => {
+        obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      project_ids = project_ids.reduce((cur, next) => {
+        obj1[next.price] ? '' : obj1[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      additions_ids = additions_ids.reduce((cur, next) => {
+        obj2[next.price] ? '' : obj2[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+
+
+
+      for (let i = 0; i < drug_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+          if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            obj['name'] = drug_month_prescriptions.advices[a].advice_name
+            obj['statistical_classification'] = ''
+            obj['type'] = 1
+            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+            obj['day'] = drug_month_prescriptions.advices[a].day
+            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['remark'] = drug_month_prescriptions.advices[a].remark
+            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+            count = count + drug_month_prescriptions.advices[a].prescribing_number
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+      }
+
+      for (let i = 0; i < project_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            obj['name'] = project_month_prescriptions.project[a].project.project_name
+            obj['statistical_classification'] = ''
+            obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+            obj['day'] = project_month_prescriptions.project[a].day
+            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
+            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
+            count = count + project_month_prescriptions.project[a].count
+            obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            obj['remark'] = project_month_prescriptions.project[a].remark
+            obj['type'] = 2
+
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+
+      }
+
+      for (let i = 0; i < additions_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        console.log(addition_month_prescriptions.addition)
+        if (addition_month_prescriptions.addition) {
+          for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+            if (additions_ids[i].price == addition_month_prescriptions.addition[a].price) {
+              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+              count = count + addition_month_prescriptions.addition[a].count
+              obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+            }
+          }
+          obj['count'] = count
+          this.additions.push(obj)
+
+        }
+      }
+
     },
+
     GetOrderDetail(){
       let params={
         number:this.$route.query.number,
@@ -240,50 +415,56 @@ export default {
           this.prescriptions = []
           this.tableData = []
 
-          for (let i = 0; i < response.data.data.prescription.length; i++) {
-            var prescription = response.data.data.prescription[i]
-
-
-            for (let b = 0; b < prescription.advices.length; b++) {
-              let obj = {
-                name: prescription.advices[b].advice_name,
-                statistical_classification:"",
-                type:1,
-                single_dose: prescription.advices[b].single_dose,
-                delivery_way: prescription.advices[b].delivery_way,
-                execution_frequency: prescription.advices[b].execution_frequency,
-                price: prescription.advices[b].price.toString(),
-                day: prescription.advices[b].day,
-                count:prescription.advices[b].prescribing_number.toString(),
-                remark: prescription.advices[b].remark,
-                single_dose_unit: prescription.advices[b].single_dose_unit,
-                prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-
-              }
-              this.tableData.push(obj)
-            }
-
-            for (let b = 0; b < prescription.project.length; b++) {
-              let obj = {
-                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,
-                price: prescription.project[b].price,
-                day: prescription.project[b].day,
-                count: prescription.project[b].count.toString(),
-                remark: prescription.project[b].remark,
-                single_dose_unit:prescription.project[b].project.unit,
-                prescribing_number_unit:prescription.project[b].project.unit,
-                type:2,
-              }
-              this.tableData.push(obj)
-            }
 
-            for (let b = 0; b < prescription.addition.length; b++) {
-                this.additions.push( prescription.addition[b])
-            }
+          var prescription = response.data.data.prescription
+          this.prescriptions = prescription
+          this.setMonthPrescription(prescription)
+
+
+          // for (let i = 0; i < response.data.data.prescription.length; i++) {
+          //   var prescription = response.data.data.prescription[i]
+
+
+            // for (let b = 0; b < prescription.advices.length; b++) {
+            //   let obj = {
+            //     name: prescription.advices[b].advice_name,
+            //     statistical_classification:"",
+            //     type:1,
+            //     single_dose: prescription.advices[b].single_dose,
+            //     delivery_way: prescription.advices[b].delivery_way,
+            //     execution_frequency: prescription.advices[b].execution_frequency,
+            //     price: prescription.advices[b].price.toString(),
+            //     day: prescription.advices[b].day,
+            //     count:prescription.advices[b].prescribing_number.toString(),
+            //     remark: prescription.advices[b].remark,
+            //     single_dose_unit: prescription.advices[b].single_dose_unit,
+            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+            //
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.project.length; b++) {
+            //   let obj = {
+            //     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,
+            //     price: prescription.project[b].price,
+            //     day: prescription.project[b].day,
+            //     count: prescription.project[b].count.toString(),
+            //     remark: prescription.project[b].remark,
+            //     single_dose_unit:prescription.project[b].project.unit,
+            //     prescribing_number_unit:prescription.project[b].project.unit,
+            //     type:2,
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.addition.length; b++) {
+            //     this.additions.push( prescription.addition[b])
+            // }
 
 
 
@@ -298,7 +479,7 @@ export default {
             // this.prescriptions.push(obj)
             // this.curPrescriptions = this.prescriptions[0]
 
-          }
+          // }
           // this.tableData = response.data.data.order
 
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -325,46 +325,70 @@
           }
         })
       },
-      setMonthPrescription(month_prescriptions){
+      setMonthPrescription(month_prescriptions) {
+        console.log("11111111")
+        console.log(month_prescriptions)
+
+
+        this.month_prescriptions = []
+
         let drug_month_prescriptions = {
-          advices:[],
+          advices: []
         }
-        let drug_ids=[]
-        let project_month_prescriptions ={
-          project:[],
+        let drug_ids = []
+        let project_month_prescriptions = {
+          project: []
 
         }
-        let project_ids=[]
+        let project_ids = []
 
-        let addition_month_prescriptions ={
-          addtions:[],
+        let addition_month_prescriptions = {
+          addition: []
 
         }
-        let additions_ids=[]
+        let additions_ids = []
 
+        for (let i = 0; i < month_prescriptions.length; i++) {
+          if (month_prescriptions[i].type == 1) { //药品
+            for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].advices[a].drug_id,
+                price:month_prescriptions[i].advices[a].price,
 
-        for (let i = 0; i < month_prescriptions.length; i++){
-          if(month_prescriptions[i].type == 1){ //药品
-            for (let a = 0; a < month_prescriptions[i].advices.length; a++){
-              drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+              }
+              drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
 
-          }else if(month_prescriptions[i].type == 2){ //项目
-            for (let a = 0; a < month_prescriptions[i].project.length; a++){
-              project_ids.push(month_prescriptions[i].project[a].project_id)
+          } else if (month_prescriptions[i].type == 2) { //项目
+            for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].project[a].project_id,
+                price:month_prescriptions[i].project[a].price,
+
+              }
+              project_ids.push(obj)
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
           //附加收费
           for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            additions_ids.push(month_prescriptions[i].addition[a].item_id)
-            addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
-          }
+            let obj = {
+              id: month_prescriptions[i].addition[a].item_id,
+              price:month_prescriptions[i].addition[a].price,
 
-        }
+            }
+            additions_ids.push(obj)
+            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
+          }
 
+        }
+        console.log("00000000000000")
+        console.log(drug_ids)
+        console.log(project_ids)
+        console.log(additions_ids)
+        console.log("00000000000000")
 
 
         const obj = {}
@@ -372,119 +396,278 @@
         const obj2 = {}
 
         drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next] ? '' : obj[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         project_ids = project_ids.reduce((cur, next) => {
-          obj1[next] ? '' : obj1[next] = true && cur.push(next)
+            obj[next.price] ? '' : obj[next.price] = true &&  cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next] ? '' : obj2[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true  && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
 
 
+        let drugs = []
+        let projects = []
+        let additions = []
 
-
-        let drugs =[]
-        let projects =[]
-        let additions =[]
-
-
-        for (let i = 0; i < drug_ids.length; i++){
+        for (let i = 0; i < drug_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
-            if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+          for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
               obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
               obj['day'] = drug_month_prescriptions.advices[a].day
               // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
-              obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
-              obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
-              obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+              obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+              obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
+              obj['id'] = drug_month_prescriptions.advices[a].drug_id
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
-
-
-              count = count +  drug_month_prescriptions.advices[a].prescribing_number
-              price = price +   drug_month_prescriptions.advices[a].price
+              obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+              count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
-          obj['retail_price'] = price
           obj['prescribing_number'] = count
           drugs.push(obj)
         }
 
-
-
-
-        for (let i = 0; i < project_ids.length; i++){
+        for (let i = 0; i < project_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < project_month_prescriptions.project.length; a++){
-            if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+          for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
-              obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
-              obj['unit'] =  project_month_prescriptions.project[a].unit
-              obj['project_id'] =  project_month_prescriptions.project[a].project_id
-              count = count +  project_month_prescriptions.project[a].count
-              price = price +   project_month_prescriptions.project[a].price
+              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+              obj['unit'] = project_month_prescriptions.project[a].unit
+              obj['project_id'] = project_month_prescriptions.project[a].project_id
+              count = count + project_month_prescriptions.project[a].count
+              // price = price + project_month_prescriptions.project[a].price
+              obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+
             }
           }
-          obj['price'] = price
           obj['total'] = count
           projects.push(obj)
         }
 
-
-        for (let i = 0; i < additions_ids.length; i++){
+        for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
-            if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-              obj['id'] = addition_month_prescriptions.addition[a].id
-              obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
-              count = count +  addition_month_prescriptions.addition[a].count
-              price = price +   addition_month_prescriptions.addition[a].price
+          console.log(addition_month_prescriptions.addition)
+          if (addition_month_prescriptions.addition) {
+            for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+              if (project_ids[i].price == addition_month_prescriptions.addition[a].price) {
+                obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+                obj['id'] = addition_month_prescriptions.addition[a].id
+                obj['item_id'] = addition_month_prescriptions.addition[a].item_id
+                count = count + addition_month_prescriptions.addition[a].count
+                obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+              }
             }
+            obj['count'] = count
+            additions.push(obj)
           }
-          obj['price'] = price
-          obj['count'] = count
-          additions.push(obj)
         }
 
+        console.log(drugs)
+        console.log(projects)
+        console.log(additions)
 
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
           project: [],
-          type:1,
-          addition: additions,
+          type: 1,
+          addition: additions
         }
         let p2 = {
           name: '处方' + 2,
-          type:2,
+          type: 2,
           project: projects,
           advices: [],
+          addition: []
+
         }
+
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)
 
+        this.curMonthPrescriptions = this.month_prescriptions[0]
+
       },
+
+      // setMonthPrescription(month_prescriptions){
+      //   let drug_month_prescriptions = {
+      //     advices:[],
+      //   }
+      //   let drug_ids=[]
+      //   let project_month_prescriptions ={
+      //     project:[],
+      //
+      //   }
+      //   let project_ids=[]
+      //
+      //   let addition_month_prescriptions ={
+      //     addtions:[],
+      //
+      //   }
+      //   let additions_ids=[]
+      //
+      //
+      //   for (let i = 0; i < month_prescriptions.length; i++){
+      //     if(month_prescriptions[i].type == 1){ //药品
+      //       for (let a = 0; a < month_prescriptions[i].advices.length; a++){
+      //         drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+      //         drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+      //       }
+      //
+      //     }else if(month_prescriptions[i].type == 2){ //项目
+      //       for (let a = 0; a < month_prescriptions[i].project.length; a++){
+      //         project_ids.push(month_prescriptions[i].project[a].project_id)
+      //         project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+      //       }
+      //     }
+      //     //附加收费
+      //     for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+      //       additions_ids.push(month_prescriptions[i].addition[a].item_id)
+      //       addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
+      //     }
+      //
+      //   }
+      //
+      //
+      //
+      //
+      //   const obj = {}
+      //   const obj1 = {}
+      //   const obj2 = {}
+      //
+      //   drug_ids = drug_ids.reduce((cur, next) => {
+      //     obj[next] ? '' : obj[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   project_ids = project_ids.reduce((cur, next) => {
+      //     obj1[next] ? '' : obj1[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   additions_ids = additions_ids.reduce((cur, next) => {
+      //     obj2[next] ? '' : obj2[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //
+      //
+      //
+      //
+      //
+      //   let drugs =[]
+      //   let projects =[]
+      //   let additions =[]
+      //
+      //
+      //   for (let i = 0; i < drug_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
+      //       if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+      //         obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
+      //         obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+      //         obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+      //         obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+      //         obj['day'] = drug_month_prescriptions.advices[a].day
+      //         // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
+      //         obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
+      //         obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
+      //         obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+      //         // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
+      //
+      //
+      //         count = count +  drug_month_prescriptions.advices[a].prescribing_number
+      //         price = price +   drug_month_prescriptions.advices[a].price
+      //
+      //       }
+      //     }
+      //     obj['retail_price'] = price
+      //     obj['prescribing_number'] = count
+      //     drugs.push(obj)
+      //   }
+      //
+      //
+      //
+      //
+      //   for (let i = 0; i < project_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < project_month_prescriptions.project.length; a++){
+      //       if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+      //         obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+      //         obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+      //         obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+      //         obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+      //         obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+      //         obj['number_days'] = project_month_prescriptions.project[a].day
+      //         obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+      //         obj['unit'] =  project_month_prescriptions.project[a].unit
+      //         obj['project_id'] =  project_month_prescriptions.project[a].project_id
+      //         count = count +  project_month_prescriptions.project[a].count
+      //         price = price +   project_month_prescriptions.project[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['total'] = count
+      //     projects.push(obj)
+      //   }
+      //
+      //
+      //   for (let i = 0; i < additions_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
+      //       if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
+      //         obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+      //         obj['id'] = addition_month_prescriptions.addition[a].id
+      //         obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
+      //         count = count +  addition_month_prescriptions.addition[a].count
+      //         price = price +   addition_month_prescriptions.addition[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['count'] = count
+      //     additions.push(obj)
+      //   }
+      //
+      //
+      //   let p1 = {
+      //     name: '处方' + 1,
+      //     advices: drugs,
+      //     project: [],
+      //     type:1,
+      //     addition: additions,
+      //   }
+      //   let p2 = {
+      //     name: '处方' + 2,
+      //     type:2,
+      //     project: projects,
+      //     advices: [],
+      //   }
+      //   this.month_prescriptions.push(p1)
+      //   this.month_prescriptions.push(p2)
+      //
+      // },
       getList() {
         let params = {
           'record_date': this.record_date,

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -830,7 +830,7 @@ export default {
            four_qurter_end:four_qurter_end,
            bloodType:this.bloodType
          }
-         console.log("params",params)
+         // console.log("params",params)
        getBloodPressureList(params).then(response=>{
           if(response.data.state == 1){
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -421,7 +421,7 @@
         this.isVisibility = true
       }, 
       comfirm: function(val) {
-
+        console.log("Val2222222",val)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
@@ -429,7 +429,7 @@
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
               this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-              // this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
+              this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
             } else {
               const tempForm = {}
               tempForm["id"] = 0;
@@ -443,7 +443,7 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              tempForm['min_unit']=''
+              tempForm['min_unit']= val.selectedGoodInfo[i].min_unit
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -487,7 +487,9 @@
           loading.close()
 
         })
-      }, typeName: function(drug_id) {
+      },
+       typeName: function(drug_id) {
+        
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -504,7 +506,8 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      },
+       handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['drug_id'] = 0
         tempObj['number'] = ''
@@ -516,6 +519,7 @@
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['min_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -341,6 +341,7 @@ export default {
             tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
             tempForm['count'] = ''
             tempForm['remark'] = ''
+            tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
@@ -417,6 +418,7 @@ export default {
       });
     },
     typeName: function(drug_id) {
+    
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -425,7 +427,8 @@ export default {
         }
       }
       return name;
-    }, specificationName: function(drug_id) {
+    },
+     specificationName: function(drug_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -441,7 +444,7 @@ export default {
       tempObj["price"] = "";
       tempObj["retail_price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["min_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -469,6 +472,7 @@ export default {
       }
     },
     showDialog(index, row) {
+      
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -594,7 +598,7 @@ export default {
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-
+    tempObj["min_unit"] = "";
 
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -151,6 +151,7 @@
 
       },
       comfirm: function(formName) {
+       
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
@@ -158,6 +159,7 @@
       },
       getValue: function() {
         this.multipleSelection = []
+        console.log("库存22222",this.propForm.goods)
         for (let i = 0; i < this.propForm.goods.length; i++) {
           for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
                 if (this.propForm.goods[i].drug_specs[a].isSelected) {
@@ -170,7 +172,8 @@
         }
         console.log(obj)
         return obj
-      }, goodTypeSelect: function(id) {
+      },
+       goodTypeSelect: function(id) {
         this.tempGoodInfo = []
         this.goodInfo = []
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -475,6 +475,7 @@
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['good_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -496,7 +497,7 @@
         this.recordInfo.recordData = []
         getWarehouseInfoByOrdeNumber(params).then(response => {
           if (response.data.state != 0) {
-             console.log("8888888888mma",response.data.data.info)
+            
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -463,7 +463,7 @@ export default {
       tempObj["count"] = "";
       tempObj["price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["good_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {