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/details/dialog/dialysisPrescriptionDialog.vue

@@ -756,8 +756,7 @@
 
                     <el-col :span="8" v-if="isShows('透析管路支数')">
                         <el-form-item label="透析管路支数">
-                            <el-input
-                                    v-model="dialysisPrescription.hemodialysis_pipelines_count"
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.hemodialysis_pipelines_count"
                             ></el-input>
                         </el-form-item>
                     </el-col>
@@ -773,8 +772,7 @@
 
                     <el-col :span="8" v-if="isShows('穿刺针支数')">
                         <el-form-item label="穿刺针支数">
-                            <el-input
-                                    v-model="dialysisPrescription.puncture_needle_count"
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.puncture_needle_count"
                             ></el-input>
                         </el-form-item>
                     </el-col>
@@ -802,9 +800,7 @@
 
                     <el-col :span="8" v-if="isShows('促红素支数')">
                         <el-form-item label="促红素支数">
-                            <el-input
-                                    v-model="dialysisPrescription.epo_count"
-                            ></el-input>
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.epo_count"></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -2132,7 +2128,7 @@
            }else{
              this.anticoagulant.shouji_unit = 'iu'
            }
-         
+
           this.anticoagulant.weichi_unit = 'mg/h'
           this.anticoagulant.zongliang_unit = 'mg'
         }

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -187,12 +187,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2446,6 +2446,8 @@
 
             let ids = []
             let temp_order_id = 0
+            var index = 0
+
             if (this.radio == 2) {
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
@@ -2455,18 +2457,26 @@
               temp_order_id = ids[ids.length - 1]
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (temp_order_id == this.patientTableData[i].order_id) {
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
+                  index = i
+                  // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
                 }
               }
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
+
             } else {
+              var index = 0
               for (let i = 0; i < this.patientTableData.length; i++) {
-                if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
+                if(this.hisPatientInfo.id == 0){
+                  if (this.patientInfo.id == this.patientTableData[i].id) {
+                    index  = i
+                  }
+                }else{
+                  if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
+                    index  = i
+                  }
                 }
-
               }
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
             }
           }
         })

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -247,6 +247,7 @@
             let tempProject = [];
             let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
+              let index = b + 1
               let obj = {
                 advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -262,6 +263,7 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
+                groupno: index,
               };
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2155,6 +2155,8 @@
                 this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
                 this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
+                this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
+
 
               }
 
@@ -2177,14 +2179,31 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-            createHisPrescription(data, params).then(response => {
-              if (response.data.state == 1) {
-                this.$emit('change', this.patientInfo.id)
-                this.$message.success('保存成功')
-              } else {
-                this.$message.error(response.data.msg)
+            console.log('this.prescriptionsthis.prescriptions',this.prescriptions)
+            let num = 0
+            this.prescriptions.map(item => {
+              if(item.advices.length > 0){
+                item.advices.map(it => {
+                  if(it.drug.total <= 0){
+                    num++
+                    setTimeout(() =>{
+                      this.$message.error(it.drug.drug_name + '库存不足')
+                    },100)
+                  }
+                })
               }
             })
+            if(num == 0){
+              createHisPrescription(data, params).then(response => {
+                if (response.data.state == 1) {
+                  this.$emit('change', this.patientInfo.id)
+                  this.$message.success('保存成功')
+                } else {
+                  this.$message.error(response.data.msg)
+                }
+              })
+            }
+
           } else if (index == 2) {
             this.$router.push('/outpatientDoctorStation/print')
           } else if (index == 4) {
@@ -2534,10 +2553,6 @@
       },
 
       comfirm() {
-        console.log(this.curPrescriptions.advices)
-        console.log(this.curPrescriptions.project)
-        console.log(this.curPrescriptions.advices.length)
-        console.log(this.curPrescriptions.project.length)
 
        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
           if(this.$store.getters.xt_user.org_id == 10138) {
@@ -2666,8 +2681,15 @@
               this.curStatus = 1
             }
 
+            let index = 0
+
+            if(this.curPrescriptions.advices.length > 0){
+              index = this.curPrescriptions.advices.length
+            }
+
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                let temp_index = b + 1
                 let obj = {
                   advice_id: 0,
                   id: temp[b].id,
@@ -2682,7 +2704,8 @@
                   single_dose_unit: temp[b].dose_unit,
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
-                  drug: temp[b]
+                  drug: temp[b],
+                  groupno:index+temp_index,
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -2750,8 +2773,21 @@
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
-      selectChange(row) {
-        this.teamList = row
+      selectChange(selection, row) {
+        if(row.total <= 0){
+          if (selection) {
+            selection.forEach(row => {
+              if(row.total <= 0){
+                this.$refs.tables.toggleRowSelection(row);
+              }
+            });
+          } else {
+            this.$refs.tables.clearSelection();
+          }
+          this.$message.error(row.project_name + '库存不足')
+          return
+        }
+        this.teamList.push(row)
       },
       getlist() {
         this.tabProject = []

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -304,6 +304,7 @@
             let tempProject = [];
             let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
+              let index = b + 1
               let obj = {
                 advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -319,6 +320,7 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
+                groupno:index,
               };
 
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,11 +2,21 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="day" width="70" label="序号">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+          </div>
+        </template>
+      </el-table-column>
+
+
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
+
+
       <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -408,29 +408,29 @@
         if(scope.row.prescribing_number == 0){
           scope.row.prescribing_number = 1
         }
-        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
-          if(scope.row.prescribing_number > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }else{
-          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
-        }
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+        //   if(scope.row.prescribing_number > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        //   // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        // }
         
       },
       changePrescribingNumber(scope){
-        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-          if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }else{
-          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        }
+        // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //   if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }else{
+        //   if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }
       },
       getSingleDose(scope){
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1359,6 +1359,7 @@
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
+                    groupno: prescription.advices[b].groupno
 
 
                   };
@@ -1382,7 +1383,9 @@
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    groupno: prescription.advices[b].groupno
+
                   };
 
                   if(prescription.project[b].type == 2){
@@ -1449,8 +1452,11 @@
                   let tempProject = [];
                   let tempAddition = [];
 
+
+
                   //药品
                   for (let b = 0; b < prescription.advices.length; b++) {
+                    let index = b + 1
                     let obj = {
                       advice_id:0,
                       drug_name: prescription.advices[b].advice_name,
@@ -1465,7 +1471,9 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug
+                      drug:prescription.advices[b].drug,
+                      groupno:index,
+
                     };
 
                     console.log("看看数据6：")
@@ -1511,7 +1519,9 @@
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+
+
                     };
 
                     if (prescription.project[b].type == 2) {
@@ -1720,7 +1730,9 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
 
                         };
                         tempAdvice.push(obj)
@@ -1812,6 +1824,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -1826,7 +1839,9 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno:index,
+
                           };
                           console.log("看看数据1：")
                           console.log(obj.prescribing_number_unit)
@@ -1874,7 +1889,8 @@
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
-                            type: prescription.project[b].type
+                            type: prescription.project[b].type,
+
                           };
 
                           if (prescription.project[b].type == 2) {
@@ -2181,7 +2197,9 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
 
                         };
                         tempAdvice.push(obj)
@@ -2266,6 +2284,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -2280,7 +2299,9 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno: index
+
                           };
                           console.log("看看数据2：")
                           console.log(obj.prescribing_number_unit)
@@ -2619,7 +2640,10 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: prescription.advices[b].groupno
+
+
 
                         };
                         tempAdvice.push(obj)
@@ -2704,6 +2728,7 @@
 
                         //药品
                         for (let b = 0; b < prescription.advices.length; b++) {
+                          let index = b + 1
                           let obj = {
                             advice_id:0,
                             drug_name: prescription.advices[b].advice_name,
@@ -2718,7 +2743,8 @@
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
-                            drug:prescription.advices[b].drug
+                            drug:prescription.advices[b].drug,
+                            groupno: index
                           };
                           console.log("看看数据3：")
                           console.log(obj.prescribing_number_unit)
@@ -3115,7 +3141,8 @@
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
-                        drug:prescription.advices[b].drug
+                        drug:prescription.advices[b].drug,
+                        groupno: prescription.advices[b].groupno
 
                       };
                       tempAdvice.push(obj)
@@ -3207,6 +3234,7 @@
 
                       //药品
                       for (let b = 0; b < prescription.advices.length; b++) {
+                        let index = b + 1
                         let obj = {
                           advice_id:0,
                           drug_name: prescription.advices[b].advice_name,
@@ -3221,7 +3249,8 @@
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
-                          drug:prescription.advices[b].drug
+                          drug:prescription.advices[b].drug,
+                          groupno: index
                         };
                         console.log("看看数据4：")
                         console.log(obj.prescribing_number_unit)
@@ -3571,7 +3600,8 @@
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
-                      drug:prescription.advices[b].drug
+                      drug:prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno
 
                     };
                     tempAdvice.push(obj)
@@ -3664,6 +3694,7 @@
 
                     //药品
                     for (let b = 0; b < prescription.advices.length; b++) {
+                      let index = b + 1
                       let obj = {
                         advice_id:0,
                         drug_name: prescription.advices[b].advice_name,
@@ -3678,7 +3709,8 @@
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
-                        drug:prescription.advices[b].drug
+                        drug:prescription.advices[b].drug,
+                        groupno: index,
                       };
                       console.log("看看数据5：")
                       console.log(obj.prescribing_number_unit)

src/xt_pages/workforce/components/tableWeeks.vue

@@ -88,64 +88,72 @@
                 </ul>
             </div>
         </div>
-        <!--<el-table-->
-                <!--:row-style="{ color: '#303133' }"-->
-                <!--:data="summarySchData"-->
-                <!--border-->
-                <!--:header-cell-style="{-->
-        <!--backgroundColor: 'rgb(245, 247, 250)',-->
-        <!--color: '#606266'-->
-      <!--}"-->
-                <!--style="width: 100%"-->
-        <!--&gt;-->
-
-            <!--<el-table-column label="分区" min-width="70" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{ scope.row.zone.name }}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
-
-            <!--<el-table-column label="透析模式" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
+        <el-table
+                v-loading="isloading"
+                :row-style="{ color: '#303133' }"
+                :data="summarySchData"
+                border
+                :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+                style="width: 100%"
+        >
+
+            <el-table-column label="分区" min-width="70" align="center">
+                <template slot-scope="scope">
+                    {{ scope.row.zone.name }}
+                </template>
+            </el-table-column>
+
+            <el-table-column label="透析模式" min-width="100" align="center">
+                <template slot-scope="scope">
                     <!--{{getModeDesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
-            <!--<el-table-column label="透析液" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getDialysisLiquidDesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
+                    <div v-html>{{getModeDesc(scope.row.list)}}</div>
 
-            <!--<el-table-column label="透析管路" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getDialysisPipeDesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
+                </template>
+            </el-table-column>
+            <el-table-column label="透析液" min-width="100" align="center">
+                <template slot-scope="scope">
+                    <div v-html>{{getDialysisLiquidDesc(scope.row.list)}}</div>
+                </template>
+            </el-table-column>
 
-            <!--<el-table-column label="穿刺针" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getPunctureNeedleDesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
+            <el-table-column label="透析管路" min-width="100" align="center">
+                <template slot-scope="scope">
+                    <div v-html>{{getDialysisPipeDesc(scope.row.list)}}</div>
 
+                </template>
+            </el-table-column>
 
-            <!--<el-table-column label="抗凝剂" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getAnticoagulantDesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
+            <el-table-column label="穿刺针" min-width="100" align="center">
+                <template slot-scope="scope">
+                    <div v-html>{{getPunctureNeedleDesc(scope.row.list)}}</div>
+
+                </template>
+            </el-table-column>
 
 
-            <!--<el-table-column label="促红素" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getEPODesc(scope.row.list)}}-->
-                <!--</template>-->
-            <!--</el-table-column>-->
+            <el-table-column label="抗凝剂" min-width="100" align="center">
+                <template slot-scope="scope">
+                    <div v-html>{{getAnticoagulantDesc(scope.row.list)}}</div>
 
+                </template>
+            </el-table-column>
 
-        <!--</el-table>-->
+
+            <el-table-column label="促红素" min-width="100" align="center">
+                <template slot-scope="scope">
+                    <div v-html>{{getEPODesc(scope.row.list)}}</div>
+
+                </template>
+            </el-table-column>
+
+
+        </el-table>
 
         <el-table
+                v-loading="isloading"
                 :row-style="{ color: '#303133' }"
                 :data="scheduleData"
                 border
@@ -361,6 +369,7 @@
 
     data() {
       return {
+        isloading:false,
         weekArr: [
           { id: 0, name: '全部' },
           { id: 1, name: '周一' },
@@ -624,7 +633,7 @@
 
           } else {
 
-            desc = desc + ' \n\r ' + modes[i].mode_name + ': ' + modes[i].count + '次'
+            desc = desc + '              ' + modes[i].mode_name + ': ' + modes[i].count + '次'
 
           }
 
@@ -656,9 +665,9 @@
         let desc = ''
         for (let b = 0; b < modes.length; b++) {
           if (desc.length == 0) {
-            desc = modes[b].name + ': ' + modes[b].count + '次'
+            desc = modes[b].name + ': ' + modes[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '次'
+            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
 
@@ -705,9 +714,9 @@
 
         for (let b = 0; b < dialysisPipe.length; b++) {
           if (desc.length == 0) {
-            desc = dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '次'
+            desc = dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '次'
+            desc = desc + '              ' + dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
           }
         }
 
@@ -751,9 +760,9 @@
 
         for (let b = 0; b < punctureNeedle.length; b++) {
           if (desc.length == 0) {
-            desc = punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '次'
+            desc = punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '次'
+            desc = desc + '              ' + punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
           }
         }
 
@@ -783,9 +792,9 @@
         let desc = ''
         for (let b = 0; b < modes.length; b++) {
           if (desc.length == 0) {
-            desc = modes[b].name + ': ' + modes[b].count + '次'
+            desc = modes[b].name + ': ' + modes[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '次'
+            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
         return desc
@@ -824,9 +833,9 @@
         }
         for (let b = 0; b < EPO.length; b++) {
           if (desc.length == 0) {
-            desc = EPO[b].name + ': ' + EPO[b].count + '次'
+            desc = EPO[b].name + ': ' + EPO[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + EPO[b].name + ': ' + EPO[b].count + '次'
+            desc = desc + '              ' + EPO[b].name + ': ' + EPO[b].count + '支'
           }
         }
 
@@ -911,9 +920,12 @@
           week_time: this.week_time,
           zone: this.zone
         }
-
+        this.scheduleData = []
+        this.isloading = true
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
+            this.isloading = false
+
             console.log('22333333333', this.pre_status)
             var list = response.data.data.list
             if (this.pre_status == 0) {