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/outpatientChargesManagement.vue

@@ -2466,8 +2466,14 @@
             } else {
               var index = 0
               for (let i = 0; i < this.patientTableData.length; i++) {
-                if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
-                  index  = i
+                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/user/dialysisSolution.vue

@@ -286,7 +286,7 @@
               ></el-input>
             </el-form-item>
             </div>
-            
+
           </el-col>
           <el-col
             :span="8"
@@ -648,7 +648,7 @@
 
           <el-col :span="8" v-if="isShows('透析管路支数')">
             <el-form-item label="透析管路支数">
-              <el-input v-model="addPlan.hemodialysis_pipelines_count"></el-input>
+              <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="addPlan.hemodialysis_pipelines_count"></el-input>
             </el-form-item>
           </el-col>
 
@@ -664,7 +664,7 @@
 
           <el-col :span="8" v-if="isShows('穿刺针支数')">
             <el-form-item label="穿刺针支数">
-              <el-input v-model="addPlan.puncture_needle_count"></el-input>
+              <el-input  oninput="value=value.replace(/\D|^0/g,'')" v-model="addPlan.puncture_needle_count"></el-input>
             </el-form-item>
           </el-col>
 
@@ -683,7 +683,7 @@
 
           <el-col :span="8" v-if="isShows('促红素支数')">
             <el-form-item label="促红素支数">
-              <el-input v-model="addPlan.epo_count"></el-input>
+              <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="addPlan.epo_count"></el-input>
             </el-form-item>
           </el-col>
 
@@ -1571,7 +1571,7 @@ export default {
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
-     
+
       if (row.anticoagulant == 3) {
         this.addPlan.anticoagulant = '低分子肝素'
       }
@@ -1590,7 +1590,7 @@ export default {
       if(row.target_ultrafiltration!="" || row.target_ultrafiltration!=undefined){
         this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
       }
-   
+
 
       this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
       this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
@@ -1619,7 +1619,7 @@ export default {
       if(row.calcium!=""||row.calcium!=undefined){
          this.addPlan.calcium = row.calcium.toString()
       }
-     
+
      if(row.bicarbonate!=""||  row.bicarbonate!=undefined){
        this.addPlan.bicarbonate = row.bicarbonate.toString()
      }
@@ -1636,36 +1636,36 @@ export default {
     if(row.conductivity!="" ||row.conductivity!=undefined ){
        this.addPlan.conductivity = row.conductivity.toString()
     }
-     
-    
+
+
       this.addPlan.remark = row.remark
 
       this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
       if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
         this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
       }
-     
+
       this.addPlan.puncture_needle  = row.puncture_needle
       if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
         this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
       }
-     
+
       this.addPlan.epo  = row.epo
       if(row.epo_count!="" || row.epo_count!=undefined){
         this.addPlan.epo_count  = row.epo_count.toString()
       }
-    
+
       if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
          this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       }
       if(row.plasma_separator!="" || row.plasma_separator!=undefined){
         this.addPlan.plasma_separator = row.plasma_separator.toString()
       }
-     
+
       if(row.bilirubin_adsorption_column!="" || row.bilirubin_adsorption_column!=undefined){
          this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
       }
-    
+
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1687,12 +1687,12 @@ export default {
       if(row.body_fluid_other!=''|| row.body_fluid_other!=undefined){
         this.addPlan.body_fluid_other = row.body_fluid_other.toString()
       }
-     
+
       this.addPlan.special_medicine = row.special_medicine
       if(row.special_medicine_other!=""||row.special_medicine_other!=undefined){
         this.addPlan.special_medicine_other = row.special_medicine_other.toString()
       }
-   
+
       this.addPlan.displace_liqui_part = row.displace_liqui_part
       if(row.displace_liqui_value!=''||row.displace_liqui_value!=undefined){
         this.addPlan.displace_liqui_value = row.displace_liqui_value.toString()
@@ -1700,7 +1700,7 @@ export default {
       if(row.ultrafiltration!='' ||  row.ultrafiltration!=undefined){
         this.addPlan.ultrafiltration = row.ultrafiltration.toString()
       }
-     
+
       this.addPlan.blood_access = row.blood_access
 
       this.addPlan.registrars_id = row.registrars_id

src/xt_pages/workforce/components/tableWeeks.vue

@@ -88,64 +88,66 @@
                 </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">-->
-                    <!--{{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>-->
-
-            <!--<el-table-column label="透析管路" min-width="100" align="center">-->
-                <!--<template slot-scope="scope">-->
-                    <!--{{getDialysisPipeDesc(scope.row.list)}}-->
-                <!--</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">-->
-                    <!--{{getAnticoagulantDesc(scope.row.list)}}-->
-                <!--</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>-->
+        <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>
+
+            <el-table-column label="透析管路" min-width="100" align="center">
+                <template slot-scope="scope">
+                    {{getDialysisPipeDesc(scope.row.list)}}
+                </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">
+                    {{getAnticoagulantDesc(scope.row.list)}}
+                </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>
 
         <el-table
+                v-loading="isloading"
                 :row-style="{ color: '#303133' }"
                 :data="scheduleData"
                 border
@@ -361,6 +363,7 @@
 
     data() {
       return {
+        isloading:false,
         weekArr: [
           { id: 0, name: '全部' },
           { id: 1, name: '周一' },
@@ -656,9 +659,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 + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
 
@@ -705,9 +708,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 + ' \n\r ' + dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
           }
         }
 
@@ -751,9 +754,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 + ' \n\r ' + punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
           }
         }
 
@@ -783,9 +786,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 + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
         return desc
@@ -824,9 +827,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 + ' \n\r ' + EPO[b].name + ': ' + EPO[b].count + '支'
           }
         }
 
@@ -911,9 +914,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) {