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

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -64,7 +64,18 @@
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : "/"
               }}</span>
-              
+            </div>
+          </div>
+          <div class="inline_block">
+            床号：
+            <div class="under_line" style="width: 50px; text-align: center">
+              <span>{{
+                dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+              }}</span>
             </div>
           </div>
           <div class="inline_block">
@@ -78,16 +89,8 @@
             <div
               class="under_line"
               style="width: 70px; text-align: left"
-              v-if="receiverTreatmentAccess.admission_number"
-            >
-              {{ receiverTreatmentAccess.admission_number }}
-            </div>
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-else
             >
-              {{ "/" }}
+              {{ patientInfo.admission_number }}
             </div>
           </div>
         </div>
@@ -310,7 +313,7 @@
                       <div
                         class="under_line"
                         style="
-                          width: 180px;
+                          width: 250px;
                           text-align: center;
                           white-space: normal;
                         "
@@ -1539,13 +1542,23 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
+                <span>{{
+                  patientInfo.DialysisSchedule.device_zone.name
+                    ? patientInfo.DialysisSchedule.device_zone.name
+                    : "/"
+                }}</span>
               </div>
             </div>
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
+                <span>{{
+                  dialysisOrder &&
+                  dialysisOrder.DeviceNumber &&
+                  dialysisOrder.DeviceNumber.number.length > 0
+                    ? dialysisOrder.DeviceNumber.number
+                    : patientInfo.DialysisSchedule.device_number.number
+                }}</span>
               </div>
             </div>
             <div class="inline_block">
@@ -1559,17 +1572,10 @@
               <div
                 class="under_line"
                 style="width: 70px; text-align: left"
-                v-if="patientInfo.admission_number"
               >
                 {{ patientInfo.admission_number }}
               </div>
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-else
-              >
-                {{ "/" }}
-              </div>
+             
             </div>
           </div>
         </template>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <!-- <template>
+    <!-- <template>
         <el-button
           style="float:right;"
           :loading="loading"
@@ -12,24 +12,78 @@
         >
       </template> -->
 
-    <div class='dialysisPage' style="padding-top:40px;">
-      <div v-if="org_id != 10138 && org_id != 10278">
-        <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
-        <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
-        <printSix v-if="org_id == 10243 || org_id == 9675"  v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printSix>
+    <div class="dialysisPage" style="padding-top: 40px">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 9675">
+        <printOne
+          v-if="org_id != 10088 && org_id != 10215"
+          v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint"
+          :ids="ids"
+          :patient="patient"
+          :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject"
+          :patient_id="patient_id"
+          :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></printOne>
+        <printFour
+          v-if="org_id == 10088"
+          v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint"
+          :ids="ids"
+          :patient="patient"
+          :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject"
+          :patient_id="patient_id"
+          :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></printFour>
+        <printFive
+          v-if="org_id == 10215"
+          v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint"
+          :ids="ids"
+          :patient="patient"
+          :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject"
+          :patient_id="patient_id"
+          :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></printFive>
+
         <!-- <printSix v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printSix> -->
       </div>
+      <div v-else-if="org_id == 10243 || org_id == 9675">
+        <printSix
+          v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint"
+          :ids="ids"
+          :patient="patient"
+          :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject"
+          :patient_id="patient_id"
+          :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></printSix>
+      </div>
       <div v-else>
-        <printThree v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printThree
+          v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint"
+          :ids="ids"
+          :patient="patient"
+          :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject"
+          :patient_id="patient_id"
+          :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></printThree>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-
-
 import { parseTime } from "@/utils";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
@@ -37,12 +91,16 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
-import printOne from "./template/printOne"
-import printThree from "./template/printThree"
-import printFour from "./template/printFour"
-import printFive from "./template/printFive"
-import printSix from "./template/printSix"
-import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+import printOne from "./template/printOne";
+import printThree from "./template/printThree";
+import printFour from "./template/printFour";
+import printFive from "./template/printFive";
+import printSix from "./template/printSix";
+import {
+  getAllDoctorList,
+  getAllHisPatientList,
+  getPrescriptionPrint,
+} from "@/api/project/project";
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -51,56 +109,56 @@ export default {
     printThree,
     printFour,
     printFive,
-    printSix
+    printSix,
   },
-  props:{
-    paramsObj:Object
+  props: {
+    paramsObj: Object,
   },
   data() {
     return {
       crumbs: [
-        { path: false, name: '门诊医生站' },
-        { path: false, name: '打印' }
+        { path: false, name: "门诊医生站" },
+        { path: false, name: "打印" },
       ],
-       record_date:"",
-       patientTableData:[],
-       advicePrint:[],
-       hisPatient:{},
-       patient:{},
-       doctorPorject:{},
-       search_input:"",
-       loading:false,
-       patient_id:"",
-       prescription_id:"",
-       ids:'',
-       paramsObj:{},
-       org_id:''
+      record_date: "",
+      patientTableData: [],
+      advicePrint: [],
+      hisPatient: {},
+      patient: {},
+      doctorPorject: {},
+      search_input: "",
+      loading: false,
+      patient_id: "",
+      prescription_id: "",
+      ids: "",
+      paramsObj: {},
+      org_id: "",
     };
   },
-  methods:{
+  methods: {
     printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 10138 || this.org_id == 10278){
+      if (this.org_id == 10138 || this.org_id == 10278) {
         setTimeout(() => {
           const style =
-          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}";
           printJS({
             printable: "prescriptionPrint1",
             type: "html",
             style: style,
-            scanStyles: false
+            scanStyles: false,
           });
-        },500)
-      }else{
+        }, 500);
+      } else {
         const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",
           style: style,
-          scanStyles: false
+          scanStyles: false,
         });
       }
 
@@ -113,53 +171,59 @@ export default {
       //   });
       // }
     },
-    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
-
-            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
-              }
+    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;
+
+          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
-         }
-      })
+          }
+          // 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){
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
-      this.prescription_id = this.prescription_id
-      console.log("row",row)
-        // var params = {
-        //   patient_id:row.patient_id,
-        //   record_date:this.record_date,
-        //   prescription_id:this.prescription_id,
-        // }
+    changePatient(row) {
+      this.patient_id = row.patient_id;
+      this.record_date = this.record_date;
+      this.prescription_id = this.prescription_id;
+      console.log("row", row);
+      // 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
@@ -177,45 +241,42 @@ export default {
       //     }
       // })
     },
-    searchAction(){
-
-    }
-
+    searchAction() {},
   },
 
   created() {
-    this.org_id = this.$store.getters.xt_user.org_id
-    this.getAllDoctorList()
-    var record_date = this.paramsObj.record
-    this.record_date = record_date
-    console.log("record_date",record_date)
-    var prescription_id = this.paramsObj.prescription_id
-    this.prescription_id = prescription_id
-    this.patient_id = this.paramsObj.patient_id
-    this.ids = this.paramsObj.ids
+    this.org_id = this.$store.getters.xt_user.org_id;
+    this.getAllDoctorList();
+    var record_date = this.paramsObj.record;
+    this.record_date = record_date;
+    console.log("record_date", record_date);
+    var prescription_id = this.paramsObj.prescription_id;
+    this.prescription_id = prescription_id;
+    this.patient_id = this.paramsObj.patient_id;
+    this.ids = this.paramsObj.ids;
     // var record_date = this.$route.query.record
     // this.record_date = record_date
     // console.log("record_date",record_date)
     // var prescription_id = this.$route.query.prescription_id
     // this.prescription_id = prescription_id
-    this.getAllHisPatientList(record_date)
+    this.getAllHisPatientList(record_date);
   },
-  watch:{
-    paramsObj:{//深度监听，可监听到对象、数组的变化
-      handler(val, oldVal){
-        this.paramsObj = val
-        this.patient_id = this.paramsObj.patient_id
-        var record_date = this.paramsObj.record
-        this.record_date = record_date
-        console.log("record_date",record_date)
-        var prescription_id = this.paramsObj.prescription_id
-        this.prescription_id = prescription_id
-        this.ids = this.paramsObj.ids
+  watch: {
+    paramsObj: {
+      //深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+        this.paramsObj = val;
+        this.patient_id = this.paramsObj.patient_id;
+        var record_date = this.paramsObj.record;
+        this.record_date = record_date;
+        console.log("record_date", record_date);
+        var prescription_id = this.paramsObj.prescription_id;
+        this.prescription_id = prescription_id;
+        this.ids = this.paramsObj.ids;
       },
-      deep:true
-    }
-  }
-
+      deep: true,
+    },
+  },
 };
 </script>
 
@@ -378,22 +439,22 @@ export default {
 </style>
 
 <style lang="scss">
-
-.newContainer{
+.newContainer {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
 
-  .el-date-editor{
-    .el-input__inner{
-      padding-right:0px;
+  .el-date-editor {
+    .el-input__inner {
+      padding-right: 0px;
     }
   }
-  .el-table td, .el-table th{
+  .el-table td,
+  .el-table th {
     text-align: center;
   }
 }
-.newContainer::-webkit-scrollbar{
+.newContainer::-webkit-scrollbar {
   height: 15px !important;
 }
 </style>

src/xt_pages/outpatientDoctorStation/template/printSix.vue

@@ -26,7 +26,10 @@
           <p>科室：{{ item.info ? getDepart(item.info.departments) : "" }}</p>
           <p>费别：</p>
           <p>门诊号：{{ hisPatient.number ? hisPatient.number : "" }}</p>
-          <p><span>年</span> <span>月</span> <span>日</span></p>
+          <p>
+            <!-- <span>年</span> <span>月</span> <span>日</span> -->
+            {{getTime(item.ctime)?getTime(item.ctime):""}}
+          </p>
         </div>
 
         <div class="infoTitle" style="border-bottom:1px solid #000;">
@@ -393,15 +396,24 @@ export default {
       return project_name;
     },
 
-    getDiagnosis(id) {
-      var name = "";
-      for (let i = 0; i < this.diagnoses.length; i++) {
-        if (id == this.diagnoses[i].id) {
-          name = this.diagnoses[i].class_name;
+    getDiagnosis(id){
+        let ids = id.split(",")
+        var name = ""
+        for(let i = 0; i < ids.length; i++){
+
+          for(let b=0;b<this.diagnoses.length;b++){
+            if(parseInt(ids[i]) == this.diagnoses[b].id){
+              if(name.length == 0){
+                name = this.diagnoses[b].class_name
+              }else{
+                name = name +"," + this.diagnoses[b].class_name
+
+              }
+            }
+          }
         }
+        return name
       }
-      return name;
-    },
   },
   created() {
     this.getAllDoctorList();

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -744,18 +744,19 @@ export default {
       },
 
     exportList(){
+       console.log("哈哈哈",this.tableOut)
+      
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
-        if(this.orgId == 9919 || this.orgId == 9671){
+        if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else{
-          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].retail_price).toFixed(2)
         }
-      
         this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
@@ -786,7 +787,7 @@ export default {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
-          if(this.orgId == 9919 || this.orgId == 9671){
+          if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
           }else{
@@ -797,6 +798,7 @@ export default {
          
         }
         obj.total_price = total.toFixed(2)
+      
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -524,16 +524,16 @@ export default {
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
            }else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
-              this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
+              this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price) 
            }
         }
        console.log("列表数据333333333",this.tablePrint)
-      
+       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -805,7 +805,12 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count > 0){
+        return total_count;
+      }else{
+        return ""
+      }
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/components/editGoodReturn.vue

@@ -1012,8 +1012,19 @@ export default {
           if(msg == 2){
             var good_name = response.data.data.good_name
             var specification_name = response.data.data.specification_name
-            var str = good_name +"*" + specification_name +"无库存,请入库"
-             this.$message.error(str)
+            var str = good_name +"*" + specification_name +"库存不足"+"审核失败"
+            this.$message.error(str)
+
+          }
+          if(msg == 3){
+              var drug_name =  response.data.data.drug_name
+              var dose = response.data.data.dose
+              var dose_unit = response.data.data.dose_unit
+              var min_number = response.data.data.min_number
+              var min_unit =  response.data.data.min_unit
+              var max_unit =  response.data.data.max_unit
+              var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+              this.$message.error(str + "库存不足")+"审核失败"
           }
           
         }